Hi Rogério,

Rogério Brito wrote:
> On Mon, May 7, 2012 at 6:21 PM, Benoît Knecht <benoit.kne...@fsfe.org> wrote:
> > A few months ago, after I did some triaging on rtorrent's bugs, Rogério
> > asked if I was interested in helping out with the package's maintenance.
> > I said yes, but after that nothing really happened (I think a few mails
> > were lost between him and me, and I haven't insisted since).
> 
> First of all, I am very sorry to not have replied earlier. In the past
> 2 months I have barely slept, since my wife was in the end of her
> pregnancy (with all the troubles that this emcompasses) and now our
> son is sucking all of our time (including our time to sleep).

No problem, and congratulations to you and your wife on your baby boy!

> Second, you should have insisted. :) I would have sent you an status
> update earlier. :)

Yes, I know; I guess I got distracted with other stuff too... Well in
the end, it looks like it will all work out.

> > 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.

BTW, lintian is complaining about NMU version number, so don't forget to
either add me as a maintainer or change the version number accordingly
before uploading anything.

Thanks again for your help and advice.

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

Reply via email to