API tools faq
paste
Advertisement
Guest User

Untitled

a guest
May 10th, 2017
557
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 59.05 KB | None | 0 0
raw download clone embed print report
  1. * Doing 'mpd.head'...
  2. [/ ] bzr+ssh < 0KB 0KB/s | [- ] bzr+ssh > 0KB 0KB/s | [\ ] bzr+ssh < 0KB 0KB/s | [| ] bzr+ssh > 0KB 0KB/s | [/ ] bzr+ssh > 0KB 0KB/s | Pull phase 0/2 [- ] bzr+ssh > 0KB 0KB/s | Pull phase:Finding revisi [\ ] bzr+ssh > 1KB 1KB/s | Pull phase:Finding revisi [####| ] bzr+ssh > 1KB 1KB/s | Pull phase:Fetching revis [####/ ] bzr+ssh > 1KB 1KB/s | Pull phase:Fetching revis [####- ] bzr+ssh > 5KB 7KB/s | Pull phase:Fetching revis [#########\ ] bzr+ssh > 5KB 7KB/s | Pull phase 1/2 [#########| ] bzr+ssh > 5KB 7KB/s | Pull phase:Merge phase 0/ [#########/ ] bzr+ssh > 5KB 7KB/s | Pull phase:Merge phase:Pr [############- ] bzr+ssh > 5KB 7KB/s | Pull phase:Merge phase 1/ [#############\ ] bzr+ssh > 5KB 7KB/s | Pull phase:Merge phase:Re M debian/control
  3. [################| ] bzr+ssh > 5KB 7KB/s | Pull phase:Merge phase 2/ [################/ ] bzr+ssh > 5KB 7KB/s | Pull phase:Merge phase:Ap [################- ] bzr+ssh > 5KB 7KB/s | Pull phase:Merge phase:Ap [#################\ ] bzr+ssh > 5KB 7KB/s | Pull phase:Merge phase:Ap [#################| ] bzr+ssh > 5KB 7KB/s | Pull phase:Merge phase:Ap [##################/ ] bzr+ssh > 5KB 7KB/s | Pull phase:Merge phase:Ap [##################- ] bzr+ssh > 5KB 7KB/s | Pull phase:Merge phase:Ap All changes applied successfully.
  4. Now on revision 13.
  5. debian/rules get-orig-source LOCAL_BRANCH=/home/ripps/build/bot/upstream/mpd.git ...
  6. rm -rf tmp-2065
  7. mkdir tmp-2065
  8. if [ ! -d /home/ripps/build/bot/upstream/mpd.git ]; then git clone git://git.musicpd.org/master/mpd.git /home/ripps/build/bot/upstream/mpd.git; fi
  9. cd /home/ripps/build/bot/upstream/mpd.git && git pull
  10. From git://git.musicpd.org/master/mpd
  11. 1937d29..5b9dfbe v0.15.x -> origin/v0.15.x
  12. Already up-to-date.
  13. cp -la /home/ripps/build/bot/upstream/mpd.git tmp-2065/mpd
  14. VERSION=0.15+git20090629.706614b
  15. # Done (created mpd_0.15+git20090629.706614b.orig.tar.gz)
  16. -rw-r--r-- 1 ripps ripps 329439 2009-06-30 03:32 mpd_0.15+git20090629.706614b.orig.tar.gz
  17. # get-orig-source complete
  18. Got mpd 0.15+git20090629.706614b vs mpd 0.15+git20090629.706614b
  19. No new src snapshot. Skip
  20.  
  21. * Doing 'mpd-userspace.head'...
  22. [/ ] bzr+ssh < 0KB 0KB/s | [- ] bzr+ssh > 0KB 0KB/s | [\ ] bzr+ssh < 0KB 0KB/s | [| ] bzr+ssh > 0KB 0KB/s | [/ ] bzr+ssh > 0KB 0KB/s | Pull phase 0/2 [- ] bzr+ssh > 1KB 1KB/s | Pull phase 0/2 [\ ] bzr+ssh > 1KB 1KB/s | Pull phase:Finding revisi [####| ] bzr+ssh > 1KB 1KB/s | Pull phase:Fetching revis [####/ ] bzr+ssh > 1KB 1KB/s | Pull phase:Fetching revis [####- ] bzr+ssh > 2KB 1KB/s | Pull phase:Fetching revis No revisions to pull.
  23. debian/rules get-orig-source LOCAL_BRANCH=/home/ripps/build/bot/upstream/mpd.git ...
  24. rm -rf tmp-2280
  25. mkdir tmp-2280
  26. if [ ! -d /home/ripps/build/bot/upstream/mpd.git ]; then git clone git://git.musicpd.org/master/mpd.git /home/ripps/build/bot/upstream/mpd.git; fi
  27. cd /home/ripps/build/bot/upstream/mpd.git && git pull
  28. Already up-to-date.
  29. cp -la /home/ripps/build/bot/upstream/mpd.git tmp-2280/mpd-userspace
  30. VERSION=0.15+git20090629.706614b
  31. # Done (created mpd-userspace_0.15+git20090629.706614b.orig.tar.gz)
  32. -rw-r--r-- 1 ripps ripps 329421 2009-06-30 03:32 mpd-userspace_0.15+git20090629.706614b.orig.tar.gz
  33. # get-orig-source complete
  34. Got mpd-userspace 0.15+git20090629.706614b vs mpd-userspace 0.15+git20090629.706614b
  35. No new src snapshot. Skip
  36.  
  37. * Doing 'mpc.head'...
  38. [/ ] bzr+ssh < 0KB 0KB/s | [- ] bzr+ssh > 0KB 0KB/s | [\ ] bzr+ssh < 0KB 0KB/s | [| ] bzr+ssh > 0KB 0KB/s | [/ ] bzr+ssh > 0KB 0KB/s | Pull phase 0/2 [- ] bzr+ssh > 1KB 0KB/s | Pull phase 0/2 [\ ] bzr+ssh > 1KB 0KB/s | Pull phase:Finding revisi [####| ] bzr+ssh > 1KB 0KB/s | Pull phase:Fetching revis [####/ ] bzr+ssh > 1KB 0KB/s | Pull phase:Fetching revis [####- ] bzr+ssh < 2KB 1KB/s | Pull phase:Fetching revis No revisions to pull.
  39. debian/rules get-orig-source LOCAL_BRANCH=/home/ripps/build/bot/upstream/mpc.git ...
  40. rm -rf tmp-2467
  41. mkdir tmp-2467
  42. if [ ! -d /home/ripps/build/bot/upstream/mpc.git ]; then git clone git://git.musicpd.org/master/mpc.git /home/ripps/build/bot/upstream/mpc.git; fi
  43. cd /home/ripps/build/bot/upstream/mpc.git && git pull
  44. Already up-to-date.
  45. cp -la /home/ripps/build/bot/upstream/mpc.git tmp-2467/mpc
  46. VERSION=0.16+git20090525.ba2cda7
  47. # Done (created mpc_0.16+git20090525.ba2cda7.orig.tar.gz)
  48. -rw-r--r-- 1 ripps ripps 54423 2009-06-30 03:32 mpc_0.16+git20090525.ba2cda7.orig.tar.gz
  49. # get-orig-source complete
  50. Got mpc 0.16+git20090525.ba2cda7 vs mpc 0.16+git20090525.ba2cda7
  51. No new src snapshot. Skip
  52.  
  53. * Doing 'mpdscribble.head'...
  54. [/ ] bzr+ssh < 0KB 0KB/s | [- ] bzr+ssh > 0KB 0KB/s | [\ ] bzr+ssh < 0KB 0KB/s | [| ] bzr+ssh > 0KB 0KB/s | [/ ] bzr+ssh > 0KB 0KB/s | Pull phase 0/2 [- ] bzr+ssh > 0KB 0KB/s | Pull phase:Finding revisi [\ ] bzr+ssh > 1KB 1KB/s | Pull phase:Finding revisi [####| ] bzr+ssh > 1KB 1KB/s | Pull phase:Fetching revis No revisions to pull.
  55. debian/rules get-orig-source LOCAL_BRANCH=/home/ripps/build/bot/upstream/mpdscribble.git ...
  56. rm -rf tmp-2651
  57. mkdir tmp-2651
  58. if [ ! -d /home/ripps/build/bot/upstream/mpdscribble.git ]; then git clone git://git.musicpd.org/master/mpdscribble.git /home/ripps/build/bot/upstream/mpdscribble.git; fi
  59. cd /home/ripps/build/bot/upstream/mpdscribble.git && git pull
  60. Already up-to-date.
  61. cp -la /home/ripps/build/bot/upstream/mpdscribble.git tmp-2651/mpdscribble
  62. VERSION=0.17+git20090618.d22668c
  63. # Done (created mpdscribble_0.17+git20090618.d22668c.orig.tar.gz)
  64. -rw-r--r-- 1 ripps ripps 57302 2009-06-30 03:33 mpdscribble_0.17+git20090618.d22668c.orig.tar.gz
  65. # get-orig-source complete
  66. Got mpdscribble 0.17+git20090618.d22668c vs mpdscribble 0.17+git20090618.d22668c
  67. No new src snapshot. Skip
  68.  
  69. * check_committed(mpc.head)
  70. [/ ] bzr+ssh < 0KB 0KB/s | [- ] bzr+ssh > 0KB 0KB/s | [\ ] bzr+ssh < 0KB 0KB/s | [| ] bzr+ssh > 0KB 0KB/s | [/ ] bzr+ssh > 0KB 0KB/s | Pull phase 0/2 [- ] bzr+ssh > 0KB 0KB/s | Pull phase:Finding revisi [\ ] bzr+ssh > 1KB 0KB/s | Pull phase:Finding revisi [####| ] bzr+ssh > 1KB 0KB/s | Pull phase:Fetching revis No revisions to pull.
  71. * check_committed(mpc.head.ppa)
  72. * check_committed(mpc.head.ppa.karmic)
  73. * check_committed(mpc.head.ppa.jaunty)
  74. * check_committed(mpc.head.ppa.intrepid)
  75. * check_committed(mpc.head.ppa.hardy)
  76. * check_committed(mpd.head)
  77. [/ ] bzr+ssh < 0KB 0KB/s | [- ] bzr+ssh > 0KB 0KB/s | [\ ] bzr+ssh < 0KB 0KB/s | [| ] bzr+ssh > 0KB 0KB/s | [/ ] bzr+ssh > 0KB 0KB/s | Pull phase 0/2 [- ] bzr+ssh > 0KB 0KB/s | Pull phase:Finding revisi [\ ] bzr+ssh > 1KB 1KB/s | Pull phase:Finding revisi [####| ] bzr+ssh > 1KB 1KB/s | Pull phase:Fetching revis No revisions to pull.
  78. * check_committed(mpd.head.ppa)
  79. * check_committed(mpd.head.ppa.karmic)
  80. * check_committed(mpd.head.ppa.jaunty)
  81. * check_committed(mpd.head.ppa.intrepid)
  82. * check_committed(mpd.head.ppa.hardy)
  83. * check_committed(mpd-userspace.head)
  84. [/ ] bzr+ssh < 0KB 0KB/s | [- ] bzr+ssh > 0KB 0KB/s | [\ ] bzr+ssh < 0KB 0KB/s | [| ] bzr+ssh > 0KB 0KB/s | [/ ] bzr+ssh > 0KB 0KB/s | Pull phase 0/2 [- ] bzr+ssh > 0KB 0KB/s | Pull phase:Finding revisi [\ ] bzr+ssh > 1KB 1KB/s | Pull phase:Finding revisi [####| ] bzr+ssh > 1KB 1KB/s | Pull phase:Fetching revis No revisions to pull.
  85. * check_committed(mpd-userspace.head.ppa)
  86. * check_committed(mpd-userspace.head.ppa.karmic)
  87. * check_committed(mpd-userspace.head.ppa.jaunty)
  88. * check_committed(mpd-userspace.head.ppa.intrepid)
  89. * check_committed(mpd-userspace.head.ppa.hardy)
  90. * check_committed(mpdscribble.head)
  91. [/ ] bzr+ssh < 0KB 0KB/s | [- ] bzr+ssh > 0KB 0KB/s | [\ ] bzr+ssh < 0KB 0KB/s | [| ] bzr+ssh > 0KB 0KB/s | [/ ] bzr+ssh > 0KB 0KB/s | Pull phase 0/2 [- ] bzr+ssh > 0KB 0KB/s | Pull phase:Finding revisi [\ ] bzr+ssh > 1KB 1KB/s | Pull phase:Finding revisi [####| ] bzr+ssh > 1KB 1KB/s | Pull phase:Fetching revis No revisions to pull.
  92. * check_committed(mpdscribble.head.ppa)
  93. * check_committed(mpdscribble.head.ppa.karmic)
  94. * check_committed(mpdscribble.head.ppa.jaunty)
  95. * check_committed(mpdscribble.head.ppa.intrepid)
  96. * check_committed(mpdscribble.head.ppa.hardy)
  97. * Doing mpd from mpd.head to mpd.head.ppa
  98. - compare 0.15-1-fix1 (UNRELEASED) and 0.15+git20090629.706614b-0ubuntu1
  99. => isclosed=0 isnative=0
  100. - lastest daily version: 0.15+git20090629.706614b-0ubuntu1~ripps1
  101. => base_branch=0.15+git20090629.706614b iter_branch=0ubuntu1
  102. => base_ppa=0.15+git20090629.706614b iter_ppa=0ubuntu1~ripps1
  103. => need to check the branches :P
  104. $ cd mpd.head.ppa
  105. $ bzr merge ../mpd.head
  106. [/ ] Opening pack 0/5 [###- ] Copying revision texts:Copied record 0/1 [#######\ ] Copying inventory texts 2/5 [#######| ] Copying inventory texts:Copied record 0/1 [###########/ ] Copying content texts 3/5 [###########- ] Copying content texts:Copied record 0/25 [###############\ ] Copying signature texts 4/5 [###############| ] Copying signature texts:Copied record 0 [###################/] Finishing pack 5/5 [- ] Merge phase 0/3 [\ ] Merge phase:Preparing file merge 0/26 [######| ] Merge phase 1/3 [######/ ] Merge phase:Resolution pass 1/10 M debian/control
  107. [############- ] Merge phase 2/3 [############\ ] Merge phase:Apply phase 0/2 [############| ] Merge phase:Apply phase:adding file 0/1 [###############/ ] Merge phase:Apply phase 1/3 [###############- ] Merge phase:Apply phase:removing file 0/24 [#################\ ] Merge phase:Apply phase 2/3 [#################| ] Merge phase:Apply phase:adding file 0/1 All changes applied successfully.
  108. $ bzr st
  109. modified:
  110. debian/control
  111. pending merge tips: (use -v to see all merge revisions)
  112. Taylor LeMasurier... 2009-06-30 remove commented libmms-dev from control, ...
  113. $ cp ../mpd.head/debian/changelog debian/changelog
  114. TARGET=0.15+git20090629.706614b-0ubuntu1
  115. $ sed -i -e '1s/(.*) [^;]*/(0.15+git20090629.706614b-0ubuntu1) UNRELEASED/' debian/changelog
  116. $ sed -i -e '1,/^ -- /s/^ -- .*/ -- Taylor LeMasurier-Wren <ripps818@gmail.com> Tue, 30 Jun 2009 03:33:04 -0500/' debian/changelog
  117. $ bzr revert debian/control
  118. [/ ] Revert phase 0/3 [######- ] Revert phase:comparing files 2/2 [######\ ] Revert phase 1/3 [######| ] Revert phase:Resolution pass 1/10 M debian/control
  119. [############/ ] Revert phase 2/3 [############- ] Revert phase:Apply phase 0/2 [###############\ ] Revert phase:Apply phase:removing file 0/24 [#################| ] Revert phase:Apply phase 2/3 [#################/ ] Revert phase:Apply phase:adding file 0/1 $ cp ../mpd.head/debian/control debian/control
  120. $ bzr diff
  121. === modified file 'debian/changelog'
  122. --- debian/changelog 2009-06-30 02:57:06 +0000
  123. +++ debian/changelog 2009-06-30 08:34:00 +0000
  124. @@ -2,4 +2,4 @@
  125.  
  126. * Daily Release Build
  127.  
  128. - -- Taylor LeMasurier-Wren <ripps818@gmail.com> Mon, 29 Jun 2009 21:56:46 -0500
  129. + -- Taylor LeMasurier-Wren <ripps818@gmail.com> Tue, 30 Jun 2009 03:33:04 -0500
  130.  
  131. === modified file 'debian/control'
  132. --- debian/control 2009-06-26 11:38:54 +0000
  133. +++ debian/control 2009-06-30 08:34:01 +0000
  134. @@ -3,7 +3,7 @@
  135. Priority: optional
  136. Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
  137. XSBC-Original-Maintainer: Taylor LeMasurier-Wren <ripps818@gmail.com>
  138. -Build-Depends: lintian, libmms-dev, debhelper (>= 6),
  139. +Build-Depends: debhelper (>= 6),
  140. cdbs,
  141. automake1.10,
  142. libcurl4-gnutls-dev | libcurl-dev,
  143. @@ -28,7 +28,6 @@
  144. libid3tag0-dev,
  145. zlib1g-dev,
  146. libsidplay2-dev,
  147. -# libmms-dev,
  148. libsqlite3-dev,
  149. libmodplug-dev,
  150. libcue-dev,
  151.  
  152. $ bzr commit -m "* Merge with mpd.head #13"
  153. [###/ ] Collecting changes [0] - Stage 1/5 Committing to: /home/ripps/build/bot/mpd.head.ppa/
  154. modified debian/changelog
  155. modified debian/control
  156. [###########- ] Running pre_commit hooks - Stage 3/5 [###############\ ] Updating the working tree - Stage 4/5 Committed revision 18.
  157. => committed 0.15+git20090629.706614b-0ubuntu1 in mpd.head.ppa
  158. $ cd mpd.head.ppa.karmic
  159. $ bzr merge ../mpd.head.ppa
  160. [/ ] Opening pack 0/5 [###- ] Copying revision texts:Copied record 0/2 [#######\ ] Copying inventory texts 2/5 [#######| ] Copying inventory texts:Copied record 0/2 [###########/ ] Copying content texts 3/5 [###########- ] Copying content texts:Copied record 0/27 [###############\ ] Copying signature texts 4/5 [###############| ] Copying signature texts:Copied record 0 [###################/] Finishing pack 5/5 [- ] Merge phase 0/3 [\ ] Merge phase:Preparing file merge 0/26 [######| ] Merge phase 1/3 [######/ ] Merge phase:Resolution pass 1/10 M debian/changelog
  161. M debian/control
  162. Text conflict in debian/changelog
  163. Text conflict in debian/control
  164. [############- ] Merge phase 2/3 [############\ ] Merge phase:Apply phase 0/2 [############| ] Merge phase:Apply phase:adding file 0/8 [###############/ ] Merge phase:Apply phase 1/3 [###############- ] Merge phase:Apply phase:removing file 0/24 [#################\ ] Merge phase:Apply phase 2/3 [#################| ] Merge phase:Apply phase:adding file 0/8 2 conflicts encountered.
  165. $ bzr st
  166. modified:
  167. debian/changelog
  168. debian/control
  169. debian/changelog.OTHER
  170. debian/changelog.THIS
  171. debian/control.BASE
  172. debian/control.OTHER
  173. debian/control.THIS
  174. conflicts:
  175. Text conflict in debian/changelog
  176. Text conflict in debian/control
  177. pending merge tips: (use -v to see all merge revisions)
  178. Taylor LeMasurier... 2009-06-30 [merge] * Merge with mpd.head #13
  179. $ bzr revert debian/changelog
  180. [/ ] Revert phase 0/3 [######- ] Revert phase:comparing files 2/2 [######\ ] Revert phase 1/3 [######| ] Revert phase:Resolution pass 1/10 M debian/changelog
  181. [############/ ] Revert phase 2/3 [############- ] Revert phase:Apply phase 0/2 [###############\ ] Revert phase:Apply phase:removing file 0/30 [#################| ] Revert phase:Apply phase 2/3 [#################/ ] Revert phase:Apply phase:adding file 0/1 $ cp ../mpd.head.ppa/debian/changelog debian/changelog
  182. TARGET=0.15+git20090629.706614b-0ubuntu1~ripps2
  183. $ sed -i -e '1s/(.*) [^;]*/(0.15+git20090629.706614b-0ubuntu1~ripps2) karmic/' debian/changelog
  184. $ sed -i -e '1,/^ -- /s/^ -- .*/ -- Taylor LeMasurier-Wren <ripps818@gmail.com> Tue, 30 Jun 2009 03:33:04 -0500/' debian/changelog
  185. $ bzr resolve debian/changelog
  186. debian/changelog is not conflicted
  187. $ bzr revert debian/control
  188. [/ ] Revert phase 0/3 [######- ] Revert phase:comparing files 2/2 [######\ ] Revert phase 1/3 [######| ] Revert phase:Resolution pass 1/10 M debian/control
  189. [############/ ] Revert phase 2/3 [############- ] Revert phase:Apply phase 0/2 [###############\ ] Revert phase:Apply phase:removing file 0/27 [#################| ] Revert phase:Apply phase 2/3 [#################/ ] Revert phase:Apply phase:adding file 0/1 $ cp ../mpd.head.ppa/debian/control debian/control
  190. **INFO** Build-Depends += lintian, libmms-dev
  191. $ bzr resolve debian/control
  192. debian/control is not conflicted
  193. $ bzr diff
  194. === modified file 'debian/changelog'
  195. --- debian/changelog 2009-06-30 02:59:00 +0000
  196. +++ debian/changelog 2009-06-30 08:34:03 +0000
  197. @@ -1,5 +1,5 @@
  198. -mpd (0.15+git20090629.706614b-0ubuntu1~ripps1) karmic; urgency=low
  199. +mpd (0.15+git20090629.706614b-0ubuntu1~ripps2) karmic; urgency=low
  200.  
  201. * Daily Release Build
  202.  
  203. - -- Taylor LeMasurier-Wren <ripps818@gmail.com> Mon, 29 Jun 2009 21:58:06 -0500
  204. + -- Taylor LeMasurier-Wren <ripps818@gmail.com> Tue, 30 Jun 2009 03:33:04 -0500
  205.  
  206. === modified file 'debian/control'
  207. --- debian/control 2009-06-26 11:39:08 +0000
  208. +++ debian/control 2009-06-30 08:34:04 +0000
  209. @@ -3,7 +3,7 @@
  210. Priority: optional
  211. Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
  212. XSBC-Original-Maintainer: Taylor LeMasurier-Wren <ripps818@gmail.com>
  213. -Build-Depends: lintian, libmms-dev, lintian, libmms-dev, debhelper (>= 6),
  214. +Build-Depends: lintian, libmms-dev, debhelper (>= 6),
  215. cdbs,
  216. automake1.10,
  217. libcurl4-gnutls-dev | libcurl-dev,
  218. @@ -28,7 +28,6 @@
  219. libid3tag0-dev,
  220. zlib1g-dev,
  221. libsidplay2-dev,
  222. -# libmms-dev,
  223. libsqlite3-dev,
  224. libmodplug-dev,
  225. libcue-dev,
  226.  
  227. $ bzr commit -m "* RELEASE 0.15+git20090629.706614b-0ubuntu1~ripps2 to karmic/ppa\n - merge with mpd.head.ppa #18"
  228. [###/ ] Collecting changes [0] - Stage 1/5 Committing to: /home/ripps/build/bot/mpd.head.ppa.karmic/
  229. modified debian/changelog
  230. modified debian/control
  231. [###########- ] Running pre_commit hooks - Stage 3/5 Committed revision 16.
  232. => committed 0.15+git20090629.706614b-0ubuntu1~ripps2 in mpd.head.ppa.karmic
  233. $ bzr bd --merge --build-dir=/home/ripps/ppa --orig-dir=../tarballs --builder=dpkg-buildpackage -rfakeroot -S -sd -k2091B1DD (ppa2)
  234. Building using working tree
  235. Running in merge mode
  236. Looking for a way to retrieve the upstream tarball
  237. Upstream tarball already exists in build directory, using that
  238. Building the package in /home/ripps/ppa/mpd-0.15+git20090629.706614b, using dpkg-buildpackage -rfakeroot -S -sd -k2091B1DD
  239. dpkg-buildpackage: set CFLAGS to default value: -g -O2
  240. dpkg-buildpackage: set CPPFLAGS to default value:
  241. dpkg-buildpackage: set LDFLAGS to default value: -Wl,-Bsymbolic-functions
  242. dpkg-buildpackage: set FFLAGS to default value: -g -O2
  243. dpkg-buildpackage: set CXXFLAGS to default value: -g -O2
  244. dpkg-buildpackage: source package mpd
  245. dpkg-buildpackage: source version 0.15+git20090629.706614b-0ubuntu1~ripps2
  246. dpkg-buildpackage: source changed by Taylor LeMasurier-Wren <ripps818@gmail.com>
  247. dpkg-checkbuilddeps: Unmet build dependencies: libmms-dev libcurl4-gnutls-dev | libcurl-dev libavahi-client-dev libsamplerate0-dev libaudiofile-dev libasound2-dev libao-dev (>= 0.8.3) libpulse-dev libjack-dev libshout3-dev libogg-dev libvorbis-dev libflac-dev (>= 1.1.4) libmpcdec-dev libmad0-dev libfaad-dev libmikmod2-dev libwavpack-dev libavcodec-dev libid3tag0-dev zlib1g-dev libsidplay2-dev libsqlite3-dev libmodplug-dev libcue-dev xmlto
  248. dpkg-buildpackage: warning: Build dependencies/conflicts unsatisfied; aborting.
  249. dpkg-buildpackage: warning: (Use -d flag to override.)
  250. dpkg-buildpackage: warning: This is currently a non-fatal warning with -S, but
  251. dpkg-buildpackage: warning: will probably become fatal in the future.
  252. fakeroot debian/rules clean
  253. test -x debian/rules
  254. rmdir debian/build
  255. rmdir: failed to remove `debian/build': No such file or directory
  256. make: [cleanbuilddir] Error 1 (ignored)
  257. dh_clean
  258. /usr/bin/make -C debian/build -k distclean
  259. make: *** debian/build: No such file or directory. Stop.
  260. make: [makefile-clean] Error 2 (ignored)
  261. rm -f debian/stamp-makefile-build
  262. rm -f debian/stamp-autotools-files
  263. dpkg-source -b mpd-0.15+git20090629.706614b
  264. dpkg-source: info: using source format `1.0'
  265. dpkg-source: info: building mpd using existing mpd_0.15+git20090629.706614b.orig.tar.gz
  266. dpkg-source: info: building mpd in mpd_0.15+git20090629.706614b-0ubuntu1~ripps2.diff.gz
  267. dpkg-source: info: building mpd in mpd_0.15+git20090629.706614b-0ubuntu1~ripps2.dsc
  268. signfile mpd_0.15+git20090629.706614b-0ubuntu1~ripps2.dsc
  269. dpkg-genchanges -S -sd >../mpd_0.15+git20090629.706614b-0ubuntu1~ripps2_source.changes
  270.  
  271. dpkg-genchanges: not including original source code in upload
  272. signfile mpd_0.15+git20090629.706614b-0ubuntu1~ripps2_source.changes
  273.  
  274. dpkg-buildpackage: source only, diff-only upload (original source NOT included)
  275. Cleaning build dir: /home/ripps/ppa/mpd-0.15+git20090629.706614b
  276. $ cd mpd.head.ppa.jaunty
  277. $ bzr merge ../mpd.head.ppa
  278. [/ ] Opening pack 0/5 [###- ] Copying revision texts:Copied record 0/2 [#######\ ] Copying inventory texts 2/5 [#######| ] Copying inventory texts:Copied record 0/2 [###########/ ] Copying content texts 3/5 [###########- ] Copying content texts:Copied record 0/27 [###############\ ] Copying signature texts 4/5 [###############| ] Copying signature texts:Copied record 0 [###################/] Finishing pack 5/5 [- ] Merge phase 0/3 [\ ] Merge phase:Preparing file merge 0/26 [######| ] Merge phase 1/3 [######/ ] Merge phase:Resolution pass 1/10 M debian/changelog
  279. M debian/control
  280. Text conflict in debian/changelog
  281. Text conflict in debian/control
  282. [############- ] Merge phase 2/3 [############\ ] Merge phase:Apply phase 0/2 [############| ] Merge phase:Apply phase:adding file 0/8 [###############/ ] Merge phase:Apply phase 1/3 [###############- ] Merge phase:Apply phase:removing file 0/25 [#################\ ] Merge phase:Apply phase 2/3 [#################| ] Merge phase:Apply phase:adding file 0/8 2 conflicts encountered.
  283. $ bzr st
  284. modified:
  285. debian/changelog
  286. debian/control
  287. debian/changelog.OTHER
  288. debian/changelog.THIS
  289. debian/control.BASE
  290. debian/control.OTHER
  291. debian/control.THIS
  292. conflicts:
  293. Text conflict in debian/changelog
  294. Text conflict in debian/control
  295. pending merge tips: (use -v to see all merge revisions)
  296. Taylor LeMasurier... 2009-06-30 [merge] * Merge with mpd.head #13
  297. $ bzr revert debian/changelog
  298. [/ ] Revert phase 0/3 [######- ] Revert phase:comparing files 2/2 [######\ ] Revert phase 1/3 [######| ] Revert phase:Resolution pass 1/10 M debian/changelog
  299. [############/ ] Revert phase 2/3 [############- ] Revert phase:Apply phase 0/2 [###############\ ] Revert phase:Apply phase:removing file 0/31 [#################| ] Revert phase:Apply phase 2/3 [#################/ ] Revert phase:Apply phase:adding file 0/1 $ cp ../mpd.head.ppa/debian/changelog debian/changelog
  300. TARGET=0.15+git20090629.706614b-0ubuntu1~ripps2~jaunty
  301. $ sed -i -e '1s/(.*) [^;]*/(0.15+git20090629.706614b-0ubuntu1~ripps2~jaunty) jaunty/' debian/changelog
  302. $ sed -i -e '1,/^ -- /s/^ -- .*/ -- Taylor LeMasurier-Wren <ripps818@gmail.com> Tue, 30 Jun 2009 03:33:04 -0500/' debian/changelog
  303. $ bzr resolve debian/changelog
  304. debian/changelog is not conflicted
  305. $ bzr revert debian/control
  306. [/ ] Revert phase 0/3 [######- ] Revert phase:comparing files 2/2 [######\ ] Revert phase 1/3 [######| ] Revert phase:Resolution pass 1/10 M debian/control
  307. [############/ ] Revert phase 2/3 [############- ] Revert phase:Apply phase 0/2 [###############\ ] Revert phase:Apply phase:removing file 0/28 [#################| ] Revert phase:Apply phase 2/3 [#################/ ] Revert phase:Apply phase:adding file 0/1 $ cp ../mpd.head.ppa/debian/control debian/control
  308. **INFO** Build-Depends += lintian, libmms-dev
  309. $ bzr resolve debian/control
  310. debian/control is not conflicted
  311. $ bzr diff
  312. === modified file 'debian/changelog'
  313. --- debian/changelog 2009-06-30 02:59:16 +0000
  314. +++ debian/changelog 2009-06-30 08:34:21 +0000
  315. @@ -1,5 +1,5 @@
  316. -mpd (0.15+git20090629.706614b-0ubuntu1~ripps1~jaunty) jaunty; urgency=low
  317. +mpd (0.15+git20090629.706614b-0ubuntu1~ripps2~jaunty) jaunty; urgency=low
  318.  
  319. * Daily Release Build
  320.  
  321. - -- Taylor LeMasurier-Wren <ripps818@gmail.com> Mon, 29 Jun 2009 21:58:06 -0500
  322. + -- Taylor LeMasurier-Wren <ripps818@gmail.com> Tue, 30 Jun 2009 03:33:04 -0500
  323.  
  324. === modified file 'debian/control'
  325. --- debian/control 2009-06-26 11:39:56 +0000
  326. +++ debian/control 2009-06-30 08:34:21 +0000
  327. @@ -3,7 +3,7 @@
  328. Priority: optional
  329. Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
  330. XSBC-Original-Maintainer: Taylor LeMasurier-Wren <ripps818@gmail.com>
  331. -Build-Depends: lintian, libmms-dev, lintian, libmms-dev, debhelper (>= 6),
  332. +Build-Depends: lintian, libmms-dev, debhelper (>= 6),
  333. cdbs,
  334. automake1.10,
  335. libcurl4-gnutls-dev | libcurl-dev,
  336. @@ -28,7 +28,6 @@
  337. libid3tag0-dev,
  338. zlib1g-dev,
  339. libsidplay2-dev,
  340. -# libmms-dev,
  341. libsqlite3-dev,
  342. libmodplug-dev,
  343. libcue-dev,
  344.  
  345. $ bzr commit -m "* RELEASE 0.15+git20090629.706614b-0ubuntu1~ripps2~jaunty to jaunty/ppa\n - merge with mpd.head.ppa #18"
  346. [###/ ] Collecting changes [0] - Stage 1/5 Committing to: /home/ripps/build/bot/mpd.head.ppa.jaunty/
  347. modified debian/changelog
  348. modified debian/control
  349. [###########- ] Running pre_commit hooks - Stage 3/5 Committed revision 15.
  350. => committed 0.15+git20090629.706614b-0ubuntu1~ripps2~jaunty in mpd.head.ppa.jaunty
  351. $ bzr bd --merge --build-dir=/home/ripps/ppa --orig-dir=../tarballs --builder=dpkg-buildpackage -rfakeroot -S -sd -k2091B1DD (ppa2)
  352. Building using working tree
  353. Running in merge mode
  354. Looking for a way to retrieve the upstream tarball
  355. Upstream tarball already exists in build directory, using that
  356. Building the package in /home/ripps/ppa/mpd-0.15+git20090629.706614b, using dpkg-buildpackage -rfakeroot -S -sd -k2091B1DD
  357. dpkg-buildpackage: set CFLAGS to default value: -g -O2
  358. dpkg-buildpackage: set CPPFLAGS to default value:
  359. dpkg-buildpackage: set LDFLAGS to default value: -Wl,-Bsymbolic-functions
  360. dpkg-buildpackage: set FFLAGS to default value: -g -O2
  361. dpkg-buildpackage: set CXXFLAGS to default value: -g -O2
  362. dpkg-buildpackage: source package mpd
  363. dpkg-buildpackage: source version 0.15+git20090629.706614b-0ubuntu1~ripps2~jaunty
  364. dpkg-buildpackage: source changed by Taylor LeMasurier-Wren <ripps818@gmail.com>
  365. dpkg-checkbuilddeps: Unmet build dependencies: libmms-dev libcurl4-gnutls-dev | libcurl-dev libavahi-client-dev libsamplerate0-dev libaudiofile-dev libasound2-dev libao-dev (>= 0.8.3) libpulse-dev libjack-dev libshout3-dev libogg-dev libvorbis-dev libflac-dev (>= 1.1.4) libmpcdec-dev libmad0-dev libfaad-dev libmikmod2-dev libwavpack-dev libavcodec-dev libid3tag0-dev zlib1g-dev libsidplay2-dev libsqlite3-dev libmodplug-dev libcue-dev xmlto
  366. dpkg-buildpackage: warning: Build dependencies/conflicts unsatisfied; aborting.
  367. dpkg-buildpackage: warning: (Use -d flag to override.)
  368. dpkg-buildpackage: warning: This is currently a non-fatal warning with -S, but
  369. dpkg-buildpackage: warning: will probably become fatal in the future.
  370. fakeroot debian/rules clean
  371. test -x debian/rules
  372. rmdir debian/build
  373. rmdir: failed to remove `debian/build': No such file or directory
  374. make: [cleanbuilddir] Error 1 (ignored)
  375. dh_clean
  376. /usr/bin/make -C debian/build -k distclean
  377. make: *** debian/build: No such file or directory. Stop.
  378. make: [makefile-clean] Error 2 (ignored)
  379. rm -f debian/stamp-makefile-build
  380. rm -f debian/stamp-autotools-files
  381. dpkg-source -b mpd-0.15+git20090629.706614b
  382. dpkg-source: info: using source format `1.0'
  383. dpkg-source: info: building mpd using existing mpd_0.15+git20090629.706614b.orig.tar.gz
  384. dpkg-source: info: building mpd in mpd_0.15+git20090629.706614b-0ubuntu1~ripps2~jaunty.diff.gz
  385. dpkg-source: info: building mpd in mpd_0.15+git20090629.706614b-0ubuntu1~ripps2~jaunty.dsc
  386. signfile mpd_0.15+git20090629.706614b-0ubuntu1~ripps2~jaunty.dsc
  387. dpkg-genchanges -S -sd >../mpd_0.15+git20090629.706614b-0ubuntu1~ripps2~jaunty_source.changes
  388.  
  389. dpkg-genchanges: not including original source code in upload
  390. signfile mpd_0.15+git20090629.706614b-0ubuntu1~ripps2~jaunty_source.changes
  391.  
  392. dpkg-buildpackage: source only, diff-only upload (original source NOT included)
  393. Cleaning build dir: /home/ripps/ppa/mpd-0.15+git20090629.706614b
  394. $ cd mpd.head.ppa.intrepid
  395. $ bzr merge ../mpd.head.ppa
  396. [/ ] Opening pack 0/5 [###- ] Copying revision texts:Copied record 0/2 [#######\ ] Copying inventory texts 2/5 [#######| ] Copying inventory texts:Copied record 0/2 [###########/ ] Copying content texts 3/5 [###########- ] Copying content texts:Copied record 0/27 [###############\ ] Copying signature texts 4/5 [###############| ] Copying signature texts:Copied record 0 [###################/] Finishing pack 5/5 [- ] Merge phase 0/3 [\ ] Merge phase:Preparing file merge 0/26 [######| ] Merge phase 1/3 [######/ ] Merge phase:Resolution pass 1/10 M debian/changelog
  397. M debian/control
  398. Text conflict in debian/changelog
  399. Text conflict in debian/control
  400. [############- ] Merge phase 2/3 [############\ ] Merge phase:Apply phase 0/2 [############| ] Merge phase:Apply phase:adding file 0/8 [###############/ ] Merge phase:Apply phase 1/3 [###############- ] Merge phase:Apply phase:removing file 0/24 [#################\ ] Merge phase:Apply phase 2/3 [#################| ] Merge phase:Apply phase:adding file 0/8 2 conflicts encountered.
  401. $ bzr st
  402. modified:
  403. debian/changelog
  404. debian/control
  405. debian/changelog.OTHER
  406. debian/changelog.THIS
  407. debian/control.BASE
  408. debian/control.OTHER
  409. debian/control.THIS
  410. conflicts:
  411. Text conflict in debian/changelog
  412. Text conflict in debian/control
  413. pending merge tips: (use -v to see all merge revisions)
  414. Taylor LeMasurier... 2009-06-30 [merge] * Merge with mpd.head #13
  415. $ bzr revert debian/changelog
  416. [/ ] Revert phase 0/3 [######- ] Revert phase:comparing files 2/2 [######\ ] Revert phase 1/3 [######| ] Revert phase:Resolution pass 1/10 M debian/changelog
  417. [############/ ] Revert phase 2/3 [############- ] Revert phase:Apply phase 0/2 [###############\ ] Revert phase:Apply phase:removing file 0/30 [#################| ] Revert phase:Apply phase 2/3 [#################/ ] Revert phase:Apply phase:adding file 0/1 $ cp ../mpd.head.ppa/debian/changelog debian/changelog
  418. TARGET=0.15+git20090629.706614b-0ubuntu1~ripps2~intrepid
  419. $ sed -i -e '1s/(.*) [^;]*/(0.15+git20090629.706614b-0ubuntu1~ripps2~intrepid) intrepid/' debian/changelog
  420. $ sed -i -e '1,/^ -- /s/^ -- .*/ -- Taylor LeMasurier-Wren <ripps818@gmail.com> Tue, 30 Jun 2009 03:33:04 -0500/' debian/changelog
  421. $ bzr resolve debian/changelog
  422. debian/changelog is not conflicted
  423. $ bzr revert debian/control
  424. [/ ] Revert phase 0/3 [######- ] Revert phase:comparing files 2/2 [######\ ] Revert phase 1/3 [######| ] Revert phase:Resolution pass 1/10 M debian/control
  425. [############/ ] Revert phase 2/3 [############- ] Revert phase:Apply phase 0/2 [###############\ ] Revert phase:Apply phase:removing file 0/27 [#################| ] Revert phase:Apply phase 2/3 [#################/ ] Revert phase:Apply phase:adding file 0/1 $ cp ../mpd.head.ppa/debian/control debian/control
  426. **INFO** Build-Depends += lintian, libmms-dev
  427. $ bzr resolve debian/control
  428. debian/control is not conflicted
  429. $ bzr diff
  430. === modified file 'debian/changelog'
  431. --- debian/changelog 2009-06-30 02:59:24 +0000
  432. +++ debian/changelog 2009-06-30 08:34:31 +0000
  433. @@ -1,5 +1,5 @@
  434. -mpd (0.15+git20090629.706614b-0ubuntu1~ripps1~intrepid) intrepid; urgency=low
  435. +mpd (0.15+git20090629.706614b-0ubuntu1~ripps2~intrepid) intrepid; urgency=low
  436.  
  437. * Daily Release Build
  438.  
  439. - -- Taylor LeMasurier-Wren <ripps818@gmail.com> Mon, 29 Jun 2009 21:58:06 -0500
  440. + -- Taylor LeMasurier-Wren <ripps818@gmail.com> Tue, 30 Jun 2009 03:33:04 -0500
  441.  
  442. === modified file 'debian/control'
  443. --- debian/control 2009-06-26 11:40:22 +0000
  444. +++ debian/control 2009-06-30 08:34:31 +0000
  445. @@ -3,7 +3,7 @@
  446. Priority: optional
  447. Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
  448. XSBC-Original-Maintainer: Taylor LeMasurier-Wren <ripps818@gmail.com>
  449. -Build-Depends: lintian, libmms-dev, lintian, libmms-dev, debhelper (>= 6),
  450. +Build-Depends: lintian, libmms-dev, debhelper (>= 6),
  451. cdbs,
  452. automake1.10,
  453. libcurl4-gnutls-dev | libcurl-dev,
  454. @@ -28,7 +28,6 @@
  455. libid3tag0-dev,
  456. zlib1g-dev,
  457. libsidplay2-dev,
  458. -# libmms-dev,
  459. libsqlite3-dev,
  460. libmodplug-dev,
  461. libcue-dev,
  462.  
  463. $ bzr commit -m "* RELEASE 0.15+git20090629.706614b-0ubuntu1~ripps2~intrepid to intrepid/ppa\n - merge with mpd.head.ppa #18"
  464. [###/ ] Collecting changes [0] - Stage 1/5 Committing to: /home/ripps/build/bot/mpd.head.ppa.intrepid/
  465. modified debian/changelog
  466. modified debian/control
  467. [###########- ] Running pre_commit hooks - Stage 3/5 Committed revision 16.
  468. => committed 0.15+git20090629.706614b-0ubuntu1~ripps2~intrepid in mpd.head.ppa.intrepid
  469. $ bzr bd --merge --build-dir=/home/ripps/ppa --orig-dir=../tarballs --builder=dpkg-buildpackage -rfakeroot -S -sd -k2091B1DD (ppa2)
  470. Building using working tree
  471. Running in merge mode
  472. Looking for a way to retrieve the upstream tarball
  473. Upstream tarball already exists in build directory, using that
  474. Building the package in /home/ripps/ppa/mpd-0.15+git20090629.706614b, using dpkg-buildpackage -rfakeroot -S -sd -k2091B1DD
  475. dpkg-buildpackage: set CFLAGS to default value: -g -O2
  476. dpkg-buildpackage: set CPPFLAGS to default value:
  477. dpkg-buildpackage: set LDFLAGS to default value: -Wl,-Bsymbolic-functions
  478. dpkg-buildpackage: set FFLAGS to default value: -g -O2
  479. dpkg-buildpackage: set CXXFLAGS to default value: -g -O2
  480. dpkg-buildpackage: source package mpd
  481. dpkg-buildpackage: source version 0.15+git20090629.706614b-0ubuntu1~ripps2~intrepid
  482. dpkg-buildpackage: source changed by Taylor LeMasurier-Wren <ripps818@gmail.com>
  483. dpkg-checkbuilddeps: Unmet build dependencies: libmms-dev libcurl4-gnutls-dev | libcurl-dev libavahi-client-dev libsamplerate0-dev libaudiofile-dev libasound2-dev libao-dev (>= 0.8.3) libpulse-dev libjack-dev libshout3-dev libogg-dev libvorbis-dev libflac-dev (>= 1.1.4) libmpcdec-dev libmad0-dev libfaad-dev libmikmod2-dev libwavpack-dev libavcodec-dev libid3tag0-dev zlib1g-dev libsidplay2-dev libsqlite3-dev libmodplug-dev libcue-dev xmlto
  484. dpkg-buildpackage: warning: Build dependencies/conflicts unsatisfied; aborting.
  485. dpkg-buildpackage: warning: (Use -d flag to override.)
  486. dpkg-buildpackage: warning: This is currently a non-fatal warning with -S, but
  487. dpkg-buildpackage: warning: will probably become fatal in the future.
  488. fakeroot debian/rules clean
  489. test -x debian/rules
  490. rmdir debian/build
  491. rmdir: failed to remove `debian/build': No such file or directory
  492. make: [cleanbuilddir] Error 1 (ignored)
  493. dh_clean
  494. /usr/bin/make -C debian/build -k distclean
  495. make: *** debian/build: No such file or directory. Stop.
  496. make: [makefile-clean] Error 2 (ignored)
  497. rm -f debian/stamp-makefile-build
  498. rm -f debian/stamp-autotools-files
  499. dpkg-source -b mpd-0.15+git20090629.706614b
  500. dpkg-source: info: using source format `1.0'
  501. dpkg-source: info: building mpd using existing mpd_0.15+git20090629.706614b.orig.tar.gz
  502. dpkg-source: info: building mpd in mpd_0.15+git20090629.706614b-0ubuntu1~ripps2~intrepid.diff.gz
  503. dpkg-source: info: building mpd in mpd_0.15+git20090629.706614b-0ubuntu1~ripps2~intrepid.dsc
  504. signfile mpd_0.15+git20090629.706614b-0ubuntu1~ripps2~intrepid.dsc
  505. dpkg-genchanges -S -sd >../mpd_0.15+git20090629.706614b-0ubuntu1~ripps2~intrepid_source.changes
  506.  
  507. dpkg-genchanges: not including original source code in upload
  508. signfile mpd_0.15+git20090629.706614b-0ubuntu1~ripps2~intrepid_source.changes
  509.  
  510. dpkg-buildpackage: source only, diff-only upload (original source NOT included)
  511. Cleaning build dir: /home/ripps/ppa/mpd-0.15+git20090629.706614b
  512. $ cd mpd.head.ppa.hardy
  513. $ bzr merge ../mpd.head.ppa
  514. [/ ] Opening pack 0/5 [###- ] Copying revision texts:Copied record 0/2 [#######\ ] Copying inventory texts 2/5 [#######| ] Copying inventory texts:Copied record 0/2 [###########/ ] Copying content texts 3/5 [###########- ] Copying content texts:Copied record 0/27 [###############\ ] Copying signature texts 4/5 [###############| ] Copying signature texts:Copied record 0 [###################/] Finishing pack 5/5 [- ] Merge phase 0/3 [\ ] Merge phase:Preparing file merge 0/26 [######| ] Merge phase 1/3 [######/ ] Merge phase:Resolution pass 1/10 M debian/changelog
  515. M debian/control
  516. Text conflict in debian/changelog
  517. Text conflict in debian/control
  518. [############- ] Merge phase 2/3 [############\ ] Merge phase:Apply phase 0/2 [############| ] Merge phase:Apply phase:adding file 0/8 [###############/ ] Merge phase:Apply phase 1/3 [###############- ] Merge phase:Apply phase:removing file 0/24 [#################\ ] Merge phase:Apply phase 2/3 [#################| ] Merge phase:Apply phase:adding file 0/8 2 conflicts encountered.
  519. $ bzr st
  520. modified:
  521. debian/changelog
  522. debian/control
  523. debian/changelog.OTHER
  524. debian/changelog.THIS
  525. debian/control.BASE
  526. debian/control.OTHER
  527. debian/control.THIS
  528. conflicts:
  529. Text conflict in debian/changelog
  530. Text conflict in debian/control
  531. pending merge tips: (use -v to see all merge revisions)
  532. Taylor LeMasurier... 2009-06-30 [merge] * Merge with mpd.head #13
  533. $ bzr revert debian/changelog
  534. [/ ] Revert phase 0/3 [######- ] Revert phase:comparing files 2/2 [######\ ] Revert phase 1/3 [######| ] Revert phase:Resolution pass 1/10 M debian/changelog
  535. [############/ ] Revert phase 2/3 [############- ] Revert phase:Apply phase 0/2 [###############\ ] Revert phase:Apply phase:removing file 0/30 [#################| ] Revert phase:Apply phase 2/3 [#################/ ] Revert phase:Apply phase:adding file 0/1 $ cp ../mpd.head.ppa/debian/changelog debian/changelog
  536. TARGET=0.15+git20090629.706614b-0ubuntu1~ripps2~hardy
  537. $ sed -i -e '1s/(.*) [^;]*/(0.15+git20090629.706614b-0ubuntu1~ripps2~hardy) hardy/' debian/changelog
  538. $ sed -i -e '1,/^ -- /s/^ -- .*/ -- Taylor LeMasurier-Wren <ripps818@gmail.com> Tue, 30 Jun 2009 03:33:04 -0500/' debian/changelog
  539. $ bzr resolve debian/changelog
  540. debian/changelog is not conflicted
  541. $ bzr revert debian/control
  542. [/ ] Revert phase 0/3 [######- ] Revert phase:comparing files 2/2 [######\ ] Revert phase 1/3 [######| ] Revert phase:Resolution pass 1/10 M debian/control
  543. [############/ ] Revert phase 2/3 [############- ] Revert phase:Apply phase 0/2 [###############\ ] Revert phase:Apply phase:removing file 0/27 [#################| ] Revert phase:Apply phase 2/3 [#################/ ] Revert phase:Apply phase:adding file 0/1 $ cp ../mpd.head.ppa/debian/control debian/control
  544. **INFO** Build-Depends += lintian
  545. $ bzr resolve debian/control
  546. debian/control is not conflicted
  547. $ bzr diff
  548. === modified file 'debian/changelog'
  549. --- debian/changelog 2009-06-30 02:59:32 +0000
  550. +++ debian/changelog 2009-06-30 08:34:42 +0000
  551. @@ -1,5 +1,5 @@
  552. -mpd (0.15+git20090629.706614b-0ubuntu1~ripps1~hardy) hardy; urgency=low
  553. +mpd (0.15+git20090629.706614b-0ubuntu1~ripps2~hardy) hardy; urgency=low
  554.  
  555. * Daily Release Build
  556.  
  557. - -- Taylor LeMasurier-Wren <ripps818@gmail.com> Mon, 29 Jun 2009 21:58:06 -0500
  558. + -- Taylor LeMasurier-Wren <ripps818@gmail.com> Tue, 30 Jun 2009 03:33:04 -0500
  559.  
  560. === modified file 'debian/control'
  561. --- debian/control 2009-06-26 11:40:46 +0000
  562. +++ debian/control 2009-06-30 08:34:43 +0000
  563. @@ -3,7 +3,7 @@
  564. Priority: optional
  565. Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
  566. XSBC-Original-Maintainer: Taylor LeMasurier-Wren <ripps818@gmail.com>
  567. -Build-Depends: lintian, lintian, libmms-dev, debhelper (>= 6),
  568. +Build-Depends: lintian, debhelper (>= 6),
  569. cdbs,
  570. automake1.10,
  571. libcurl4-gnutls-dev | libcurl-dev,
  572. @@ -28,7 +28,6 @@
  573. libid3tag0-dev,
  574. zlib1g-dev,
  575. libsidplay2-dev,
  576. -# libmms-dev,
  577. libsqlite3-dev,
  578. libmodplug-dev,
  579. libcue-dev,
  580.  
  581. $ bzr commit -m "* RELEASE 0.15+git20090629.706614b-0ubuntu1~ripps2~hardy to hardy/ppa\n - merge with mpd.head.ppa #18"
  582. [###/ ] Collecting changes [0] - Stage 1/5 Committing to: /home/ripps/build/bot/mpd.head.ppa.hardy/
  583. modified debian/changelog
  584. modified debian/control
  585. [###########- ] Running pre_commit hooks - Stage 3/5 Committed revision 16.
  586. => committed 0.15+git20090629.706614b-0ubuntu1~ripps2~hardy in mpd.head.ppa.hardy
  587. $ bzr bd --merge --build-dir=/home/ripps/ppa --orig-dir=../tarballs --builder=dpkg-buildpackage -rfakeroot -S -sd -k2091B1DD (ppa2)
  588. Building using working tree
  589. Running in merge mode
  590. Looking for a way to retrieve the upstream tarball
  591. Upstream tarball already exists in build directory, using that
  592. Building the package in /home/ripps/ppa/mpd-0.15+git20090629.706614b, using dpkg-buildpackage -rfakeroot -S -sd -k2091B1DD
  593. dpkg-buildpackage: set CFLAGS to default value: -g -O2
  594. dpkg-buildpackage: set CPPFLAGS to default value:
  595. dpkg-buildpackage: set LDFLAGS to default value: -Wl,-Bsymbolic-functions
  596. dpkg-buildpackage: set FFLAGS to default value: -g -O2
  597. dpkg-buildpackage: set CXXFLAGS to default value: -g -O2
  598. dpkg-buildpackage: source package mpd
  599. dpkg-buildpackage: source version 0.15+git20090629.706614b-0ubuntu1~ripps2~hardy
  600. dpkg-buildpackage: source changed by Taylor LeMasurier-Wren <ripps818@gmail.com>
  601. dpkg-checkbuilddeps: Unmet build dependencies: libcurl4-gnutls-dev | libcurl-dev libavahi-client-dev libsamplerate0-dev libaudiofile-dev libasound2-dev libao-dev (>= 0.8.3) libpulse-dev libjack-dev libshout3-dev libogg-dev libvorbis-dev libflac-dev (>= 1.1.4) libmpcdec-dev libmad0-dev libfaad-dev libmikmod2-dev libwavpack-dev libavcodec-dev libid3tag0-dev zlib1g-dev libsidplay2-dev libsqlite3-dev libmodplug-dev libcue-dev xmlto
  602. dpkg-buildpackage: warning: Build dependencies/conflicts unsatisfied; aborting.
  603. dpkg-buildpackage: warning: (Use -d flag to override.)
  604. dpkg-buildpackage: warning: This is currently a non-fatal warning with -S, but
  605. dpkg-buildpackage: warning: will probably become fatal in the future.
  606. fakeroot debian/rules clean
  607. test -x debian/rules
  608. rmdir debian/build
  609. rmdir: failed to remove `debian/build': No such file or directory
  610. make: [cleanbuilddir] Error 1 (ignored)
  611. dh_clean
  612. /usr/bin/make -C debian/build -k distclean
  613. make: *** debian/build: No such file or directory. Stop.
  614. make: [makefile-clean] Error 2 (ignored)
  615. rm -f debian/stamp-makefile-build
  616. rm -f debian/stamp-autotools-files
  617. dpkg-source -b mpd-0.15+git20090629.706614b
  618. dpkg-source: info: using source format `1.0'
  619. dpkg-source: info: building mpd using existing mpd_0.15+git20090629.706614b.orig.tar.gz
  620. dpkg-source: info: building mpd in mpd_0.15+git20090629.706614b-0ubuntu1~ripps2~hardy.diff.gz
  621. dpkg-source: info: building mpd in mpd_0.15+git20090629.706614b-0ubuntu1~ripps2~hardy.dsc
  622. signfile mpd_0.15+git20090629.706614b-0ubuntu1~ripps2~hardy.dsc
  623. dpkg-genchanges -S -sd >../mpd_0.15+git20090629.706614b-0ubuntu1~ripps2~hardy_source.changes
  624.  
  625. dpkg-genchanges: not including original source code in upload
  626. signfile mpd_0.15+git20090629.706614b-0ubuntu1~ripps2~hardy_source.changes
  627.  
  628. dpkg-buildpackage: source only, diff-only upload (original source NOT included)
  629. Cleaning build dir: /home/ripps/ppa/mpd-0.15+git20090629.706614b
  630. * Doing mpd-userspace from mpd-userspace.head to mpd-userspace.head.ppa
  631. - compare 0.15-1~beta1 (UNRELEASED) and 0.15+git20090629.706614b-0ubuntu1
  632. => isclosed=0 isnative=0
  633. - lastest daily version: 0.15+git20090629.706614b-0ubuntu1~ripps1
  634. => base_branch=0.15+git20090629.706614b iter_branch=0ubuntu1
  635. => base_ppa=0.15+git20090629.706614b iter_ppa=0ubuntu1~ripps1
  636. => need to check the branches :P
  637. $ cd mpd-userspace.head.ppa
  638. $ bzr merge ../mpd-userspace.head
  639. Nothing to do.
  640. $ bzr st
  641. => nothing to merge
  642. => ppa = 0.15+git20090629.706614b-0ubuntu1
  643. * Doing mpc from mpc.head to mpc.head.ppa
  644. - compare 0.16-1 (UNRELEASED) and 0.16+git20090525.ba2cda7-0ubuntu1
  645. => isclosed=0 isnative=0
  646. - lastest daily version: 0.16+git20090525.ba2cda7-0ubuntu1~ripps1
  647. => base_branch=0.16+git20090525.ba2cda7 iter_branch=0ubuntu1
  648. => base_ppa=0.16+git20090525.ba2cda7 iter_ppa=0ubuntu1~ripps1
  649. => need to check the branches :P
  650. $ cd mpc.head.ppa
  651. $ bzr merge ../mpc.head
  652. Nothing to do.
  653. $ bzr st
  654. => nothing to merge
  655. => ppa = 0.16+git20090525.ba2cda7-0ubuntu1
  656. * Doing mpdscribble from mpdscribble.head to mpdscribble.head.ppa
  657. - compare 0.16-1~fix2 (UNRELEASED) and 0.17+git20090618.d22668c-0ubuntu1
  658. => isclosed=0 isnative=0
  659. - lastest daily version: 0.17+git20090618.d22668c-0ubuntu1~ripps2
  660. => base_branch=0.17+git20090618.d22668c iter_branch=0ubuntu1
  661. => base_ppa=0.17+git20090618.d22668c iter_ppa=0ubuntu1~ripps2
  662. => need to check the branches :P
  663. $ cd mpdscribble.head.ppa
  664. $ bzr merge ../mpdscribble.head
  665. Nothing to do.
  666. $ bzr st
  667. => nothing to merge
  668. => ppa = 0.17+git20090618.d22668c-0ubuntu1
  669.  
  670.  
  671. # Please double check the results then issue:
  672. cd /home/ripps/ppa; dput staging \
  673. mpd_0.15+git20090629.706614b-0ubuntu1~ripps2_source.changes \
  674. mpd_0.15+git20090629.706614b-0ubuntu1~ripps2~jaunty_source.changes \
  675. mpd_0.15+git20090629.706614b-0ubuntu1~ripps2~intrepid_source.changes \
  676. mpd_0.15+git20090629.706614b-0ubuntu1~ripps2~hardy_source.changes
  677. gpg: Signature made Tue 30 Jun 2009 03:34:19 AM CDT using DSA key ID 2091B1DD
  678. gpg: Good signature from "Taylor LeMasurier-Wren <ripps818@gmail.com>"
  679. gpg: Signature made Tue 30 Jun 2009 03:34:11 AM CDT using DSA key ID 2091B1DD
  680. gpg: Good signature from "Taylor LeMasurier-Wren <ripps818@gmail.com>"
  681. Checking Signature on .changes
  682. Good signature on /home/ripps/ppa/mpd_0.15+git20090629.706614b-0ubuntu1~ripps2_source.changes.
  683. Checking Signature on .dsc
  684. Good signature on /home/ripps/ppa/mpd_0.15+git20090629.706614b-0ubuntu1~ripps2.dsc.
  685. Uploading to staging (via ftp to ppa.launchpad.net):
  686. Uploading mpd_0.15+git20090629.706614b-0ubuntu1~ripps2.dsc: done.
  687. Uploading mpd_0.15+git20090629.706614b-0ubuntu1~ripps2.diff.gz: done.
  688. Uploading mpd_0.15+git20090629.706614b-0ubuntu1~ripps2_source.changes: done.
  689. gpg: Signature made Tue 30 Jun 2009 03:34:29 AM CDT using DSA key ID 2091B1DD
  690. gpg: Good signature from "Taylor LeMasurier-Wren <ripps818@gmail.com>"
  691. gpg: Signature made Tue 30 Jun 2009 03:34:28 AM CDT using DSA key ID 2091B1DD
  692. gpg: Good signature from "Taylor LeMasurier-Wren <ripps818@gmail.com>"
  693. Successfully uploaded packages.
  694. Checking Signature on .changes
  695. Good signature on /home/ripps/ppa/mpd_0.15+git20090629.706614b-0ubuntu1~ripps2~jaunty_source.changes.
  696. Checking Signature on .dsc
  697. Good signature on /home/ripps/ppa/mpd_0.15+git20090629.706614b-0ubuntu1~ripps2~jaunty.dsc.
  698. Uploading to staging (via ftp to ppa.launchpad.net):
  699. Uploading mpd_0.15+git20090629.706614b-0ubuntu1~ripps2~jaunty.dsc: done.
  700. Uploading mpd_0.15+git20090629.706614b-0ubuntu1~ripps2~jaunty.diff.gz: done.
  701. Uploading mpd_0.15+git20090629.706614b-0ubuntu1~ripps2~jaunty_source.changes: done.
  702. gpg: Signature made Tue 30 Jun 2009 03:34:40 AM CDT using DSA key ID 2091B1DD
  703. gpg: Good signature from "Taylor LeMasurier-Wren <ripps818@gmail.com>"
  704. gpg: Signature made Tue 30 Jun 2009 03:34:39 AM CDT using DSA key ID 2091B1DD
  705. gpg: Good signature from "Taylor LeMasurier-Wren <ripps818@gmail.com>"
  706. Successfully uploaded packages.
  707. Checking Signature on .changes
  708. Good signature on /home/ripps/ppa/mpd_0.15+git20090629.706614b-0ubuntu1~ripps2~intrepid_source.changes.
  709. Checking Signature on .dsc
  710. Good signature on /home/ripps/ppa/mpd_0.15+git20090629.706614b-0ubuntu1~ripps2~intrepid.dsc.
  711. Uploading to staging (via ftp to ppa.launchpad.net):
  712. Uploading mpd_0.15+git20090629.706614b-0ubuntu1~ripps2~intrepid.dsc: done.
  713. Uploading mpd_0.15+git20090629.706614b-0ubuntu1~ripps2~intrepid.diff.gz: done.
  714. Uploading mpd_0.15+git20090629.706614b-0ubuntu1~ripps2~intrepid_source.changes: done.
  715. gpg: Signature made Tue 30 Jun 2009 03:34:49 AM CDT using DSA key ID 2091B1DD
  716. gpg: Good signature from "Taylor LeMasurier-Wren <ripps818@gmail.com>"
  717. gpg: Signature made Tue 30 Jun 2009 03:34:49 AM CDT using DSA key ID 2091B1DD
  718. gpg: Good signature from "Taylor LeMasurier-Wren <ripps818@gmail.com>"
  719. Successfully uploaded packages.
  720. Checking Signature on .changes
  721. Good signature on /home/ripps/ppa/mpd_0.15+git20090629.706614b-0ubuntu1~ripps2~hardy_source.changes.
  722. Checking Signature on .dsc
  723. Good signature on /home/ripps/ppa/mpd_0.15+git20090629.706614b-0ubuntu1~ripps2~hardy.dsc.
  724. Uploading to staging (via ftp to ppa.launchpad.net):
  725. Uploading mpd_0.15+git20090629.706614b-0ubuntu1~ripps2~hardy.dsc: done.
  726. Uploading mpd_0.15+git20090629.706614b-0ubuntu1~ripps2~hardy.diff.gz: done.
  727. Uploading mpd_0.15+git20090629.706614b-0ubuntu1~ripps2~hardy_source.changes: done.
  728. Successfully uploaded packages.
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!