API tools faq
paste
Advertisement
Guest User

Untitled

a guest
May 6th, 2017
601
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 19.29 KB | None | 0 0
raw download clone embed print report
  1. * check_committed(mplayer-build.head)
  2. No revisions to pull.
  3. * check_committed(mplayer-build.head.ppa)
  4. * check_committed(mplayer-build.head.ppa.lucid)
  5. * check_committed(mplayer-build.head.ppa.karmic)
  6. * check_committed(mplayer-build.head.ppa.jaunty)
  7. * check_committed(mplayer-build.head.ppa.intrepid)
  8. * check_committed(mplayer-build.head.ppa.hardy)
  9. * Doing mplayer-build from mplayer-build.head to mplayer-build.head.ppa
  10. - compare 3:1.0~rc3-0 (lucid) and 3:1.0~rc3+git20100108.7602d24-0ubuntu2
  11. => isclosed=1 isnative=0 isahead=0
  12. - lastest daily version: 3:1.0~rc3+git20100108.7602d24-0ubuntu2~ripps1
  13. => from=ppa to=ppa.lucid
  14. => base_branch=3:1.0~rc3+git20100108.7602d24 iter_branch=0ubuntu2
  15. => base_ppa=3:1.0~rc3+git20100108.7602d24 iter_ppa=0ubuntu2~ripps1
  16. => need to check the branches :P
  17. $ cd mplayer-build.head.ppa
  18. $ bzr merge ../mplayer-build.head
  19. M debian/rules
  20. All changes applied successfully.
  21. $ bzr st
  22. modified:
  23. debian/rules
  24. pending merge tips: (use -v to see all merge revisions)
  25. Taylor LeMasurier... 2010-01-13 use quilt.make include instead of debhelpe...
  26. $ cp ../mplayer-build.head/debian/changelog debian/changelog
  27. $ DEBEMAIL="Taylor LeMasurier-Wren <ripps818@gmail.com>" dch -b -v 3:1.0~rc3+git20100108.7602d24-0ubuntu3 -D UNRELEASED "New upstream snapshot"
  28. $ bzr revert debian/control
  29. $ cp ../mplayer-build.head/debian/control debian/control
  30. $ bzr diff
  31. === modified file 'debian/changelog'
  32. --- debian/changelog 2010-01-14 03:31:12 +0000
  33. +++ debian/changelog 2010-01-14 15:06:16 +0000
  34. @@ -1,8 +1,8 @@
  35. -mplayer-build (3:1.0~rc3+git20100108.7602d24-0ubuntu2) UNRELEASED; urgency=low
  36. +mplayer-build (3:1.0~rc3+git20100108.7602d24-0ubuntu3) UNRELEASED; urgency=low
  37.  
  38. * New upstream snapshot
  39.  
  40. - -- Taylor LeMasurier-Wren <ripps818@gmail.com> Wed, 13 Jan 2010 21:31:10 -0600
  41. + -- Taylor LeMasurier-Wren <ripps818@gmail.com> Thu, 14 Jan 2010 09:06:16 -0600
  42.  
  43. mplayer-build (3:1.0~rc3-0) lucid; urgency=low
  44.  
  45.  
  46. === modified file 'debian/rules'
  47. --- debian/rules 2010-01-14 02:38:03 +0000
  48. +++ debian/rules 2010-01-14 15:06:13 +0000
  49. @@ -4,6 +4,8 @@
  50. DEBIAN_UPSTREAM_VERSION := $(shell echo $(DEBIAN_VERSION) | sed 's/^\(.*\)-[^-]*$$/\1/')
  51. DEBIAN_REVISION := $(shell echo $(DEBIAN_VERSION) | sed 's/^.*r\([^-]*\)-.*/\1/')
  52.  
  53. +include /usr/share/quilt/quilt.make
  54. +
  55. unexport CFLAGS
  56.  
  57. DEB_BUILD_DISTRO ?= $(shell lsb_release -cs)
  58. @@ -40,7 +42,7 @@
  59. endif
  60.  
  61. %:
  62. - dh $@ --with quilt
  63. + dh $@
  64.  
  65. build: configure-stamp patch
  66. dh build
  67.  
  68. $ bzr commit -m "* Merge with mplayer-build.head #12"
  69. Committing to: /home/ripps/build/bot/mplayer-build.head.ppa/
  70. modified debian/changelog
  71. modified debian/rules
  72. Committed revision 14.
  73. *LOG* sync mplayer-build: merged rev #12 from mplayer-build.head
  74. => committed 3:1.0~rc3+git20100108.7602d24-0ubuntu3 in mplayer-build.head.ppa
  75. $ cd mplayer-build.head.ppa.lucid
  76. $ bzr merge ../mplayer-build.head.ppa
  77. M debian/changelog
  78. M debian/rules
  79. Text conflict in debian/changelog
  80. 1 conflicts encountered.
  81. $ bzr st
  82. modified:
  83. debian/changelog
  84. debian/rules
  85. debian/changelog.OTHER
  86. debian/changelog.THIS
  87. conflicts:
  88. Text conflict in debian/changelog
  89. pending merge tips: (use -v to see all merge revisions)
  90. Taylor LeMasurier... 2010-01-14 [merge] * Merge with mplayer-build.head #12
  91. $ bzr revert debian/changelog
  92. M debian/changelog
  93. $ cp ../mplayer-build.head.ppa/debian/changelog debian/changelog
  94. TARGET=3:1.0~rc3+git20100108.7602d24-0ubuntu3~ripps2
  95. $ sed -i -e '1s/(.*) [^;]*/(3:1.0~rc3+git20100108.7602d24-0ubuntu3~ripps2) lucid/' debian/changelog
  96. $ bzr revert debian/control
  97. $ cp ../mplayer-build.head.ppa/debian/control debian/control
  98. **INFO** Build-Depends += libxvidcore-dev, libpng3-dev
  99. $ bzr diff
  100. === modified file 'debian/changelog'
  101. --- debian/changelog 2010-01-14 03:31:17 +0000
  102. +++ debian/changelog 2010-01-14 15:06:25 +0000
  103. @@ -1,8 +1,8 @@
  104. -mplayer-build (3:1.0~rc3+git20100108.7602d24-0ubuntu2~ripps1) lucid; urgency=low
  105. +mplayer-build (3:1.0~rc3+git20100108.7602d24-0ubuntu3~ripps2) lucid; urgency=low
  106.  
  107. * New upstream snapshot
  108.  
  109. - -- Taylor LeMasurier-Wren <ripps818@gmail.com> Wed, 13 Jan 2010 21:31:10 -0600
  110. + -- Taylor LeMasurier-Wren <ripps818@gmail.com> Thu, 14 Jan 2010 09:06:16 -0600
  111.  
  112. mplayer-build (3:1.0~rc3-0) lucid; urgency=low
  113.  
  114.  
  115. === modified file 'debian/rules'
  116. --- debian/rules 2010-01-14 02:38:03 +0000
  117. +++ debian/rules 2010-01-14 15:06:22 +0000
  118. @@ -4,6 +4,8 @@
  119. DEBIAN_UPSTREAM_VERSION := $(shell echo $(DEBIAN_VERSION) | sed 's/^\(.*\)-[^-]*$$/\1/')
  120. DEBIAN_REVISION := $(shell echo $(DEBIAN_VERSION) | sed 's/^.*r\([^-]*\)-.*/\1/')
  121.  
  122. +include /usr/share/quilt/quilt.make
  123. +
  124. unexport CFLAGS
  125.  
  126. DEB_BUILD_DISTRO ?= $(shell lsb_release -cs)
  127. @@ -40,7 +42,7 @@
  128. endif
  129.  
  130. %:
  131. - dh $@ --with quilt
  132. + dh $@
  133.  
  134. build: configure-stamp patch
  135. dh build
  136.  
  137. $ bzr commit -m "* RELEASE 3:1.0~rc3+git20100108.7602d24-0ubuntu3~ripps2 to lucid/ppa\n - merge with mplayer-build.head.ppa #14"
  138. Committing to: /home/ripps/build/bot/mplayer-build.head.ppa.lucid/
  139. modified debian/changelog
  140. modified debian/rules
  141. Committed revision 14.
  142. => committed 3:1.0~rc3+git20100108.7602d24-0ubuntu3~ripps2 in mplayer-build.head.ppa.lucid
  143. $ bzr bd --merge --build-dir=/home/ripps/ppa --orig-dir=../tarballs --builder=dpkg-buildpackage -rfakeroot -S -sa -k2CF34E6D (ppa)
  144. Building using working tree
  145. Running in merge mode
  146. Looking for a way to retrieve the upstream tarball
  147. Using apt to look for the upstream tarball.
  148. apt could not find the needed tarball.
  149. Trying to use get-orig-source to retrieve needed tarball.
  150. rm -rf tmp-9478
  151. mkdir tmp-9478
  152. if [ ! -d ]; then git clone git://repo.or.cz/mplayer-build.git && ./enable-mt && ./init --shallow; fi
  153. cd && ./update
  154. /bin/sh: ./update: not found
  155. make: *** [get-orig-source] Error 127
  156. Trying to run get-orig-source rule failed
  157. No watch file to use to retrieve upstream tarball.
  158. bzr: ERROR: Unable to find the needed upstream tarball: mplayer-build_1.0~rc3+git20100108.7602d24.orig.tar.gz.
  159. $ cd mplayer-build.head.ppa.karmic
  160. $ bzr merge ../mplayer-build.head.ppa
  161. M debian/changelog
  162. M debian/rules
  163. Text conflict in debian/changelog
  164. 1 conflicts encountered.
  165. $ bzr st
  166. modified:
  167. debian/changelog
  168. debian/rules
  169. debian/changelog.OTHER
  170. debian/changelog.THIS
  171. conflicts:
  172. Text conflict in debian/changelog
  173. pending merge tips: (use -v to see all merge revisions)
  174. Taylor LeMasurier... 2010-01-14 [merge] * Merge with mplayer-build.head #12
  175. $ bzr revert debian/changelog
  176. M debian/changelog
  177. $ cp ../mplayer-build.head.ppa/debian/changelog debian/changelog
  178. TARGET=3:1.0~rc3+git20100108.7602d24-0ubuntu3~ripps2~karmic
  179. $ sed -i -e '1s/(.*) [^;]*/(3:1.0~rc3+git20100108.7602d24-0ubuntu3~ripps2~karmic) karmic/' debian/changelog
  180. $ bzr revert debian/control
  181. $ cp ../mplayer-build.head.ppa/debian/control debian/control
  182. **INFO** Build-Depends += libxvidcore4-dev, libpng3-dev
  183. $ bzr diff
  184. === modified file 'debian/changelog'
  185. --- debian/changelog 2010-01-14 03:31:53 +0000
  186. +++ debian/changelog 2010-01-14 15:06:36 +0000
  187. @@ -1,8 +1,8 @@
  188. -mplayer-build (3:1.0~rc3+git20100108.7602d24-0ubuntu2~ripps1~karmic) karmic; urgency=low
  189. +mplayer-build (3:1.0~rc3+git20100108.7602d24-0ubuntu3~ripps2~karmic) karmic; urgency=low
  190.  
  191. * New upstream snapshot
  192.  
  193. - -- Taylor LeMasurier-Wren <ripps818@gmail.com> Wed, 13 Jan 2010 21:31:10 -0600
  194. + -- Taylor LeMasurier-Wren <ripps818@gmail.com> Thu, 14 Jan 2010 09:06:16 -0600
  195.  
  196. mplayer-build (3:1.0~rc3-0) lucid; urgency=low
  197.  
  198.  
  199. === modified file 'debian/rules'
  200. --- debian/rules 2010-01-14 02:38:03 +0000
  201. +++ debian/rules 2010-01-14 15:06:35 +0000
  202. @@ -4,6 +4,8 @@
  203. DEBIAN_UPSTREAM_VERSION := $(shell echo $(DEBIAN_VERSION) | sed 's/^\(.*\)-[^-]*$$/\1/')
  204. DEBIAN_REVISION := $(shell echo $(DEBIAN_VERSION) | sed 's/^.*r\([^-]*\)-.*/\1/')
  205.  
  206. +include /usr/share/quilt/quilt.make
  207. +
  208. unexport CFLAGS
  209.  
  210. DEB_BUILD_DISTRO ?= $(shell lsb_release -cs)
  211. @@ -40,7 +42,7 @@
  212. endif
  213.  
  214. %:
  215. - dh $@ --with quilt
  216. + dh $@
  217.  
  218. build: configure-stamp patch
  219. dh build
  220.  
  221. $ bzr commit -m "* RELEASE 3:1.0~rc3+git20100108.7602d24-0ubuntu3~ripps2~karmic to karmic/ppa\n - merge with mplayer-build.head.ppa #14"
  222. Committing to: /home/ripps/build/bot/mplayer-build.head.ppa.karmic/
  223. modified debian/changelog
  224. modified debian/rules
  225. Committed revision 14.
  226. => committed 3:1.0~rc3+git20100108.7602d24-0ubuntu3~ripps2~karmic in mplayer-build.head.ppa.karmic
  227. $ bzr bd --merge --build-dir=/home/ripps/ppa --orig-dir=../tarballs --builder=dpkg-buildpackage -rfakeroot -S -sd -k2CF34E6D (ppa2)
  228. Building using working tree
  229. Running in merge mode
  230. Looking for a way to retrieve the upstream tarball
  231. Using apt to look for the upstream tarball.
  232. apt could not find the needed tarball.
  233. Trying to use get-orig-source to retrieve needed tarball.
  234. rm -rf tmp-9551
  235. mkdir tmp-9551
  236. if [ ! -d ]; then git clone git://repo.or.cz/mplayer-build.git && ./enable-mt && ./init --shallow; fi
  237. cd && ./update
  238. /bin/sh: ./update: not found
  239. make: *** [get-orig-source] Error 127
  240. Trying to run get-orig-source rule failed
  241. No watch file to use to retrieve upstream tarball.
  242. bzr: ERROR: Unable to find the needed upstream tarball: mplayer-build_1.0~rc3+git20100108.7602d24.orig.tar.gz.
  243. $ cd mplayer-build.head.ppa.jaunty
  244. $ bzr merge ../mplayer-build.head.ppa
  245. M debian/changelog
  246. M debian/rules
  247. Text conflict in debian/changelog
  248. 1 conflicts encountered.
  249. $ bzr st
  250. modified:
  251. debian/changelog
  252. debian/rules
  253. debian/changelog.OTHER
  254. debian/changelog.THIS
  255. conflicts:
  256. Text conflict in debian/changelog
  257. pending merge tips: (use -v to see all merge revisions)
  258. Taylor LeMasurier... 2010-01-14 [merge] * Merge with mplayer-build.head #12
  259. $ bzr revert debian/changelog
  260. M debian/changelog
  261. $ cp ../mplayer-build.head.ppa/debian/changelog debian/changelog
  262. TARGET=3:1.0~rc3+git20100108.7602d24-0ubuntu3~ripps2~jaunty
  263. $ sed -i -e '1s/(.*) [^;]*/(3:1.0~rc3+git20100108.7602d24-0ubuntu3~ripps2~jaunty) jaunty/' debian/changelog
  264. $ bzr revert debian/control
  265. $ cp ../mplayer-build.head.ppa/debian/control debian/control
  266. **INFO** Build-Depends += libxvidcore4-dev, libpng3-dev
  267. $ bzr diff
  268. === modified file 'debian/changelog'
  269. --- debian/changelog 2010-01-14 03:32:27 +0000
  270. +++ debian/changelog 2010-01-14 15:06:46 +0000
  271. @@ -1,8 +1,8 @@
  272. -mplayer-build (3:1.0~rc3+git20100108.7602d24-0ubuntu2~ripps1~jaunty) jaunty; urgency=low
  273. +mplayer-build (3:1.0~rc3+git20100108.7602d24-0ubuntu3~ripps2~jaunty) jaunty; urgency=low
  274.  
  275. * New upstream snapshot
  276.  
  277. - -- Taylor LeMasurier-Wren <ripps818@gmail.com> Wed, 13 Jan 2010 21:31:10 -0600
  278. + -- Taylor LeMasurier-Wren <ripps818@gmail.com> Thu, 14 Jan 2010 09:06:16 -0600
  279.  
  280. mplayer-build (3:1.0~rc3-0) lucid; urgency=low
  281.  
  282.  
  283. === modified file 'debian/rules'
  284. --- debian/rules 2010-01-14 02:38:03 +0000
  285. +++ debian/rules 2010-01-14 15:06:44 +0000
  286. @@ -4,6 +4,8 @@
  287. DEBIAN_UPSTREAM_VERSION := $(shell echo $(DEBIAN_VERSION) | sed 's/^\(.*\)-[^-]*$$/\1/')
  288. DEBIAN_REVISION := $(shell echo $(DEBIAN_VERSION) | sed 's/^.*r\([^-]*\)-.*/\1/')
  289.  
  290. +include /usr/share/quilt/quilt.make
  291. +
  292. unexport CFLAGS
  293.  
  294. DEB_BUILD_DISTRO ?= $(shell lsb_release -cs)
  295. @@ -40,7 +42,7 @@
  296. endif
  297.  
  298. %:
  299. - dh $@ --with quilt
  300. + dh $@
  301.  
  302. build: configure-stamp patch
  303. dh build
  304.  
  305. $ bzr commit -m "* RELEASE 3:1.0~rc3+git20100108.7602d24-0ubuntu3~ripps2~jaunty to jaunty/ppa\n - merge with mplayer-build.head.ppa #14"
  306. Committing to: /home/ripps/build/bot/mplayer-build.head.ppa.jaunty/
  307. modified debian/changelog
  308. modified debian/rules
  309. Committed revision 14.
  310. => committed 3:1.0~rc3+git20100108.7602d24-0ubuntu3~ripps2~jaunty in mplayer-build.head.ppa.jaunty
  311. $ bzr bd --merge --build-dir=/home/ripps/ppa --orig-dir=../tarballs --builder=dpkg-buildpackage -rfakeroot -S -sd -k2CF34E6D (ppa2)
  312. Building using working tree
  313. Running in merge mode
  314. Looking for a way to retrieve the upstream tarball
  315. Using apt to look for the upstream tarball.
  316. apt could not find the needed tarball.
  317. Trying to use get-orig-source to retrieve needed tarball.
  318. rm -rf tmp-9624
  319. mkdir tmp-9624
  320. if [ ! -d ]; then git clone git://repo.or.cz/mplayer-build.git && ./enable-mt && ./init --shallow; fi
  321. cd && ./update
  322. /bin/sh: ./update: not found
  323. make: *** [get-orig-source] Error 127
  324. Trying to run get-orig-source rule failed
  325. No watch file to use to retrieve upstream tarball.
  326. bzr: ERROR: Unable to find the needed upstream tarball: mplayer-build_1.0~rc3+git20100108.7602d24.orig.tar.gz.
  327. $ cd mplayer-build.head.ppa.intrepid
  328. $ bzr merge ../mplayer-build.head.ppa
  329. M debian/changelog
  330. M debian/rules
  331. Text conflict in debian/changelog
  332. 1 conflicts encountered.
  333. $ bzr st
  334. modified:
  335. debian/changelog
  336. debian/rules
  337. debian/changelog.OTHER
  338. debian/changelog.THIS
  339. conflicts:
  340. Text conflict in debian/changelog
  341. pending merge tips: (use -v to see all merge revisions)
  342. Taylor LeMasurier... 2010-01-14 [merge] * Merge with mplayer-build.head #12
  343. $ bzr revert debian/changelog
  344. M debian/changelog
  345. $ cp ../mplayer-build.head.ppa/debian/changelog debian/changelog
  346. TARGET=3:1.0~rc3+git20100108.7602d24-0ubuntu3~ripps2~intrepid
  347. $ sed -i -e '1s/(.*) [^;]*/(3:1.0~rc3+git20100108.7602d24-0ubuntu3~ripps2~intrepid) intrepid/' debian/changelog
  348. $ bzr revert debian/control
  349. $ cp ../mplayer-build.head.ppa/debian/control debian/control
  350. **INFO** Build-Depends += libxvidcore4-dev, libpng3-dev
  351. $ bzr diff
  352. === modified file 'debian/changelog'
  353. --- debian/changelog 2010-01-14 03:33:02 +0000
  354. +++ debian/changelog 2010-01-14 15:06:55 +0000
  355. @@ -1,8 +1,8 @@
  356. -mplayer-build (3:1.0~rc3+git20100108.7602d24-0ubuntu2~ripps1~intrepid) intrepid; urgency=low
  357. +mplayer-build (3:1.0~rc3+git20100108.7602d24-0ubuntu3~ripps2~intrepid) intrepid; urgency=low
  358.  
  359. * New upstream snapshot
  360.  
  361. - -- Taylor LeMasurier-Wren <ripps818@gmail.com> Wed, 13 Jan 2010 21:31:10 -0600
  362. + -- Taylor LeMasurier-Wren <ripps818@gmail.com> Thu, 14 Jan 2010 09:06:16 -0600
  363.  
  364. mplayer-build (3:1.0~rc3-0) lucid; urgency=low
  365.  
  366.  
  367. === modified file 'debian/rules'
  368. --- debian/rules 2010-01-14 02:38:03 +0000
  369. +++ debian/rules 2010-01-14 15:06:54 +0000
  370. @@ -4,6 +4,8 @@
  371. DEBIAN_UPSTREAM_VERSION := $(shell echo $(DEBIAN_VERSION) | sed 's/^\(.*\)-[^-]*$$/\1/')
  372. DEBIAN_REVISION := $(shell echo $(DEBIAN_VERSION) | sed 's/^.*r\([^-]*\)-.*/\1/')
  373.  
  374. +include /usr/share/quilt/quilt.make
  375. +
  376. unexport CFLAGS
  377.  
  378. DEB_BUILD_DISTRO ?= $(shell lsb_release -cs)
  379. @@ -40,7 +42,7 @@
  380. endif
  381.  
  382. %:
  383. - dh $@ --with quilt
  384. + dh $@
  385.  
  386. build: configure-stamp patch
  387. dh build
  388.  
  389. $ bzr commit -m "* RELEASE 3:1.0~rc3+git20100108.7602d24-0ubuntu3~ripps2~intrepid to intrepid/ppa\n - merge with mplayer-build.head.ppa #14"
  390. Committing to: /home/ripps/build/bot/mplayer-build.head.ppa.intrepid/
  391. modified debian/changelog
  392. modified debian/rules
  393. Committed revision 14.
  394. => committed 3:1.0~rc3+git20100108.7602d24-0ubuntu3~ripps2~intrepid in mplayer-build.head.ppa.intrepid
  395. $ bzr bd --merge --build-dir=/home/ripps/ppa --orig-dir=../tarballs --builder=dpkg-buildpackage -rfakeroot -S -sd -k2CF34E6D (ppa2)
  396. Building using working tree
  397. Running in merge mode
  398. Looking for a way to retrieve the upstream tarball
  399. Using apt to look for the upstream tarball.
  400. apt could not find the needed tarball.
  401. Trying to use get-orig-source to retrieve needed tarball.
  402. rm -rf tmp-9710
  403. mkdir tmp-9710
  404. if [ ! -d ]; then git clone git://repo.or.cz/mplayer-build.git && ./enable-mt && ./init --shallow; fi
  405. cd && ./update
  406. /bin/sh: ./update: not found
  407. make: *** [get-orig-source] Error 127
  408. Trying to run get-orig-source rule failed
  409. No watch file to use to retrieve upstream tarball.
  410. bzr: ERROR: Unable to find the needed upstream tarball: mplayer-build_1.0~rc3+git20100108.7602d24.orig.tar.gz.
  411. $ cd mplayer-build.head.ppa.hardy
  412. $ bzr merge ../mplayer-build.head.ppa
  413. M debian/changelog
  414. M debian/rules
  415. Text conflict in debian/changelog
  416. 1 conflicts encountered.
  417. $ bzr st
  418. modified:
  419. debian/changelog
  420. debian/rules
  421. debian/changelog.OTHER
  422. debian/changelog.THIS
  423. conflicts:
  424. Text conflict in debian/changelog
  425. pending merge tips: (use -v to see all merge revisions)
  426. Taylor LeMasurier... 2010-01-14 [merge] * Merge with mplayer-build.head #12
  427. $ bzr revert debian/changelog
  428. M debian/changelog
  429. $ cp ../mplayer-build.head.ppa/debian/changelog debian/changelog
  430. TARGET=3:1.0~rc3+git20100108.7602d24-0ubuntu3~ripps2~hardy
  431. $ sed -i -e '1s/(.*) [^;]*/(3:1.0~rc3+git20100108.7602d24-0ubuntu3~ripps2~hardy) hardy/' debian/changelog
  432. $ bzr revert debian/control
  433. $ cp ../mplayer-build.head.ppa/debian/control debian/control
  434. **INFO** Build-Depends += libxvidcore4-dev
  435. $ bzr diff
  436. === modified file 'debian/changelog'
  437. --- debian/changelog 2010-01-14 03:33:37 +0000
  438. +++ debian/changelog 2010-01-14 15:07:07 +0000
  439. @@ -1,8 +1,8 @@
  440. -mplayer-build (3:1.0~rc3+git20100108.7602d24-0ubuntu2~ripps1~hardy) hardy; urgency=low
  441. +mplayer-build (3:1.0~rc3+git20100108.7602d24-0ubuntu3~ripps2~hardy) hardy; urgency=low
  442.  
  443. * New upstream snapshot
  444.  
  445. - -- Taylor LeMasurier-Wren <ripps818@gmail.com> Wed, 13 Jan 2010 21:31:10 -0600
  446. + -- Taylor LeMasurier-Wren <ripps818@gmail.com> Thu, 14 Jan 2010 09:06:16 -0600
  447.  
  448. mplayer-build (3:1.0~rc3-0) lucid; urgency=low
  449.  
  450.  
  451. === modified file 'debian/rules'
  452. --- debian/rules 2010-01-14 02:38:03 +0000
  453. +++ debian/rules 2010-01-14 15:07:05 +0000
  454. @@ -4,6 +4,8 @@
  455. DEBIAN_UPSTREAM_VERSION := $(shell echo $(DEBIAN_VERSION) | sed 's/^\(.*\)-[^-]*$$/\1/')
  456. DEBIAN_REVISION := $(shell echo $(DEBIAN_VERSION) | sed 's/^.*r\([^-]*\)-.*/\1/')
  457.  
  458. +include /usr/share/quilt/quilt.make
  459. +
  460. unexport CFLAGS
  461.  
  462. DEB_BUILD_DISTRO ?= $(shell lsb_release -cs)
  463. @@ -40,7 +42,7 @@
  464. endif
  465.  
  466. %:
  467. - dh $@ --with quilt
  468. + dh $@
  469.  
  470. build: configure-stamp patch
  471. dh build
  472.  
  473. $ bzr commit -m "* RELEASE 3:1.0~rc3+git20100108.7602d24-0ubuntu3~ripps2~hardy to hardy/ppa\n - merge with mplayer-build.head.ppa #14"
  474. Committing to: /home/ripps/build/bot/mplayer-build.head.ppa.hardy/
  475. modified debian/changelog
  476. modified debian/rules
  477. Committed revision 14.
  478. => committed 3:1.0~rc3+git20100108.7602d24-0ubuntu3~ripps2~hardy in mplayer-build.head.ppa.hardy
  479. $ bzr bd --merge --build-dir=/home/ripps/ppa --orig-dir=../tarballs --builder=dpkg-buildpackage -rfakeroot -S -sd -k2CF34E6D (ppa2)
  480. Building using working tree
  481. Running in merge mode
  482. Looking for a way to retrieve the upstream tarball
  483. Using apt to look for the upstream tarball.
  484. apt could not find the needed tarball.
  485. Trying to use get-orig-source to retrieve needed tarball.
  486. rm -rf tmp-9783
  487. mkdir tmp-9783
  488. if [ ! -d ]; then git clone git://repo.or.cz/mplayer-build.git && ./enable-mt && ./init --shallow; fi
  489. cd && ./update
  490. /bin/sh: ./update: not found
  491. make: *** [get-orig-source] Error 127
  492. Trying to run get-orig-source rule failed
  493. No watch file to use to retrieve upstream tarball.
  494. bzr: ERROR: Unable to find the needed upstream tarball: mplayer-build_1.0~rc3+git20100108.7602d24.orig.tar.gz.
  495.  
  496.  
  497. # Please double check the results then issue:
  498. cd /home/ripps/ppa; dput coreavc \
  499. mplayer-build_1.0~rc3+git20100108.7602d24-0ubuntu3~ripps2_source.changes \
  500. mplayer-build_1.0~rc3+git20100108.7602d24-0ubuntu3~ripps2~karmic_source.changes \
  501. mplayer-build_1.0~rc3+git20100108.7602d24-0ubuntu3~ripps2~jaunty_source.changes \
  502. mplayer-build_1.0~rc3+git20100108.7602d24-0ubuntu3~ripps2~intrepid_source.changes \
  503. mplayer-build_1.0~rc3+git20100108.7602d24-0ubuntu3~ripps2~hardy_source.changes
  504. Can't open /home/ripps/ppa/mplayer-build_1.0~rc3+git20100108.7602d24-0ubuntu3~ripps2_source.changes
  505. *LOG* dput 'coreavc' returned with error 256: Bad file descriptor
  506. *LOG* dput: mplayer-build_1.0~rc3+git20100108.7602d24-0ubuntu3~ripps2_source not uploaded
  507. *LOG* dput: mplayer-build_1.0~rc3+git20100108.7602d24-0ubuntu3~ripps2~karmic_source not uploaded
  508. *LOG* dput: mplayer-build_1.0~rc3+git20100108.7602d24-0ubuntu3~ripps2~jaunty_source not uploaded
  509. *LOG* dput: mplayer-build_1.0~rc3+git20100108.7602d24-0ubuntu3~ripps2~intrepid_source not uploaded
  510. *LOG* dput: mplayer-build_1.0~rc3+git20100108.7602d24-0ubuntu3~ripps2~hardy_source not uploaded
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!