Re: [gdal] branch pristine-tar updated (3b8f65d - de3852e)
On Thu, May 08, 2014 at 11:31:15PM +0200, Sebastiaan Couwenberg wrote: I've seen different tarballs for the same upstream version on snapshot.d.o, but AFAIK ftp-master rejects source uploads when the checksum and/or size doesn't match the orig.tar.gz previously uploaded. Maybe just importing the fixed tarball as upstream version 1.11.0+dfsg+1? Or can the uploaded orig.gz be overriden with a new sourcefull upload? Unfortunately we need to introduce a new ad hoc upstream version such as that you suggested. Better than using epoch in source version. -- Francesco P. Lovergine ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Re: [gdal] branch pristine-tar updated (3b8f65d - de3852e)
On 05/10/2014 09:55 AM, Francesco P. Lovergine wrote: On Thu, May 08, 2014 at 11:31:15PM +0200, Sebastiaan Couwenberg wrote: Maybe just importing the fixed tarball as upstream version 1.11.0+dfsg+1? Unfortunately we need to introduce a new ad hoc upstream version such as that you suggested. Better than using epoch in source version. Yes, much better than an epoch. I've removed the extra + in the repacked version to just use +dfsg1 which nicely reflects the modified repacking not a different upstream release. Kind Regards, Bas -- GPG Key ID: 4096R/E88D4AF1 Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1 ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Re: [gdal] branch pristine-tar updated (3b8f65d - de3852e)
On 05/07/2014 10:28 AM, Francesco P. Lovergine wrote: On Wed, May 07, 2014 at 10:24:37AM +0200, Francesco P. Lovergine wrote: Bas, that tarball for unknown reason missed the .gitignore file originally included in previous version and present in master/experimental tree. That causes git-buildpackage to fail. I also used your uploaded tarball with the same result. The enhanced uscan with repack support is indeed the culprit, it uses tar with --exclude-vcs which causes it to remove the .gitignore in the upstream tarball, see: http://anonscm.debian.org/gitweb/?p=users/tille/devscripts.git;a=blob;f=scripts/uscan.pl;h=830a0ac824f7dfd2eec6d8b6ef3fad411c8a1697;hb=HEAD#l1517 I've disabled the enhanced uscan on my systems, and updated the manual repack code in debian/get-orig-source to use tar --delete to only delete the 3 files listed in Files-Excluded. On 05/07/2014 10:28 AM, Francesco P. Lovergine wrote: the main directory is gdal-1.11.0+dfsg.orig in the tarball which probably causes troubles. I suspect we need to re-upload a fixed tarball by bumping ad hoc the upstream version. I'm not sure what's the best way to get the fixed orig.tar.gz into the archive. I've seen different tarballs for the same upstream version on snapshot.d.o, but AFAIK ftp-master rejects source uploads when the checksum and/or size doesn't match the orig.tar.gz previously uploaded. Maybe just importing the fixed tarball as upstream version 1.11.0+dfsg+1? Or can the uploaded orig.gz be overriden with a new sourcefull upload? Kind Regards, Bas -- GPG Key ID: 4096R/E88D4AF1 Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1 ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Re: [gdal] branch pristine-tar updated (3b8f65d - de3852e)
Bas, that tarball for unknown reason missed the .gitignore file originally included in previous version and present in master/experimental tree. That causes git-buildpackage to fail. I also used your uploaded tarball with the same result. This happened before, see the history of the upstream branch. I suspect uscan deletes the .gitignore when repacking the tarball. I'll look into a permanent fix for this, because manually fixing the upstream branch every time is not the way to go. Kind Regards, Bas ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Re: [gdal] branch pristine-tar updated (3b8f65d - de3852e)
On Wed, May 07, 2014 at 10:24:37AM +0200, Francesco P. Lovergine wrote: On Sun, May 04, 2014 at 12:27:37PM +, Bas Couwenberg wrote: This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a change to branch pristine-tar in repository gdal. from 3b8f65d pristine-tar data for gdal_1.10.1+dfsg.orig.tar.gz new de3852e pristine-tar data for gdal_1.11.0+dfsg.orig.tar.gz Bas, that tarball for unknown reason missed the .gitignore file originally included in previous version and present in master/experimental tree. That causes git-buildpackage to fail. I also used your uploaded tarball with the same result. [...] debian/rules override_dh_clean make[1]: Entering directory '/home/frankie/debian/debian-gis/supported/gdal/git/build-area/gdal-1.11.0+dfsg' dh_clean config.log make[1]: Leaving directory '/home/frankie/debian/debian-gis/supported/gdal/git/build-area/gdal-1.11.0+dfsg' dpkg-source -i.git/ -I.git -b gdal-1.11.0+dfsg dpkg-source: info: using source format `3.0 (quilt)' dpkg-source: info: building gdal using existing ./gdal_1.11.0+dfsg.orig.tar.gz dpkg-source: warning: ignoring deletion of directory ogr/ogrsf_frmts/ili/iom dpkg-source: info: local changes detected, the modified files are: gdal-1.11.0+dfsg/.gitignore dpkg-source: error: aborting due to unexpected upstream changes, see /tmp/gdal_1.11.0+dfsg-1~exp1.diff.Mmm4MM dpkg-source: info: you can integrate the local changes with dpkg-source --commit dpkg-buildpackage: error: dpkg-source -i.git/ -I.git -b gdal-1.11.0+dfsg gave error exit status 2 Uhm the main directory is gdal-1.11.0+dfsg.orig in the tarball which probably causes troubles. I suspect we need to re-upload a fixed tarball by bumping ad hoc the upstream version. -- Francesco P. Lovergine ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Re: [gdal] branch pristine-tar updated (3b8f65d - de3852e)
On Sun, May 04, 2014 at 12:27:37PM +, Bas Couwenberg wrote: This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a change to branch pristine-tar in repository gdal. from 3b8f65d pristine-tar data for gdal_1.10.1+dfsg.orig.tar.gz new de3852e pristine-tar data for gdal_1.11.0+dfsg.orig.tar.gz Bas, that tarball for unknown reason missed the .gitignore file originally included in previous version and present in master/experimental tree. That causes git-buildpackage to fail. I also used your uploaded tarball with the same result. [...] debian/rules override_dh_clean make[1]: Entering directory '/home/frankie/debian/debian-gis/supported/gdal/git/build-area/gdal-1.11.0+dfsg' dh_clean config.log make[1]: Leaving directory '/home/frankie/debian/debian-gis/supported/gdal/git/build-area/gdal-1.11.0+dfsg' dpkg-source -i.git/ -I.git -b gdal-1.11.0+dfsg dpkg-source: info: using source format `3.0 (quilt)' dpkg-source: info: building gdal using existing ./gdal_1.11.0+dfsg.orig.tar.gz dpkg-source: warning: ignoring deletion of directory ogr/ogrsf_frmts/ili/iom dpkg-source: info: local changes detected, the modified files are: gdal-1.11.0+dfsg/.gitignore dpkg-source: error: aborting due to unexpected upstream changes, see /tmp/gdal_1.11.0+dfsg-1~exp1.diff.Mmm4MM dpkg-source: info: you can integrate the local changes with dpkg-source --commit dpkg-buildpackage: error: dpkg-source -i.git/ -I.git -b gdal-1.11.0+dfsg gave error exit status 2 -- Francesco P. Lovergine ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
