[debhelper-devel] [debhelper] 01/02: Merge tag 'debian/11' into stretch-backports

Niels Thykier nthykier at moszumanska.debian.org
Sun Dec 24 08:20:56 UTC 2017


This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch stretch-backports
in repository debhelper.

commit 9ef8ac63c530f43d982da2203dfcee4e2068d689
Merge: e18baf1 76d3d08
Author: Niels Thykier <niels at thykier.net>
Date:   Sun Dec 24 07:55:31 2017 +0000

    Merge tag 'debian/11' into stretch-backports
    
    Release debhelper/11 into unstable
    
    Format: 1.8
    Date: Sat, 16 Dec 2017 15:41:17 +0000
    Source: debhelper
    Binary: debhelper dh-systemd
    Architecture: source
    Version: 11
    Distribution: unstable
    Urgency: medium
    Maintainer: Debhelper Maintainers <debhelper-devel at lists.alioth.debian.org>
    Changed-By: Niels Thykier <niels at thykier.net>
    Description:
     debhelper  - helper programs for debian/rules
     dh-systemd - debhelper add-on to handle systemd unit files - transitional pack
    Closes: 882626 883635 884152 884205
    Changes:
     debhelper (11) unstable; urgency=medium
     .
       [ Niels Thykier ]
       * dh_installdeb: Do basic validation of rm_conffile and mv_conffile
         parameters in "maintscript" parameters in compat 10 and newer.
         In compat 12, this is an error.  Thanks to Andreas Beckmann for
         the suggestions.  (Closes: #882626)
       * dh_strip: Fix bug where the Build-Id field would not be properly
         filled when using --dbg-package.  Thanks to Paul Wise for finding
         and reporting the bug.  (Closes: #884152)
       * d/control: Bump Standards-Version to 4.1.2 - no changes required.
       * dh_installsystemd: Remove neutering of dh_installsystemd in compat
         levels prior to 11 now that compat 11 is stable.
     .
       [ Chris Leick ]
       * debhelper.pod: Improve the wording of two parapraphs.
     .
       [ Translations ]
       * Update Portuguese translation (Américo Monteiro)
         (Closes: #883635)
       * Update German translation (Chris Leick)  (Closes: #884205)
    Checksums-Sha1:
     0eaa9785ddb9d1e7643f1068a4ca62b82a268ae0 1775 debhelper_11.dsc
     73849d0e349ad361b4814bb1e38ef6c2a3e63dd1 439268 debhelper_11.tar.xz
     3460f45cca491314d76c6fadcebc33776f9df481 4491 debhelper_11_source.buildinfo
    Checksums-Sha256:
     a4b33020fec83fbdf152c525615362c21cb5ab613d5da5d5387958e716473c54 1775 debhelper_11.dsc
     d1c348eb5520461c65ae9a47520ac18b21d4f44c283a0fa20e10b784498f46af 439268 debhelper_11.tar.xz
     b18b8fa3f9aa2b37fcd34f302d9ba38428e62eba7086cf0c64f109e16d2a6722 4491 debhelper_11_source.buildinfo
    Files:
     2f1cf56b329382b7dcab381e45c29001 1775 devel optional debhelper_11.dsc
     288492f4defa9e2f429cb026b40984aa 439268 devel optional debhelper_11.tar.xz
     9fd199cc720483ff159d3835acf249ea 4491 devel optional debhelper_11_source.buildinfo

 debhelper.pod                           |   19 +-
 debian/changelog                        |   24 +
 debian/control                          |    2 +-
 dh_gencontrol                           |    1 +
 dh_installdeb                           |   49 ++
 dh_installsystemd                       |    2 -
 dh_strip                                |   43 +-
 lib/Debian/Debhelper/Dh_Lib.pm          |    7 +
 man/po4a/po/de.po                       | 1066 +++++++++++++------------------
 man/po4a/po/debhelper.pot               |  138 ++--
 man/po4a/po/es.po                       |  154 +++--
 man/po4a/po/fr.po                       |  154 +++--
 man/po4a/po/ja.po                       |  154 +++--
 man/po4a/po/pt.po                       |  779 +++++++++++-----------
 t/Test/DH.pm                            |    2 +-
 t/dh_installdocs/debian/control         |    1 +
 t/dh_installsystemd/dh_installsystemd.t |   19 +-
 t/maintscript.t                         |   36 +-
 18 files changed, 1355 insertions(+), 1295 deletions(-)

diff --cc debian/changelog
index 6771fa3,f96a320..b23d788
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,27 +1,40 @@@
+ debhelper (11) unstable; urgency=medium
+ 
+   [ Niels Thykier ]
+   * dh_installdeb: Do basic validation of rm_conffile and mv_conffile
+     parameters in "maintscript" parameters in compat 10 and newer.
+     In compat 12, this is an error.  Thanks to Andreas Beckmann for
+     the suggestions.  (Closes: #882626)
+   * dh_strip: Fix bug where the Build-Id field would not be properly
+     filled when using --dbg-package.  Thanks to Paul Wise for finding
+     and reporting the bug.  (Closes: #884152)
+   * d/control: Bump Standards-Version to 4.1.2 - no changes required.
+   * dh_installsystemd: Remove neutering of dh_installsystemd in compat
+     levels prior to 11 now that compat 11 is stable.
+ 
+   [ Chris Leick ]
+   * debhelper.pod: Improve the wording of two parapraphs.
+ 
+   [ Translations ]
+   * Update Portuguese translation (Américo Monteiro)
+     (Closes: #883635)
+   * Update German translation (Chris Leick)  (Closes: #884205)
+ 
+  -- Niels Thykier <niels at thykier.net>  Sat, 16 Dec 2017 15:41:17 +0000
+ 
 +debhelper (10.10.9~bpo9+1) stretch-backports; urgency=medium
 +
 +  * Rebuild for stretch-backports.
 +  * Retained changes required for backports.
 +    * Dh_Lib: Disable R³ support as we need dpkg{,-dev} (>= 1.19.0.4)
 +      for that.
 +    * d/control: Remove the R³ field; debhelper in backports cannot
 +      be built without (fake)root.
 +    * d/control: Reset versioned (Build-)Depends on dpkg and dpkg-dev
 +      due to the above.
 +
 + -- Niels Thykier <niels at thykier.net>  Sat, 25 Nov 2017 10:37:29 +0000
 +
  debhelper (10.10.9) unstable; urgency=medium
  
    [ Dmitry Shachnev ]
diff --cc debian/control
index 9dd41da,82788e2..1718568
--- a/debian/control
+++ b/debian/control
@@@ -4,10 -4,12 +4,10 @@@ Priority: optiona
  Maintainer: Debhelper Maintainers <debhelper-devel at lists.alioth.debian.org>
  Uploaders: Niels Thykier <niels at thykier.net>,
             Bernhard R. Link <brlink at debian.org>
 -Build-Depends: dpkg (>= 1.19.0.3~),
 -               dpkg-dev (>= 1.19.0.3~),
 +Build-Depends: dpkg-dev (>= 1.18.0~),
                 perl:any,
                 po4a (>= 0.24)
- Standards-Version: 4.1.1
 -Rules-Requires-Root: no
+ Standards-Version: 4.1.2
  Testsuite: autopkgtest-pkg-perl
  Vcs-Git: https://anonscm.debian.org/git/debhelper/debhelper.git
  Vcs-Browser: https://anonscm.debian.org/git/debhelper/debhelper.git

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git




More information about the debhelper-devel mailing list