Re: accidental import with git-buildpackage

2015-11-02 Thread Stefano Rivera
Hi Jeremy (2015.10.22_17:34:18_+0200) > So I imported a new upstream version of python-netfilter using > git-buildpackage, only to realise I am supposed to use git-dpm. Now my > repo is in a state which git-dpm cannot handle. I think you need this: diff --git a/debian/.git-dpm b/debian/.git-dpm in

Re: How to maintain multiple branches (sid/bpo/exp etc)?

2015-11-02 Thread Barry Warsaw
On Nov 03, 2015, at 12:03 AM, Sandro Tosi wrote: >1. I have a simple package, which I keep maintaining with the usual >'master' and 'upstream' branches, but then the testing freeze will >come and I want to start uploading to experimental, at that point I >need to change the layout of the repo (ann

Re: How to maintain multiple branches (sid/bpo/exp etc)?

2015-11-02 Thread Sandro Tosi
> Raphael can probably say more about this, and advocate for DEP-14, which in > your case probably makes more sense than I have: > > http://dep.debian.net/deps/dep14/ > > It's probably worth some experimentation to see if DEP-14 is the right > approach for you, and how that might inform updates to

Re: How to maintain multiple branches (sid/bpo/exp etc)?

2015-11-02 Thread Barry Warsaw
On Nov 02, 2015, at 11:07 PM, Sandro Tosi wrote: >I dont think I follow your description: looking at the debian repo, stable >has 1.5.6-5 while testing and unstable has 1.5.6-7; looking at the git repo >(as of http://anonscm.debian.org/cgit/python-modules/packages/python-pip.git) >all the branches

DPMT policy update

2015-11-02 Thread Barry Warsaw
Since comments have stopped, I've updated DPMT policy: http://python-modules.alioth.debian.org/policy.html so now (g)it's official. Cheers, -Barry pgpJPM1vPmxy6.pgp Description: OpenPGP digital signature

Re: How to maintain multiple branches (sid/bpo/exp etc)?

2015-11-02 Thread Sandro Tosi
> I'm kind of doing something like this for python-pip. I'm (slowly) working on > updating the whole stack to the latest upstream, but I'm also maintaining > 1.5.6. I just created a release-1.5.6 branch and switch to that when I'm > doing stable maintenance, then switch back to master when I'm wo

Re: How to maintain multiple branches (sid/bpo/exp etc)?

2015-11-02 Thread Barry Warsaw
On Nov 02, 2015, at 09:51 PM, Sandro Tosi wrote: >with the new DPMT repo layout and tools, what is the right way to >maintain multiple active branches for our packages? things like: > >1. unstable at v(ersion)3, bpo70 at v1 and bpo8 at v2 >2. unstable at v1, experimental at v2 > >all of them activ

How to maintain multiple branches (sid/bpo/exp etc)?

2015-11-02 Thread Sandro Tosi
hello, with the new DPMT repo layout and tools, what is the right way to maintain multiple active branches for our packages? things like: 1. unstable at v(ersion)3, bpo70 at v1 and bpo8 at v2 2. unstable at v1, experimental at v2 all of them active, so in the 2. case there should be a way to keep