Benoît Knecht wrote: > Rogério Brito wrote: > > On Mon, May 7, 2012 at 6:21 PM, Benoît Knecht <benoit.kne...@fsfe.org> > > wrote: > > > [...] > > > > > > But at the > > > time, I took a shot at packaging what was then the unstable version of > > > rtorrent, and put the result on gitorious [1,2] (in a debian/0.9.0 > > > branch for rtorrent, and a debian/0.13.0 branch for libtorrent). > > > > > > [1] git://gitorious.org/debian-pkg/rtorrent.git > > > [2] git://gitorious.org/debian-pkg/libtorrent.git > > > > I am looking at your packaging of rtorrent right now and it is very > > good, with just one observation: to be more consistent with what has > > been done and also to be more consistent with what tools like > > git-buildpackage expect, it would be good we kept the following > > things: > > > > * the upstream source in the upstream branch (automatically done when > > you call git-import-orig). > > * the potential differences in a tarball taken from upstream and what > > is generated from the upstream branch in a branch called pristine-tar > > (automatically done when you call git-import-orig --pristine-tar). > > * the specific debian changes in the master branch of the repository. > > > > Then, debian/0.9.0-1 or someting would change from being branches to > > being tags (automatically done when you call git-buildpackage > > --git-pristine-tar --git-tag). Tags like upstream/0.9.0 will be > > automatically created by the previous calls to git-import-orig. > > > > Can you do those changes? If you don't, then I think that I can. > > I think that's pretty much what I did, except that I used a separate > branch instead of master; I thought it would make things easier if, > after review, you wanted to selectively merge changes on top of master > (I should have explained that, sorry). > > But since you say the changes are okay, I've now merged debian/0.9.2 > (respectively debian/0.13.2) into master, so that the packages can be > built without specifying --git-debian-branch. The repositories should > now be in a state where the upstream, pristine-tar and master branches > can simply be pulled in the alioth repository. But please let me know if > I missed anything.
So I now have access to the repositories on alioth (thanks to Rogério), and if no one objects, I will push the changes from gitorious to alioth in a day or so. If you think any changes are required before I go ahead with the merge, please let me know before then. Cheers, -- Benoît Knecht -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
