Debian Bug report logs - #845659
debpatch: New script, "Apply a debdiff to a Debian source package"

Toggle useless messages

Message #5 received at submit@bugs.debian.org (full text, mbox, reply):

From: Ximin Luo <infinity0@debian.org>

To: Debian Bug Tracking System <submit@bugs.debian.org>

Subject: debpatch: New script, "Apply a debdiff to a Debian source package"

Date: Fri, 25 Nov 2016 18:29:35 +0100

Package: devscripts
Version: 2.16.10
Severity: wishlist
Tags: patch

Dear Maintainer,

As part of the Reproducible Builds effort, I've written a tool called
debpatch(1), see the branch here:

https://anonscm.debian.org/cgit/collab-maint/devscripts.git/commit/?h=pu/debpatch

To quote the README entry I added:

- debpatch: Apply unified diffs of two Debian source packages, such as those
  generated by debdiff, to a target Debian source package. Any changes to
  debian/changelog are dealt with specially, to avoid the conflicts that
  changelog diffs typically produce when applied naively. May be used to check
  that old patches still apply to newer versions of those packages.
  [python3-unidiff, quilt]

In the broader context, we have a lot of unapplied patches for R-B and we're not
sure if they still work - whether they apply, or make the newer version of a
package reproducible once applied. This tool automates the process of applying
old patches to newer package versions, and I'm also writing R-B specific scripts
that will use this tool to do continuous integration on our old patches, and
alert the right people if anything fails.

X

-- Package-specific info:

--- /etc/devscripts.conf ---

--- ~/.devscripts ---
Not present

-- System Information:
Debian Release: stretch/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable-debug'), (500, 'testing-debug'), (500, 'stable'), (300, 'unstable'), (200, 'experimental'), (1, 'experimental-debug')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.6.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages devscripts depends on:
ii  dpkg-dev     1.18.13
ii  libc6        2.24-5
ii  perl         5.24.1~rc3-3
pn  python3:any  <none>

Versions of packages devscripts recommends:
ii  apt                         1.3.1
ii  at                          3.1.20-1
ii  curl                        7.50.1-1
ii  dctrl-tools                 2.24-2
ii  debian-keyring              2016.09.04
ii  dput                        0.10.3
ii  equivs                      2.0.9+nmu1
ii  fakeroot                    1.21-2
ii  file                        1:5.29-1
ii  gnupg                       2.1.15-4
ii  gnupg2                      2.1.15-4
ii  libdistro-info-perl         0.14
ii  libencode-locale-perl       1.05-1
ii  liblwp-protocol-https-perl  6.06-2
ii  libsoap-lite-perl           1.20-1
ii  liburi-perl                 1.71-1
ii  libwww-perl                 6.15-1
ii  licensecheck                3.0.24-1
ii  lintian                     2.5.49
ii  man-db                      2.7.5-1
ii  patch                       2.7.5-1
ii  patchutils                  0.3.4-2
ii  python3-debian              0.1.29
ii  python3-magic               1:5.29-1
ii  python3-unidiff             0.5.2-1
ii  sensible-utils              0.0.9
ii  strace                      4.13-0.1
ii  unzip                       6.0-20
ii  wdiff                       1.2.2-1+b1
ii  wget                        1.18-4
ii  xz-utils                    5.2.2-1.2

Versions of packages devscripts suggests:
ii  adequate                     0.15.1
pn  autopkgtest                  <none>
pn  bls-standalone               <none>
ii  bsd-mailx [mailx]            8.1.2-0.20160123cvs-3
ii  build-essential              12.2
pn  check-all-the-things         <none>
pn  cvs-buildpackage             <none>
pn  devscripts-el                <none>
ii  diffoscope                   62
ii  disorderfs                   0.5.1-1
pn  dose-extra                   <none>
pn  duck                         <none>
pn  faketime                     <none>
ii  gnuplot                      5.0.5+dfsg1-2
ii  gpgv                         2.1.15-4
pn  how-can-i-help               <none>
ii  libauthen-sasl-perl          2.1600-1
ii  libfile-desktopentry-perl    0.22-1
pn  libnet-smtps-perl            <none>
pn  libterm-size-perl            <none>
ii  libtimedate-perl             2.3000-2
ii  libyaml-syck-perl            1.29-1+b2
ii  mozilla-devscripts           0.47
ii  mutt                         1.7.1-2
ii  openssh-client [ssh-client]  1:7.3p1-1
ii  piuparts                     0.72
ii  quilt                        0.63-5
pn  ratt                         <none>
pn  reprotest                    <none>
ii  s-nail [mailx]               14.8.14-1
pn  svn-buildpackage             <none>
pn  w3m                          <none>

-- no debconf information

Message #10 received at 845659@bugs.debian.org (full text, mbox, reply):

From: Ximin Luo <infinity0@debian.org>

To: 845659@bugs.debian.org

Subject: Re: debpatch: New script, "Apply a debdiff to a Debian source package"

Date: Thu, 05 Jan 2017 16:18:00 +0000

Ximin Luo:
> Package: devscripts
> Version: 2.16.10
> Severity: wishlist
> Tags: patch
> 
> Dear Maintainer,
> 
> As part of the Reproducible Builds effort, I've written a tool called
> debpatch(1), see the branch here:
> 
> https://anonscm.debian.org/cgit/collab-maint/devscripts.git/commit/?h=pu/debpatch
> 
> To quote the README entry I added:
> 
> - debpatch: Apply unified diffs of two Debian source packages, such as those
>   generated by debdiff, to a target Debian source package. Any changes to
>   debian/changelog are dealt with specially, to avoid the conflicts that
>   changelog diffs typically produce when applied naively. May be used to check
>   that old patches still apply to newer versions of those packages.
>   [python3-unidiff, quilt]
> 
> In the broader context, we have a lot of unapplied patches for R-B and we're not
> sure if they still work - whether they apply, or make the newer version of a
> package reproducible once applied. This tool automates the process of applying
> old patches to newer package versions, and I'm also writing R-B specific scripts
> that will use this tool to do continuous integration on our old patches, and
> alert the right people if anything fails.
> 
> [..]

Hi devscripts team,

Any news on this? I would also be happy to merge this myself (I have the access) but I thought it would be good to ask for a review first, since I haven't contributed to this repo before.

X

-- 
GPG: ed25519/56034877E1F87C35
GPG: rsa4096/1318EFAC5FBBDBCE
https://github.com/infinity0/pubkeys.git

Message #15 received at 845659@bugs.debian.org (full text, mbox, reply):

From: Sean Whitton <spwhitton@spwhitton.name>

To: Ximin Luo <infinity0@debian.org>, 845659@bugs.debian.org

Subject: Re: Bug#845659: debpatch: New script, "Apply a debdiff to a Debian source package"

Date: Thu, 5 Jan 2017 10:52:09 -0700

[Message part 1 (text/plain, inline)]

Hello Ximin,

On Thu, Jan 05, 2017 at 04:18:00PM +0000, Ximin Luo wrote:
> > - debpatch: Apply unified diffs of two Debian source packages, such as those
> >   generated by debdiff, to a target Debian source package. Any changes to
> >   debian/changelog are dealt with specially, to avoid the conflicts that
> >   changelog diffs typically produce when applied naively. May be used to check
> >   that old patches still apply to newer versions of those packages.
> >   [python3-unidiff, quilt]

Have you considered using dpkg-mergechangelogs for this, rather than
writing yet another changelog merging function?

> I would also be happy to merge this myself (I have the access) but I
> thought it would be good to ask for a review first, since I haven't
> contributed to this repo before.

You don't need to add all the text to d/copyright: there is a line
beginning "- debsnap, ..." that you can append to.

-- 
Sean Whitton

[signature.asc (application/pgp-signature, inline)]

Message #20 received at 845659@bugs.debian.org (full text, mbox, reply):

From: James McCoy <jamessan@debian.org>

To: Ximin Luo <infinity0@debian.org>, 845659@bugs.debian.org

Subject: Re: Bug#845659: debpatch: New script, "Apply a debdiff to a Debian source package"

Date: Thu, 5 Jan 2017 21:54:35 -0500

On Thu, Jan 05, 2017 at 04:18:00PM +0000, Ximin Luo wrote:
> Ximin Luo:
> > As part of the Reproducible Builds effort, I've written a tool called
> > debpatch(1), see the branch here:
> > [..]
> 
> Hi devscripts team,
> 
> Any news on this?

Apologies for not giving this a review sooner.

> I would also be happy to merge this myself (I have
> the access) but I thought it would be good to ask for a review first,
> since I haven't contributed to this repo before.

I agree with Sean that it would be good to not to have another
reimplementation of changelog merging.  However, if dpkg-mergechangelogs
doesn't provide the functionality you need, I would recommend looking at
python3-debian's debian.changelog module.  I think that would probably
be easier than trying to twist dch into doing the work.

Cheers,
-- 
James
GPG Key: 4096R/91BF BF4D 6956 BD5D F7B7  2D23 DFE6 91AE 331B A3DB

Message #25 received at 845659-submitter@bugs.debian.org (full text, mbox, reply):

From: Ximin Luo <infinity0@debian.org>

To: 845659-submitter@bugs.debian.org

Subject: Bug#845659 marked as pending

Date: Tue, 18 Apr 2017 18:49:51 +0000

tag 845659 pending
thanks

Hello,

Bug #845659 reported by you has been fixed in the Git repository. You can
see the changelog below, and you can check the diff of the fix at:

    https://anonscm.debian.org/cgit/collab-maint/devscripts.git/commit/?id=f2985ac

---
commit f2985ac424cd0dfe029b9a46d574e551ca224df1
Merge: a8237eb 3ff2f9d
Author: Ximin Luo <infinity0@debian.org>
Date:   Tue Apr 18 20:48:58 2017 +0200

    Merge branch 'master' into pu/debpatch

diff --cc debian/changelog
index 2fa6913,4015df8..c09fdce
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,182 +1,186 @@@
- devscripts (2.16.10) UNRELEASED; urgency=medium
+ devscripts (2.17.6) UNRELEASED; urgency=medium
+ 
+   [ Osamu Aoki ]
+   * uscan:
+     + Update manpage on the github.com behavior and the alternative
+       shorthand form.  (Closes: #836507, #859089)
+ 
+   [ Adam D. Barratt ]
+   * uscan: fix a typo in the manpage
+   * debdiff: fix a typo
+ 
+   [ Paul Wise ]
+   * chdist:
+     + add support for running aptitude
+   * debcheckout:
+     + handle cgit URLs too. Thanks to Rhonda for the suggestion.
+   * Make various scripts work when HOME is unset:
+     bts chdist debcommit dscverify grep-excuses
+     namecheck rc-alert svnpath wnpp-alert
+ 
++  [ Ximin Luo ]
++  * debpatch:
++    + New script, Apply a debdiff to a Debian source package. (Closes: #845659)
++
+  -- Osamu Aoki <osamu@debian.org>  Fri, 31 Mar 2017 02:03:30 +0900
+ 
+ devscripts (2.17.5) unstable; urgency=medium
+ 
+   * Create GNUPGHOME in /tmp to fix CI failures due to long path names.
+ 
+  -- James McCoy <jamessan@debian.org>  Sat, 18 Mar 2017 21:18:46 -0400
+ 
+ devscripts (2.17.4) unstable; urgency=medium
+ 
+   * debsign:
+     + Don't try to sign a buildinfo file when one isn't listed in the
+       changes/dsc.  (Closes: #857964)
+ 
+  -- James McCoy <jamessan@debian.org>  Thu, 16 Mar 2017 22:41:27 -0400
+ 
+ devscripts (2.17.3) unstable; urgency=medium
+ 
+   * debsign:
+     + Fix auto-detection of the signer.  Regression introduced in 2.17.2.
+       (Closes: #857537)
+     + Determine the names of related files from the file listings in
+       .changes/.buildinfo.  (Closes: #857536)
+     + In remote mode, ensure files are copied locally before trying to use
+       them.  Regression introduced in 2.17.2.  (Closes: #857716)
+ 
+  -- James McCoy <jamessan@debian.org>  Wed, 15 Mar 2017 23:28:00 -0400
+ 
+ devscripts (2.17.2) unstable; urgency=medium
+ 
+   [ James McCoy ]
+   * deb-reversion:
+     + Correct parsing of long-form --new-version switch.  (Closes: #853919)
+   * grep-excuses:
+     + Improve robustness of HTML parsing to avoid issues like #856104, until
+       grep-excuses is converted to consume YAML.
+   * debsign:
+     + Add support for *.buildinfo files.  Thanks to Ximin Luo and Guillem
+       Jover for the patches!  (Closes: #855282)
+   * debian/tests/control: Add mozilla-devscripts to Depends, as needed by
+     mk-origtargz's tests.
+ 
+   [ Antonio Terceiro ]
+   * rc-alert:
+     + Add bug URL to the output.
+ 
+   [ Guillem Jover ]
+   * wrap-and-sort:
+     + Deal with Build-Conflicts-{Arch,Indep}, Build-Depends-Arch and
+       Built-Using fields.  (Closes: #855433)
+ 
+   [ Mattia Rizzolo ]
+   * Remove Ryan Niebur from Uploaders after a request from the MIA Team.
+     Thank you for all your past contributions!  (Closes: #856374)
+ 
+  -- James McCoy <jamessan@debian.org>  Sun, 05 Mar 2017 22:23:37 -0500
+ 
+ devscripts (2.17.1) unstable; urgency=medium
+ 
+   [ Osamu Aoki ]
+   * uscan:
+     + PyPI packages location change.  (Closes: #851590)
+ 
+   [ Guillem Jover ]
+   * dscverify:
+     + Add support for .buildinfo files.  (Closes: #852801)
+ 
+   [ Mattia Rizzolo ]
+   * dscverify:
+     + Remove reference to the long gone debian-maintainers package.
+   * test_package_lifecycle:
+     + Import patch from Ubuntu to have the test pass on their builders too:
+       filter out output from pkg-create-dbgsym's dh_gencontrol wrapper, pass
+       --set-envvar=NO_PKG_MANGLE=1 to debuild, and pass -U to debchange.
+   * debian/tests/control:
+     + Depend on build-essential.
+ 
+   [ James McCoy ]
+   * test_package_lifecycle:
+     + Ignore debhelper's new "create-stamp" output to fix the test failure.
+       (Closes: #852918)
+ 
+  -- James McCoy <jamessan@debian.org>  Wed, 01 Feb 2017 21:25:00 -0500
+ 
+ devscripts (2.17.0) unstable; urgency=medium
+ 
+   [ Sean Whitton ]
+   * New script: git-deborig, a wrapper around git-archive(1) to generate
+     Debian orig.tar files.
+ 
+   [ Paul Wise ]
+   * grep-excuses:
+     + Ignore new --- header line in autoremovals.yaml.cgi
+ 
+   [ James McCoy ]
+   * Check for existence of gpg/gpg2 in $PATH rather than absolute paths.
+     (Closes: #850655)
+   * wrap-and-sort:
+     + Support debian/clean files.  (Closes: #850662)
+   * Remove bash completion for dcut, since src:dput will be providing it.
+     (Closes: #850684)
+   * dget:
+     + Verify exit status of “dpkg-source -x” and propagate failure.  (Closes:
+       #850845)
+ 
+  -- James McCoy <jamessan@debian.org>  Tue, 10 Jan 2017 23:21:45 -0500
+ 
+ devscripts (2.16.13) unstable; urgency=medium
+ 
+   [ Paul Wise ]
+   * uscan:
+     + Add .sign to the default OpenPGP extensions list
+ 
+   [ James McCoy ]
+   * debuild:
+     + Pass "-tc" through to dpkg-buildpackage instead of treating it as
+       "-t c".  (Closes: #848210)
+ 
+  -- James McCoy <jamessan@debian.org>  Thu, 15 Dec 2016 21:41:54 -0500
+ 
+ devscripts (2.16.12) unstable; urgency=medium
+ 
+   [ James McCoy ]
+   * mergechanges:
+     + Add handling for buildinfo files, based on a patch by Simon McVittie.
+       (Closes: #843470)
+   * debuild:
+     + Move invocation of lintian back into debuild.  This restores the
+       behavior of ignoring the return code of lintian (Closes: #847168) and
+       only running lintian when it is present (Closes: #846711).
+ 
+   [ Antonio Terceiro ]
+   * debrepro:
+     + export NO_FAKE_STAT=1 when using faketime to avoid faking stat() calls
+       (see discussion in bug #846365)
+ 
+  -- James McCoy <jamessan@debian.org>  Fri, 09 Dec 2016 17:24:12 -0500
+ 
+ devscripts (2.16.11) unstable; urgency=medium
+ 
+   [ James McCoy ]
+   * debuild:
+     + Avoid setting a hook to just "cd ..; ".
+     + Clear @ARGV if running lintian to avoid treating @ARGV as debian/rules
+       targets to run.  (Closes: #846863)
+ 
+   [ Antonio Terceiro ]
+   * debclean:
+     + do not descend on subdirectories if current directory is already a
+       Debian source package.
+     + fix manpage to mention what exactly is executed on each directory (i.e.
+       debclean calls `debuild -- clean`, not `debian/rules clean`)
+   * debrepro:
+     + add -s/--skip option to skip any of the supported variations
+       (Closes: #846365)
+ 
+  -- James McCoy <jamessan@debian.org>  Sun, 04 Dec 2016 21:19:15 -0500
+ 
+ devscripts (2.16.10) unstable; urgency=medium
  
    [ Afif Elghraoui ]
    * debcommit:

Message #30 received at 845659@bugs.debian.org (full text, mbox, reply):

From: Ximin Luo <infinity0@debian.org>

To: James McCoy <jamessan@debian.org>, 845659@bugs.debian.org, Sean Whitton <spwhitton@spwhitton.name>

Subject: Re: Bug#845659: debpatch: New script, "Apply a debdiff to a Debian source package"

Date: Tue, 18 Apr 2017 19:02:00 +0000

James McCoy:
> On Thu, Jan 05, 2017 at 04:18:00PM +0000, Ximin Luo wrote:
>> Ximin Luo:
>>> As part of the Reproducible Builds effort, I've written a tool called
>>> debpatch(1), see the branch here:
>>> [..]
>>
>> Hi devscripts team,
>>
>> Any news on this?
> 
> Apologies for not giving this a review sooner.
> 
>> I would also be happy to merge this myself (I have
>> the access) but I thought it would be good to ask for a review first,
>> since I haven't contributed to this repo before.
> 
> I agree with Sean that it would be good to not to have another
> reimplementation of changelog merging.  However, if dpkg-mergechangelogs
> doesn't provide the functionality you need, I would recommend looking at
> python3-debian's debian.changelog module.  I think that would probably
> be easier than trying to twist dch into doing the work.
> 

Sorry for the delay, I have now made these changes.

dpkg-mergechangelogs seemed interesting but actually does a different job - it merges different entries by total ordering on Debian version numbers, and it does a normal 3-way merge when changes to the same entry are detected. This type of merging seems more suited to packages that have already been released. For example, it was unable to merge my pu/debpatch branch with the current master, and I had to resolve that manually.

OTOH debpatch is for rebasing unreleased changes on top of new released packages. So what we want here is to plonk any added extra changelog entry, on top of the new base, and adjust the version number accordingly.

I have switched to using debian.changelog though, thanks for the tip. I also got rid of some dirty "this is already applied" logic and removed some arbitrary limits.

https://anonscm.debian.org/cgit/collab-maint/devscripts.git/log/?h=pu/debpatch

Pushed there ^ but also would be happy to squash these commits if you prefer.

X

-- 
GPG: ed25519/56034877E1F87C35
GPG: rsa4096/1318EFAC5FBBDBCE
https://github.com/infinity0/pubkeys.git

Message #33 received at 845659-submitter@bugs.debian.org (full text, mbox, reply):

From: Ximin Luo <infinity0@debian.org>

To: 845659-submitter@bugs.debian.org

Subject: Bug#845659 marked as pending

Date: Wed, 28 Jun 2017 14:24:10 +0000

tag 845659 pending
thanks

Hello,

Bug #845659 reported by you has been fixed in the Git repository. You can
see the changelog below, and you can check the diff of the fix at:

    https://anonscm.debian.org/cgit/collab-maint/devscripts.git/commit/?id=a52b87b

---
commit a52b87b3b12eecb4a6eae05ef9313f6f7dd71026
Merge: aa18b6d bd3b2ce
Author: Ximin Luo <infinity0@debian.org>
Date:   Wed Jun 28 16:23:30 2017 +0200

    Merge branch 'master' into pu/debpatch

diff --cc debian/changelog
index c09fdce,730824f..27b05d5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,24 +1,28 @@@
- devscripts (2.17.6) UNRELEASED; urgency=medium
+ devscripts (2.17.7) UNRELEASED; urgency=medium
+ 
+   [ Paul Wise ]
+   * Switch from /org to /srv in paths on debian.org servers
+ 
+   [ Mattia Rizzolo ]
+   * debchange:
+     + Target stretch-backports with --bpo.
+     + Support $codename{,-{proposed-updates,security}} as well. Closes: #789587
+ 
+   [ Hilko Bengen ]
+   * debchange:
+     + Replace dpkg call with Dpkg::Version::compare_version  (Closes: #854366)
+ 
+   [ Cyril Brulebois ]
+   * debsnap:
+     + parse the dsc file when downloading source packages.  (Closes: #862668)
+ 
++  [ Ximin Luo ]
++  * debpatch:
++    + New script, Apply a debdiff to a Debian source package. (Closes: #845659)
++
+  -- Paul Wise <pabs@debian.org>  Sat, 17 Jun 2017 13:11:35 +0800
+ 
+ devscripts (2.17.6) unstable; urgency=medium
  
    [ Osamu Aoki ]
    * uscan:

Message #38 received at 845659@bugs.debian.org (full text, mbox, reply):

From: Ximin Luo <infinity0@debian.org>

To: James McCoy <jamessan@debian.org>, 845659@bugs.debian.org, Sean Whitton <spwhitton@spwhitton.name>

Subject: Re: Bug#845659: debpatch: New script, "Apply a debdiff to a Debian source package"

Date: Wed, 28 Jun 2017 14:30:00 +0000

Ximin Luo:
> James McCoy:
>> On Thu, Jan 05, 2017 at 04:18:00PM +0000, Ximin Luo wrote:
>>> Ximin Luo:
>>>> As part of the Reproducible Builds effort, I've written a tool called
>>>> debpatch(1), see the branch here:
>>>> [..]
>>>
>>> Hi devscripts team,
>>>
>>> Any news on this?
>>
>> Apologies for not giving this a review sooner.
>>
>>> I would also be happy to merge this myself (I have
>>> the access) but I thought it would be good to ask for a review first,
>>> since I haven't contributed to this repo before.
>>
>> I agree with Sean that it would be good to not to have another
>> reimplementation of changelog merging.  However, if dpkg-mergechangelogs
>> doesn't provide the functionality you need, I would recommend looking at
>> python3-debian's debian.changelog module.  I think that would probably
>> be easier than trying to twist dch into doing the work.
>>
> 
> Sorry for the delay, I have now made these changes.
> 
> dpkg-mergechangelogs seemed interesting but actually does a different job - it merges different entries by total ordering on Debian version numbers, and it does a normal 3-way merge when changes to the same entry are detected. This type of merging seems more suited to packages that have already been released. For example, it was unable to merge my pu/debpatch branch with the current master, and I had to resolve that manually.
> 
> OTOH debpatch is for rebasing unreleased changes on top of new released packages. So what we want here is to plonk any added extra changelog entry, on top of the new base, and adjust the version number accordingly.
> 
> I have switched to using debian.changelog though, thanks for the tip. I also got rid of some dirty "this is already applied" logic and removed some arbitrary limits.
> 
> https://anonscm.debian.org/cgit/collab-maint/devscripts.git/log/?h=pu/debpatch
> 
> Pushed there ^ but also would be happy to squash these commits if you prefer.
> 

I've updated git (pu/debpatch branch) with a few more minor changes.

Is it OK if I merge this into master now?

X

-- 
GPG: ed25519/56034877E1F87C35
GPG: rsa4096/1318EFAC5FBBDBCE
https://github.com/infinity0/pubkeys.git

Message #43 received at 845659@bugs.debian.org (full text, mbox, reply):

From: James McCoy <jamessan@debian.org>

To: Ximin Luo <infinity0@debian.org>

Cc: 845659@bugs.debian.org, Sean Whitton <spwhitton@spwhitton.name>

Subject: Re: Bug#845659: debpatch: New script, "Apply a debdiff to a Debian source package"

Date: Thu, 29 Jun 2017 01:41:44 -0400

On Wed, Jun 28, 2017 at 02:30:00PM +0000, Ximin Luo wrote:
> Ximin Luo:
> > I have switched to using debian.changelog though, thanks for the tip. I also got rid of some dirty "this is already applied" logic and removed some arbitrary limits.
> > 
> > https://anonscm.debian.org/cgit/collab-maint/devscripts.git/log/?h=pu/debpatch
> > 
> > Pushed there ^ but also would be happy to squash these commits if you prefer.
> > 
> 
> I've updated git (pu/debpatch branch) with a few more minor changes.
> 
> Is it OK if I merge this into master now?

Looks good to me.

Cheers,
-- 
James
GPG Key: 4096R/91BF BF4D 6956 BD5D F7B7  2D23 DFE6 91AE 331B A3DB

Message #48 received at 845659-close@bugs.debian.org (full text, mbox, reply):

From: James McCoy <jamessan@debian.org>

To: 845659-close@bugs.debian.org

Subject: Bug#845659: fixed in devscripts 2.17.7

Date: Sat, 08 Jul 2017 20:48:50 +0000

Source: devscripts
Source-Version: 2.17.7

We believe that the bug you reported is fixed in the latest version of
devscripts, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 845659@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
James McCoy <jamessan@debian.org> (supplier of updated devscripts package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Sat, 08 Jul 2017 15:21:11 -0400
Source: devscripts
Binary: devscripts
Architecture: source
Version: 2.17.7
Distribution: unstable
Urgency: medium
Maintainer: Devscripts Devel Team <devscripts-devel@lists.alioth.debian.org>
Changed-By: James McCoy <jamessan@debian.org>
Description:
 devscripts - scripts to make the life of a Debian Package maintainer easier
Closes: 789587 814570 830968 841910 845659 854366 860863 861020 862668 866117 866998 867416 867662
Changes:
 devscripts (2.17.7) unstable; urgency=medium
 .
   [ Paul Wise ]
   * Switch from /org to /srv in paths on debian.org servers
 .
   [ Mattia Rizzolo ]
   * debchange:
     + Target stretch-backports with --bpo.  Closes: #867662
     + Support $codename{,-{proposed-updates,security}} as well. Closes: #789587
   * bts:
     + Add patch from Samuel Thibault <sthibault@debian.org> to add support for
       the new 'a11y' tag.  Closes: #867416
 .
   [ Hilko Bengen ]
   * debchange:
     + Replace dpkg call with Dpkg::Version::compare_version  (Closes: #854366)
 .
   [ Cyril Brulebois ]
   * debsnap:
     + parse the dsc file when downloading source packages.  (Closes: #862668)
 .
   [ Ximin Luo ]
   * debpatch:
     + New script, Apply a debdiff to a Debian source package. (Closes: #845659)
 .
   [ Antonio Terceiro ]
   * debrepro:
     + When applying disorderfs to the second build, make sure the final path
       from where the package is built is the same as in the first build, to
       avoid differences in binaries due to the build path. There is no good
       solution for making builds independent of build path yet, so the current
       practice is to run both builds at the same location.
 .
   [ James McCoy ]
   * uscan:
     + Use Dpkg::Version instead of shelling out to dpkg to compare upstream &
       mangled versions.  This improves the performance slightly and also
       avoids dpkg's errors about malformed versions.  (Closes: #866998)
     + When GPG verification is configured but the verification fails (either
       during actual verification or because of missing keyring/signature),
       exit uscan with an error.  (Closes: #841910)
   * grep-excuses:
     + Use YAML::Syck to parse excuses.yaml instead of using regex to pick
       apart update_excuses.html.
   * bts:
     + Create the cache directory if it doesn't already exist.  Thanks to
       Joonas Kylmälä for the patch.  (Closes: #866117)
   * debchange:
     + When an empty message is provided on the command-line, do not add an
       empty entry to the changelog.  Thanks to Adam Barratt for the patch.
       (Closes: #830968)
   * debuild:
     + Disable signing if the target distribution is "UNRELEASED", but honor
       dpkg-buildpackage's --force-sign as an override.  (Closes: #861020)
   * debsnap:
     + Preserve the remote mtime of the downloaded file.  Thanks to Guillem
       Jover for the patch.  (Closes: #860863)
   * Declare compliance with Policy 4.0.0, no changes needed.
   * Bump debhelper compat to 10.
 .
   [ Ben Finney ]
   * debdiff:
     + Code style improvements in Bash command completion script.
     + Restructure Bash completion function.
       (Closes: #814570)
Checksums-Sha1:
 0956543a3a004eb96723db27781d3ce831192ebd 2468 devscripts_2.17.7.dsc
 c5028db6aa72cbdca61ab15f541dbf928d6a4b72 696252 devscripts_2.17.7.tar.xz
 5da005386907a3cf58e85d7f7acb3ffe53eaf2d1 9674 devscripts_2.17.7_amd64.buildinfo
Checksums-Sha256:
 0490bd5319879b15576275adb48e98f8a9723f2da9153b4785c9a103831e780b 2468 devscripts_2.17.7.dsc
 9c6dacf893eea1621950bc73b7d63711d3b2a8f9e9797060507b7ee2cee43f7b 696252 devscripts_2.17.7.tar.xz
 4389448c3fb493e604c26eb8da55fa6485887de0e427b7dbb797e13ed495a7af 9674 devscripts_2.17.7_amd64.buildinfo
Files:
 5b87308347b5c47cac09925e4a2e84d0 2468 devel optional devscripts_2.17.7.dsc
 0f6496a0c349e14f0732883a7296c69b 696252 devel optional devscripts_2.17.7.tar.xz
 00cdfdc7529e4b6cf6806ca3d01a3ef8 9674 devel optional devscripts_2.17.7_amd64.buildinfo

-----BEGIN PGP SIGNATURE-----

iQKTBAEBCgB9FiEEkb+/TWlWvV33ty0j3+aRrjMbo9sFAllhNpFfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDkx
QkZCRjRENjk1NkJENURGN0I3MkQyM0RGRTY5MUFFMzMxQkEzREIACgkQ3+aRrjMb
o9v/WhAApv31VD2iKQPGq2q80fVUXZuHLHlRK3cqxDBeda8FWZTEuKxBCBm7E0P6
4gwIcPSHfNhJbhu/FEnjjB9JVtTtQU0yMA3ib92U5wapUHjI5RXxAyD5yiZtWe5Q
3rMKi/MMpnmt1ByGBpyNoEwh9pQDSB+VB7a+d1VG9wrmQcvOG1bygNgh8CzhOGMl
pj0NBDBmcxAxFM34P1u0/cdfzxENCATm3KZ1o82l+Ia4NsHqijImTpKUv7cDhqq6
soz6quPIgrkDGrD/9DPul6r/2DXkfNkXf2pHhlEWrC478zss3/jXDkKTmQglH95R
6t/bkVRC98ElvyqlT3/P/HJcOTLSA0Ecf6Ug7L00S8D5uqNWZKLP0BRfC7g1I65N
ROJ/QCaYLdQ0jZy5+q30v2gRXp+LNJkXmo4gXbe4nJ4+7kxbXUbMzR2MkgEpvE9H
6aBRaJxPjWtE2W2SPdqqONOgnYfPxtnd8n8CmxcKobsPTujFpfXf9C8kELpCSpmu
xwtlc5tjbneW054edOXltPQOOcYOK8Ibk3NDD6Llp37TSsaSDXTMNDQPYcHktj7x
amuZQw7QbtZpVmte6QpHY//JoDZha0ujvXOu79n6XtO9gPMEMKSdx1VxR3vGR/bp
OjOTOA95YU4jAy13tGOLN9/kqgq7LkYjYF9I34gg/bG8N/aRSo0=
=N2o6
-----END PGP SIGNATURE-----

Send a report that this bug log contains spam.