API tools faq
paste
Advertisement
Guest User

Untitled

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