Path: csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod From: Simon McVittie Newsgroups: linux.debian.maint.python Subject: Re: using git-dpm or plain git-buildpackage in PAPT and DPMT Date: Thu, 11 Aug 2016 18:10:01 +0200 Message-ID: References: X-Original-To: debian-python@lists.debian.org X-Mailbox-Line: From debian-python-request@lists.debian.org Thu Aug 11 16:09:21 2016 Old-Return-Path: X-Amavis-Spam-Status: No, score=-6.88 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, FOURLA=0.1, LDO_WHITELIST=-5, MURPHY_DRUGS_REL8=0.02] autolearn=ham autolearn_force=no X-Policyd-Weight: using cached result; rate: -5 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.6.2-neo (2016-07-23) X-Mailing-List: archive/latest/14091 List-ID: List-URL: List-Archive: https://lists.debian.org/msgid-search/20160811160840.jcavdzydvmwpilwt@perpetual.pseudorandom.co.uk Approved: robomod@news.nic.it Lines: 19 Organization: linux.* mail to news gateway Sender: robomod@news.nic.it X-Original-Date: Thu, 11 Aug 2016 17:08:40 +0100 X-Original-Message-ID: <20160811160840.jcavdzydvmwpilwt@perpetual.pseudorandom.co.uk> X-Original-References: <20160809192733.pfsnzejxlmd3knbe@p1otr.com> <356e3407-7970-5c4f-f963-60664898548a@debian.org> <20160809225020.GA30494@fama> <87fuqccv6p.fsf@thinkpad.rath.org> <20160810164140.48f7fd42@subdivisions.wooz.org> <20160810231214.sb4iwc4dfug5jatb@perpetual.pseudorandom.co.uk> <20160811092913.5806055f@subdivisions.wooz.org> Xref: csiph.com linux.debian.maint.python:8750 On Thu, 11 Aug 2016 at 09:29:13 -0400, Barry Warsaw wrote: > On Aug 11, 2016, at 12:12 AM, Simon McVittie wrote: > >where all Debian-specific pseudo-headers appear at the end of the diff > >(next to the Signed-off-by if any), > > Did you mean to say "end of the diff headers"? Yes, that's what I should have written. It needs to look like the Signed-off-by on a conventional git patch submission. > the DEP-3 headers are *before* the actual diff, separated from the diff > headers by a blank line. Separated by a line containing exactly "---" (which is mandated by DEP-3 and is one of several syntaxes accepted by git-am), but yes. Here's a typical real-world example: https://anonscm.debian.org/cgit/collab-maint/flatpak.git/tree/debian/patches/debian/Try-gtk-3.0-version-of-the-icon-cache-utility-first.patch S