Re: 3Depict : upload request, bug #876620
Dear D Haley, Unless I'm mistaken, you did not reply to the message below, and that 3depict has not yet been updated. I hope I did not demotivate you with my requests for improvement. In any case, don't hesitate to get back to me and/or to the team, so that we can find a way forward. I'll be happy to help. Best, On Tue, Oct 17, 2017 at 07:21:28PM +0200, Sébastien Villemot wrote: > On Sun, Oct 15, 2017 at 08:09:52PM +0100, D Haley wrote: > > > Your suggestion was correct - I was not aware of the --git-pristine-tar > > option. I don't think I would have found that option myself. > > > > I've pushed the history-rewritten changes, so the tag upstream/0.0.20 > > should now generate a byte-identical tarball. I've also re-tested this > > under cowbuilder. > > Thanks for your effort. Unfortunately something is still wrong, because there > is a debian/ directory on the upstream branch. > > If you are tired of rewriting the git history, I could do it myself. But I > think it is more valuable to you if you learn how to do it. Please let me > know. > > > As an aside : Is there some discussion as to why this is an option, > > rather than the default? > > I don’t know. However you can put the following in ~/.gbp.conf (as I do): > > [DEFAULT] > pristine-tar = True > > (then it becomes possible to override this by passing --git-no-pristine-tar to > "gbp buildpackage", should you have a good reason for doing so). -- ⢀⣴⠾⠻⢶⣦⠀ Sébastien Villemot ⣾⠁⢠⠒⠀⣿⡁ Debian Developer ⢿⡄⠘⠷⠚⠋⠀ http://sebastien.villemot.name ⠈⠳⣄ http://www.debian.org signature.asc Description: PGP signature -- debian-science-maintainers mailing list debian-science-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers
Re: 3Depict : upload request, bug #876620
On Sun, Oct 15, 2017 at 08:09:52PM +0100, D Haley wrote: > Your suggestion was correct - I was not aware of the --git-pristine-tar > option. I don't think I would have found that option myself. > > I've pushed the history-rewritten changes, so the tag upstream/0.0.20 > should now generate a byte-identical tarball. I've also re-tested this > under cowbuilder. Thanks for your effort. Unfortunately something is still wrong, because there is a debian/ directory on the upstream branch. If you are tired of rewriting the git history, I could do it myself. But I think it is more valuable to you if you learn how to do it. Please let me know. > As an aside : Is there some discussion as to why this is an option, > rather than the default? I don’t know. However you can put the following in ~/.gbp.conf (as I do): [DEFAULT] pristine-tar = True (then it becomes possible to override this by passing --git-no-pristine-tar to "gbp buildpackage", should you have a good reason for doing so). Best, P.S.: please don’t top-post. -- ⢀⣴⠾⠻⢶⣦⠀ Sébastien Villemot ⣾⠁⢠⠒⠀⣿⡁ Debian Developer ⢿⡄⠘⠷⠚⠋⠀ http://sebastien.villemot.name ⠈⠳⣄ http://www.debian.org signature.asc Description: PGP signature -- debian-science-maintainers mailing list debian-science-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers
Re: 3Depict : upload request, bug #876620
Hi Sébastien, Your suggestion was correct - I was not aware of the --git-pristine-tar option. I don't think I would have found that option myself. I've pushed the history-rewritten changes, so the tag upstream/0.0.20 should now generate a byte-identical tarball. I've also re-tested this under cowbuilder. As an aside : Is there some discussion as to why this is an option, rather than the default? Hopefully this is right/usable now... On 15/10/17 14:46, Sébastien Villemot wrote: > Hi, > > On Sun, Oct 15, 2017 at 01:12:09PM +0100, D Haley wrote: > >> I rolled back history, and had to manually ssh in and hand edit the git >> repository on the remote, as pushing with --force is denied by the remote. >> [remote rejected] master->master (non fast-forward) >> >> I'm unable to get gbp to generate a byte-for-byte identical tarball, >> even if the contents are byte-for-byte identical when unpacked. I'm at a >> loss for what to do, as cloning the current repository >> >> $ gbp import-orig --pristine-tar ../3depict_0.0.20.orig.tar.gz >> What is the usptream version? [0.0.20] >> ... >> gbp:info Successfully imported version 0.0.20 of >> ../3depict_0.0.20.orig.tar.gz >> >> $ mv 3depict_0.0.20.orig.tar.gz 3depict_0.0.20.orig.tar.gz.real >> >> $ gbp buildpackage -S >> ... >> Ctrl+C >> >> $sha1sum *gz* >> > > It looks like you forgot to pass the --git-pristine-tar option to gbp > buildpackage. > >> Thanks, and apologies for taking up your time. > > No worry, I’m happy to help. > -- debian-science-maintainers mailing list debian-science-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers
Re: 3Depict : upload request, bug #876620
Hi, On Sun, Oct 15, 2017 at 01:12:09PM +0100, D Haley wrote: > I rolled back history, and had to manually ssh in and hand edit the git > repository on the remote, as pushing with --force is denied by the remote. > [remote rejected] master->master (non fast-forward) > > I'm unable to get gbp to generate a byte-for-byte identical tarball, > even if the contents are byte-for-byte identical when unpacked. I'm at a > loss for what to do, as cloning the current repository > > $ gbp import-orig --pristine-tar ../3depict_0.0.20.orig.tar.gz > What is the usptream version? [0.0.20] > ... > gbp:info Successfully imported version 0.0.20 of > ../3depict_0.0.20.orig.tar.gz > > $ mv 3depict_0.0.20.orig.tar.gz 3depict_0.0.20.orig.tar.gz.real > > $ gbp buildpackage -S > ... > Ctrl+C > > $sha1sum *gz* > It looks like you forgot to pass the --git-pristine-tar option to gbp buildpackage. > Thanks, and apologies for taking up your time. No worry, I’m happy to help. -- ⢀⣴⠾⠻⢶⣦⠀ Sébastien Villemot ⣾⠁⢠⠒⠀⣿⡁ Debian Developer ⢿⡄⠘⠷⠚⠋⠀ http://sebastien.villemot.name ⠈⠳⣄ http://www.debian.org signature.asc Description: PGP signature -- debian-science-maintainers mailing list debian-science-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers
Re: 3Depict : upload request, bug #876620
Hi Sebastien, I rolled back history, and had to manually ssh in and hand edit the git repository on the remote, as pushing with --force is denied by the remote. [remote rejected] master->master (non fast-forward) I'm unable to get gbp to generate a byte-for-byte identical tarball, even if the contents are byte-for-byte identical when unpacked. I'm at a loss for what to do, as cloning the current repository $ gbp import-orig --pristine-tar ../3depict_0.0.20.orig.tar.gz What is the usptream version? [0.0.20] ... gbp:info Successfully imported version 0.0.20 of ../3depict_0.0.20.orig.tar.gz $ mv 3depict_0.0.20.orig.tar.gz 3depict_0.0.20.orig.tar.gz.real $ gbp buildpackage -S ... Ctrl+C $sha1sum *gz* This must be a bug in gbp (seems unlikely, but I can find no other explanation??), as it is not doing what it says it should? It claims it has successfully imported it (and yes it creates a new tag). There is no debian/ directory present (which AFAIK is correct). I've refrained from pushing this changeset, as I don't want to have to redo the remote history edit, for fear of breaking something. I'm really at a loss as to what to do - there are too many constraints I cannot satisfy simultaneously. This is either a problem with the tools or with my understanding of them - they do not appear to do the job they claim. I'm quite frustrated and have spent far too much time on this - I don't know what to do. Thanks, and apologies for taking up your time. On 27/09/17 13:13, Sébastien Villemot wrote: > On Wed, Sep 27, 2017 at 01:10:16AM +0100, D Haley wrote: >> Dear Sébastien, >> >> I have corrected d/control & d/copyright, as well as updating to compat >> 10. This has been pushed as f513233d7. gbp import-orig --pristine-tar >> has been used to import the upstream tarball, and have also been pushed. > > Thanks. However something is wrong with the upstream branch: it includes a > debian/ subdirectory. > > Please fix the upstream branch (possibly by writing history): it should > contain > exactly the files included in upstream tarball. Don't forget to update the > pristine-tar branch accordingly as needed. One should be able to recreate from > the git a tarball byte-to-byte identical to the upstream tarball. You can > check > that it works correctly by moving away your local copy of upstream tarball, > running "gbp buildpackage -S", and verify that the tarball it created is the > same as upstream tarball. > > Also please document all your changes in debian/changelog (at least adding the > bump to debhelper compat 10). > >> A quick question : Unless I'm mistaken, it seems that VCS-Git and >> VCS-Browser are the same (and this is reflected in debian-science >> policy). Is there a link to explain why we are duplicate this, so I can >> understand this a bit better? I'm assuming its to do with enforcing >> https transport? > > The two URLs are not exactly the same. Vcs-Browser has /cgit/ while Vcs-Git > has > /git/. > > Note that the Vcs-Git URL in your debian/control file is wrong, you should > replace /cgit/ by /git/. > > The Debian Science policy is also outdated on this issue, we should fix it. > > Thanks, > -- debian-science-maintainers mailing list debian-science-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers
Re: 3Depict : upload request, bug #876620
On Wed, Sep 27, 2017 at 01:10:16AM +0100, D Haley wrote: > Dear Sébastien, > > I have corrected d/control & d/copyright, as well as updating to compat > 10. This has been pushed as f513233d7. gbp import-orig --pristine-tar > has been used to import the upstream tarball, and have also been pushed. Thanks. However something is wrong with the upstream branch: it includes a debian/ subdirectory. Please fix the upstream branch (possibly by writing history): it should contain exactly the files included in upstream tarball. Don't forget to update the pristine-tar branch accordingly as needed. One should be able to recreate from the git a tarball byte-to-byte identical to the upstream tarball. You can check that it works correctly by moving away your local copy of upstream tarball, running "gbp buildpackage -S", and verify that the tarball it created is the same as upstream tarball. Also please document all your changes in debian/changelog (at least adding the bump to debhelper compat 10). > A quick question : Unless I'm mistaken, it seems that VCS-Git and > VCS-Browser are the same (and this is reflected in debian-science > policy). Is there a link to explain why we are duplicate this, so I can > understand this a bit better? I'm assuming its to do with enforcing > https transport? The two URLs are not exactly the same. Vcs-Browser has /cgit/ while Vcs-Git has /git/. Note that the Vcs-Git URL in your debian/control file is wrong, you should replace /cgit/ by /git/. The Debian Science policy is also outdated on this issue, we should fix it. Thanks, -- ⢀⣴⠾⠻⢶⣦⠀ Sébastien Villemot ⣾⠁⢠⠒⠀⣿⡁ Debian Developer ⢿⡄⠘⠷⠚⠋⠀ http://sebastien.villemot.name ⠈⠳⣄ http://www.debian.org signature.asc Description: PGP signature -- debian-science-maintainers mailing list debian-science-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers
Re: 3Depict : upload request, bug #876620
Dear Sébastien, I have corrected d/control & d/copyright, as well as updating to compat 10. This has been pushed as f513233d7. gbp import-orig --pristine-tar has been used to import the upstream tarball, and have also been pushed. A quick question : Unless I'm mistaken, it seems that VCS-Git and VCS-Browser are the same (and this is reflected in debian-science policy). Is there a link to explain why we are duplicate this, so I can understand this a bit better? I'm assuming its to do with enforcing https transport? Thanks for the quick response. On 25.09.2017 14:52, Sébastien Villemot wrote: > Dear D Haley, > > On Mon, Sep 25, 2017 at 12:03:28AM +0100, D Haley wrote: > >> I would like to request an upload for the 3Depict package. The latest >> changeset (eae0c8c8a05c1) has been pushed to git.debian.org [1]. >> >> This updates the package to upstream version to 0.0.20, and also fixes a >> FTBFS bug due to a missing build-dep in sid. The package has been >> successfully built in cowbuilder. > > Please also update the pristine-tar branch, I can’t recreate the tarball > without it. > > The following changes should also be made: > - in d/control: use an https URL for Vcs-Git (instead of git://) > - in d/copyright: same for the Format field (per policy 4.0.0) > - upgrading to Debhelper compat level 10 would be nice, though not strictly > needed > > Best, > -- debian-science-maintainers mailing list debian-science-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers
Re: 3Depict : upload request, bug #876620
Dear D Haley, On Mon, Sep 25, 2017 at 12:03:28AM +0100, D Haley wrote: > I would like to request an upload for the 3Depict package. The latest > changeset (eae0c8c8a05c1) has been pushed to git.debian.org [1]. > > This updates the package to upstream version to 0.0.20, and also fixes a > FTBFS bug due to a missing build-dep in sid. The package has been > successfully built in cowbuilder. Please also update the pristine-tar branch, I can’t recreate the tarball without it. The following changes should also be made: - in d/control: use an https URL for Vcs-Git (instead of git://) - in d/copyright: same for the Format field (per policy 4.0.0) - upgrading to Debhelper compat level 10 would be nice, though not strictly needed Best, -- ⢀⣴⠾⠻⢶⣦⠀ Sébastien Villemot ⣾⠁⢠⠒⠀⣿⡁ Debian Developer ⢿⡄⠘⠷⠚⠋⠀ http://sebastien.villemot.name ⠈⠳⣄ http://www.debian.org signature.asc Description: PGP signature -- debian-science-maintainers mailing list debian-science-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers
3Depict : upload request, bug #876620
Dear Science-Mantainers, I would like to request an upload for the 3Depict package. The latest changeset (eae0c8c8a05c1) has been pushed to git.debian.org [1]. This updates the package to upstream version to 0.0.20, and also fixes a FTBFS bug due to a missing build-dep in sid. The package has been successfully built in cowbuilder. Thanks. [1] https://anonscm.debian.org/cgit/debian-science/packages/3depict.git/ -- debian-science-maintainers mailing list debian-science-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers
