On Wed, 12 Dec 2012 16:17:15 +0100, Guido Günther wrote: > > I think I have a patch. :) > > it is against git-buildpackage 0.6.0~git20120601
> Thanks for your patch. Is this still an issue with current git? We're > parsing the upstream tarballs name hopefully correctly now. Could you > check and if not pass along a testcase? Let's try: I'm taking the first +dfsg package which has new upstream release: This is libdata-ical-perl: % grep Vcs debian/control Vcs-Git: git://git.debian.org/pkg-perl/packages/libdata-ical-perl.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/libdata-ical-perl.git % cat debian/watch # format version number, currently 3; this line is compulsory! version=3 # URL to the package page followed by a regex to search opts="dversionmangle=s/\+dfsg//" \ http://search.cpan.org/dist/Data-ICal/ \ .*/Data-ICal-(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$ \ debian sh debian/repack.stub % uscan --verbose --report -- Scanning for watchfiles in . -- Found watchfile in ./debian -- In debian/watch, processing watchfile line: opts="dversionmangle=s/\+dfsg//" http://search.cpan.org/dist/Data-ICal/ .*/Data-ICal-(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$ debian sh debian/repack.stub -- Found the following matching hrefs: /CPAN/authors/id/T/TS/TSIBLEY/Data-ICal-0.19.tar.gz Newest version on remote site is 0.19, local version is 0.18+dfsg (mangled local version number 0.18) => Newer version available from http://search.cpan.org/CPAN/authors/id/T/TS/TSIBLEY/Data-ICal-0.19.tar.gz -- Scan finished % git-import-orig --uscan gbp:info: Launching uscan... gbp:info: using ../libdata-ical-perl_0.19.orig.tar.gz What is the upstream version? [0.19] gbp:info: Importing '../libdata-ical-perl_0.19.orig.tar.gz' to branch 'upstream'... gbp:info: Source package is libdata-ical-perl gbp:info: Upstream version is 0.19 pristine-tar: committed libdata-ical-perl_0.19.orig.tar.gz.delta to branch pristine-tar gbp:info: Merging to 'master' Merge made by the 'recursive' strategy. gbp:info: Successfully imported version 0.19 of ../libdata-ical-perl_0.19.orig.tar.gz % cat debian/repack.local MANIFEST=1 rm doc/rfc* % ls doc rfc2445.txt % ls -la ../*.tar.gz -rw-rw-r-- 1 gregoa gregoa 117278 Dec 12 17:19 ../Data-ICal-0.19.tar.gz -rw-rw-r-- 1 gregoa gregoa 52273 Dec 12 17:19 ../libdata-ical-perl_0.19+dfsg.orig.tar.gz lrwxrwxrwx 1 gregoa gregoa 21 Dec 12 17:19 ../libdata-ical-perl_0.19.orig.tar.gz -> Data-ICal-0.19.tar.gz % rm ../*.tar.gz % uscan --verbose --force -- Scanning for watchfiles in . -- Found watchfile in ./debian -- In debian/watch, processing watchfile line: opts="dversionmangle=s/\+dfsg//" http://search.cpan.org/dist/Data-ICal/ .*/Data-ICal-(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$ debian sh debian/repack.stub -- Found the following matching hrefs: /CPAN/authors/id/T/TS/TSIBLEY/Data-ICal-0.19.tar.gz Newest version on remote site is 0.19, local version is 0.19 => Package is up to date Newest version on remote site is 0.19, local version is 0.19 => Forcing download as requested -- Downloading updated package Data-ICal-0.19.tar.gz -- Successfully downloaded updated package Data-ICal-0.19.tar.gz and symlinked libdata-ical-perl_0.19.orig.tar.gz to it -- Executing user specified script sh debian/repack.stub --upstream-version 0.19 ../libdata-ical-perl_0.19.orig.tar.gz Repackaging ../libdata-ical-perl_0.19.orig.tar.gz removed ‘doc/rfc2445.txt’ *** ../libdata-ical-perl_0.19+dfsg.orig.tar.gz ready -- Scan finished So it seems that g-i-o still happily imports the original tarball and not the repackaged one. The problem is still that the name of the new tarball is only reported as a message by uscan which is not parsed by /usr/share/pyshared/gbp/deb/uscan.py if I'm reading ot correctly. % uscan --dehs <dehs> <package>libdata-ical-perl</package> <debian-uversion>0.18+dfsg</debian-uversion> <debian-mangled-uversion>0.18</debian-mangled-uversion> <upstream-version>0.19</upstream-version> <upstream-url>http://search.cpan.org/CPAN/authors/id/T/TS/TSIBLEY/Data-ICal-0.19.tar.gz</upstream-url> <status>Newer version available</status> <target>libdata-ical-perl_0.19.orig.tar.gz</target> <messages>Successfully downloaded updated package Data-ICal-0.19.tar.gz and symlinked libdata-ical-perl_0.19.orig.tar.gz to it</messages> <messages>Executing user specified script: sh debian/repack.stub --upstream-version 0.19 ../libdata-ical-perl_0.19.orig.tar.gz; output: Repackaging ../libdata-ical-perl_0.19.orig.tar.gz removed ‘doc/rfc2445.txt’ *** ../libdata-ical-perl_0.19+dfsg.orig.tar.gz ready</messages> </dehs> Cheers, gregor -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: Jelly Roll Morton: Dead Man Blues
signature.asc
Description: Digital signature
