On Thu, 02 Aug 2012, andrei zavada wrote: > An hour of debian maintenance a day keeps doctors away.
LOL! That is the spirit! > > and not a part of the dsc on > > http://johnhommer.com/academic/code/cnrun/source/deb/cnrun_1.1.13-1.dsc > > which I just refetched which still lacks it. > But please, can you tell me why debian/upstream is missing from > the .debian.tar.gz archive? I often also can't find the way out of the three trees... ;) > Is it because debhelper doesn't know about it? debhelper kicks in later on -- it has nothing to do with the source package > This file is in the tree alright, but debuild just... didn't include it. I > wonder why, and what do I need to do to fix this? I bet it is something really really ... simple ... let's see if I could reproduce. NB below I use git-buildpackage which I also advise you to use... I have some custom settings so it builds out of source for me under ../build-area and seeks for tarballs not in ../ but in ../tarballs. NB2 git repository on git.debian.org lacks ANY tags... forgotten to be pushed? (needs separate --tags for git push, or I advise smth like "git config --add remote.alioth.push refs/tags/*; git config --add remote.alioth.push refs/heads/*"... replace alioth with the remote name you have) NB3: $> grep DOI debian/upstream DOI: oi:10.1371/journal.pone.0016308 oi indeed... fixed, pushed together with tune up for Author: list so it would be valid for BibTex... you might reformat it with First Last to avoid comma before L. after First ;) it failed to build source pkg since .orig you previously gave me: $> md5sum ../tarballs/cnrun_1.1.13.orig.tar.bz2 21fc11b9dc553690dbba3f0d845eb02f ../tarballs/cnrun_1.1.13.orig.tar.bz2 doesn't match the state of current master (which is the one for everything, i.e. there is no separate debian branch, which is usually where I keep debian packaging...) $> git-buildpackage --git-ignore-new -uc -us -rfakeroot --git-no-pristine-tar dh clean --with autoreconf dh_testdir dh_auto_clean dh_autoreconf_clean dh_clean gbp:info: Orig tarball 'cnrun_1.1.13.orig.tar.bz2' found at '../tarballs/' gbp:info: Exporting 'HEAD' to '/home/yoh/deb/gits/pkg-exppsy/build-area/cnrun-tmp' gbp:info: Moving '/home/yoh/deb/gits/pkg-exppsy/build-area/cnrun-tmp' to '/home/yoh/deb/gits/pkg-exppsy/build-area/cnrun-1.1.13' dpkg-buildpackage -rfakeroot -D -us -uc -i -ICVS -I.svn -i -I dpkg-buildpackage: source package cnrun dpkg-buildpackage: source version 1.1.13-1 dpkg-buildpackage: source changed by Andrei Zavada <[email protected]> dpkg-source -i -ICVS -I.svn -i -I --before-build cnrun-1.1.13 dpkg-buildpackage: host architecture amd64 fakeroot debian/rules clean dh clean --with autoreconf dh_testdir dh_auto_clean dh_autoreconf_clean dh_clean dpkg-source -i -ICVS -I.svn -i -I -b cnrun-1.1.13 dpkg-source: info: using source format `3.0 (quilt)' dpkg-source: info: building cnrun using existing ./cnrun_1.1.13.orig.tar.bz2 dpkg-source: warning: ignoring deletion of file missing dpkg-source: warning: ignoring deletion of file config.h.in dpkg-source: warning: ignoring deletion of directory m4 dpkg-source: warning: executable mode 0700 of 'doc/examples/ratiocoding/rational-plot-sdf-interactive' will not be represented in diff dpkg-source: warning: executable mode 0700 of 'doc/examples/ratiocoding/rational-plot-var' will not be represented in diff dpkg-source: warning: executable mode 0700 of 'doc/examples/ratiocoding/rational-plot-sdf-static' will not be represented in diff dpkg-source: info: local changes detected, the modified files are: cnrun-1.1.13/doc/examples/ratiocoding/rational-plot-sdf-interactive cnrun-1.1.13/doc/examples/ratiocoding/rational-plot-sdf-static cnrun-1.1.13/doc/examples/ratiocoding/rational-plot-var dpkg-source: error: aborting due to unexpected upstream changes, see /tmp/cnrun_1.1.13-1.diff.r2Vj42 dpkg-source: info: you can integrate the local changes with dpkg-source --commit dpkg-buildpackage: error: dpkg-source -i -ICVS -I.svn -i -I -b cnrun-1.1.13 gave error exit status 2 debuild: fatal error at line 1357: dpkg-buildpackage -rfakeroot -D -us -uc -i -ICVS -I.svn -i -I failed gbp:error: Couldn't run 'debuild -i -I -uc -us -rfakeroot': debuild -i -I returned 29 ok -- let's generate .orig manually: > rm -f ../tarballs/cnrun_1.1.13.orig.tar.bz2; git archive --format=tar > --prefix=cnrun-1.1.13/ master | gzip -9 >| > ../tarballs/cnrun_1.1.13.orig.tar.gz and building again (-S just for source pkg): $> git-buildpackage --git-ignore-new -uc -us -rfakeroot --git-no-pristine-tar -S dh clean --with autoreconf dh_testdir dh_auto_clean dh_autoreconf_clean dh_clean gbp:info: Orig tarball 'cnrun_1.1.13.orig.tar.gz' found at '../tarballs/' gbp:info: Exporting 'HEAD' to '/home/yoh/deb/gits/pkg-exppsy/build-area/cnrun-tmp' gbp:info: Moving '/home/yoh/deb/gits/pkg-exppsy/build-area/cnrun-tmp' to '/home/yoh/deb/gits/pkg-exppsy/build-area/cnrun-1.1.13' dpkg-buildpackage -rfakeroot -d -us -uc -i -ICVS -I.svn -i -I -S dpkg-buildpackage: source package cnrun dpkg-buildpackage: source version 1.1.13-1 dpkg-buildpackage: source changed by Andrei Zavada <[email protected]> dpkg-source -i -ICVS -I.svn -i -I --before-build cnrun-1.1.13 fakeroot debian/rules clean dh clean --with autoreconf dh_testdir dh_auto_clean dh_autoreconf_clean dh_clean dpkg-source -i -ICVS -I.svn -i -I -b cnrun-1.1.13 dpkg-source: info: using source format `3.0 (quilt)' dpkg-source: info: building cnrun using existing ./cnrun_1.1.13.orig.tar.gz dpkg-source: info: building cnrun in cnrun_1.1.13-1.debian.tar.gz dpkg-source: info: building cnrun in cnrun_1.1.13-1.dsc dpkg-genchanges -S >../cnrun_1.1.13-1_source.changes dpkg-genchanges: including full source code in upload dpkg-source -i -ICVS -I.svn -i -I --after-build cnrun-1.1.13 dpkg-buildpackage: full upload (original source is included) Now running lintian... Finished running lintian. git-buildpackage --git-ignore-new -uc -us -rfakeroot --git-no-pristine-tar -S 6,42s user 1,00s system 96% cpu 7,671 total hoorray -- it did it... lets see if we have the most important file: $> tar -tzvf ../build-area/cnrun_1.1.13-1.debian.tar.gz | grep upstream -rw------- 0/0 478 2012-08-01 19:01 debian/upstream we do! so now I can only start speculating what has happened in your case: - was building from a wrong (old?) directory - have some local .git/* settings precluding inclusion of debian/upstream - ... beer? ;) -- Yaroslav O. Halchenko Postdoctoral Fellow, Department of Psychological and Brain Sciences Dartmouth College, 419 Moore Hall, Hinman Box 6207, Hanover, NH 03755 Phone: +1 (603) 646-9834 Fax: +1 (603) 646-1419 WWW: http://www.linkedin.com/in/yarik -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
