Path: csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod From: Stefano Rivera Newsgroups: linux.debian.maint.python Subject: Re: accidental import with git-buildpackage Date: Tue, 03 Nov 2015 07:00:02 +0100 Message-ID: References: X-Original-To: debian-python@lists.debian.org X-Mailbox-Line: From debian-python-request@lists.debian.org Tue Nov 3 05:59:51 2015 Old-Return-Path: X-Amavis-Spam-Status: No, score=-5.999 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, DIGITS_LETTERS=1, HEADER_FROM_DIFFERENT_DOMAINS=0.001, LDO_WHITELIST=-5] autolearn=no autolearn_force=no X-Policyd-Weight: using cached result; rate: -6.1 Mail-Followup-To: debian-python@lists.debian.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline X-Gpg-Public-Key: http://www.rivera.za.net/stefano.gpg User-Agent: Mutt/1.5.23 (2014-03-12) X-Mailing-List: archive/latest/13140 List-ID: List-URL: List-Archive: https://lists.debian.org/msgid-search/20151103055922.GB1023@bach.rivera.co.za Approved: robomod@news.nic.it Lines: 32 Organization: linux.* mail to news gateway Sender: robomod@news.nic.it X-Original-Date: Tue, 3 Nov 2015 07:59:22 +0200 X-Original-Message-ID: <20151103055922.GB1023@bach.rivera.co.za> X-Original-References: <562901FA.1030000@m4x.org> Xref: csiph.com linux.debian.maint.python:7827 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 index 304a57d..489effd 100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@ -1,8 +1,8 @@ # see git-dpm(1) from git-dpm package -c71cce237a933c97428e855b3d0decae10db41b0 -c71cce237a933c97428e855b3d0decae10db41b0 -c71cce237a933c97428e855b3d0decae10db41b0 -7a2d732ba3110dda1892a4be1f57487d9ce295c7 +8c90fbc9ef8d65e5b26ffbaed0aa6723d025a59e +8c90fbc9ef8d65e5b26ffbaed0aa6723d025a59e +8c90fbc9ef8d65e5b26ffbaed0aa6723d025a59e +8c90fbc9ef8d65e5b26ffbaed0aa6723d025a59e python-netfilter_0.6.3.orig.tar.gz e33e52fff0b0bbdcc5b4731a2ec76f9181656e63 22925 Then you should be able to drive git-dpm. SR -- Stefano Rivera http://tumbleweed.org.za/ +1 415 683 3272