devscripts (2.19.6) [PTS] [DDPO]

NEW: VCS has unreleased changes: 2.19.7 > 2.19.6

Git: https://salsa.debian.org/debian/devscripts.git
Enter a full Vcs-* header, supported schemes are: Vcs-Bzr, Vcs-Cvs, Vcs-Darcs, Vcs-Git, Vcs-Hg, Vcs-Mtn, Vcs-Svn.
For Vcs-Git append -b branch to select the branch name; append [subdir] if the debian/ directory is not in the repository root.
The next upload will reset the information from the source package headers.
Branch: master
Path: debian/changelog
Browser: https://salsa.debian.org/debian/devscripts
Last scan: 2019-10-10 05:44:11+00
Next scan: 2019-10-18 16:24:00+00
Merge requests: 10
CI pipeline status: failed

Debian changelog in Git:

devscripts (2.19.7) UNRELEASED; urgency=medium

  [ Joao Eriberto Mota Filho ]
  * debclean:
    + Allow debclean to work when in any path inside the package and
      avoid searching in .git directories.  MR: !152

  [ Xavier Guimard ]
  * Update French translation.
  * salsa:
    + Fix broken push command.  MR: !138
    + Don't fail on checkout if --no-fail is set.  MR: !151
  * bts
    + Fix warning with "noaction" and undefined "from".
      Closes: #933607; MR: !145
  * uscan:
    + Better displayed name when using components.  MR: !146
    + Include details about the components in the dehs output.  MR: !147
    + Fix bad https verification.  MR: !150
    + Fore re-compression of components when their compression differ from the
      main tarball.  Closes: #934464; MR: !149
    + Fix git-shallow download when tag contains a "/".
      Closes: #935949; MR: !158
  * origtargz:
    + Fix incompatibility with components.  Closes: #929786; MR: !159

  [ Sean Whitton ]
  * git-deborig:
    + Print to stderr, not stdout, when appropriate.  Closes: #931509; MR: !134

  [ Simon McVittie ]
  * debi:
    + Wait for apt/dpkg child processes, fixing a regression in MR !45.
      Closes: #932896; MR: !135
    + Invoke apt or apt-get with --reinstall.
      Otherwise repeated test-builds of a package with the intended next
      version number will not replace each other since MR !45.  MR: !136
    + Don't use apt if applying neither --upgrade nor --with-depends.
      Closes: #932640; MR: !142
    + Don't use apt install ./*.changes for --with-depends --upgrade.
      Closes: #932963; MR: !143
    + Let --upgrade install new dependencies from the same source (corner
      case from #932963).  MR: !144
  * tests:
    + test_mergechanges: Fix detection of --installed option.  MR: !140
    + test_debi:
      - Add a new integration test for debi, running only as root, currently
        only in GitLab CI and autopkgtest.  MR: !141
  * Refresh formatting following the new perltidy version 20190601.  MR: !54

  [ Sven Hartge ]
  * mk-build-deps:
    + Implement parsing of Build-Depends-Arch and Build-Conflicts-Arch.
      Closes: #891664; MR: !139

  [ Mattia Rizzolo ]
  * nmudiff:
    + Document in the manpage the --no-pending and --no-dd options.
      Closes: #932848

  [ Mike Salvatore ]
  * hardening-check:
    + Fix possible deadlock in stdout/stderr reading.  MR: !153

  [ Christoph Berg ]
  * dcontrol:
    + Remove, the backend on qa.debian.org has not been maintained for years.

  [ Paul Wise ]
  * Avoid needing to shell quote configuration filenames by using arguments
    + Move String::ShellQuote from depends to recommends
  * chdist:
    + Allow putting the dist name before the command instead of after.
  * grep-excuses:
    + Drop duplicate aging info from excuses output

  [ Laurent Bigonville ]
  * Fix typo in the French translation.

 -- Mattia Rizzolo <mattia@debian.org>  Sat, 31 Aug 2019 11:00:40 +0200

This branch is 68 commits ahead of tag v2.19.6

Git log:

commit 0a37d3407d9390c813028ec7165d6cd0b1408b78
Author: Xavier Guimard <yadd@debian.org>
Date:   Thu Oct 10 07:24:06 2019 +0200

    Update fr translation: fix errors displayed by poedit

commit 282e027f9301dd5ebf149a5769d8b2589a6bf663
Merge: 349fab9b bbdb57a4
Author: Mattia Rizzolo <mattia@debian.org>
Date:   Fri Sep 27 16:38:24 2019 +0200

    Merge branch 'uscan-935949' of salsa.debian.org:yadd/devscripts
    
    MR: https://salsa.debian.org/debian/devscripts/merge_requests/158
    Signed-off-by: Mattia Rizzolo <mattia@debian.org>

commit 349fab9bb28a47ad2a31d568a9c23bd6b5d44e92
Merge: 43b4fcf8 cc6bed79
Author: Mattia Rizzolo <mattia@debian.org>
Date:   Fri Sep 27 16:54:15 2019 +0200

    Merge branch 'debi-932963-more' of salsa.debian.org:smcv/devscripts
    
    MR: https://salsa.debian.org/debian/devscripts/merge_requests/144
    Signed-off-by: Mattia Rizzolo <mattia@debian.org>

commit 43b4fcf82baa1f61148551b57a3fa535dc599caa
Merge: 1c815203 7940fec2
Author: Mattia Rizzolo <mattia@debian.org>
Date:   Fri Sep 27 16:53:22 2019 +0200

    Merge branch 'debi-932963' of salsa.debian.org:smcv/devscripts
    
    MR: https://salsa.debian.org/debian/devscripts/merge_requests/143
    Signed-off-by: Mattia Rizzolo <mattia@debian.org>

commit 1c815203f3bfd5d1acbb6e16c080e7ea353d88a5
Author: Mattia Rizzolo <mattia@debian.org>
Date:   Fri Sep 27 16:52:26 2019 +0200

    Merge branch 'debi-932640' of salsa.debian.org:smcv/devscripts
    
    MR: https://salsa.debian.org/debian/devscripts/merge_requests/142
    Signed-off-by: Mattia Rizzolo <mattia@debian.org>

commit 2f7e0be4de342b4e1015a1c00095df49359cf095
Merge: e23f7d5e 06ca9c1b
Author: Mattia Rizzolo <mattia@debian.org>
Date:   Fri Sep 27 16:30:50 2019 +0200

    Merge branch 'debi-932640' of salsa.debian.org:smcv/devscripts
    
    MR: https://salsa.debian.org/debian/devscripts/merge_requests/142
    Signed-off-by: Mattia Rizzolo <mattia@debian.org>

commit e23f7d5efe573f1d22c4819f723fda450b914712
Author: Paul Wise <pabs@debian.org>
Date:   Tue Sep 17 19:58:22 2019 +0800

    Obey perltidy

commit 595d5777a2bca6a7de5fb35a15d39e730253ab5d
Author: Paul Wise <pabs@debian.org>
Date:   Thu Sep 12 11:32:50 2019 +0800

    Further improve the configuration file handling
    
    Pass the configuration files as arguments instead of shell quoting them.
    
    Avoids any possible incompatibility between String::ShellQuote and
    whatever version of bash is being used on the system.
    
    The code is now simpler and more correct and understandable.
    
    Move String::ShellQuote from depends to recommends.

commit c42f6d94396f5735cf0f4cf7be2a42a264504094
Author: Paul Wise <pabs@debian.org>
Date:   Fri Sep 13 13:23:54 2019 +0800

    Drop excuses aging information
    
    The release team now include it in the excuses directly.

commit c60b5da765425ad1cd2b878b40bab791988cc9a1
Author: Mattia Rizzolo <mattia@debian.org>
Date:   Sat Aug 31 11:02:02 2019 +0200

    have the changelog follow my OCD
    
    Signed-off-by: Mattia Rizzolo <mattia@debian.org>

commit 9543226d1bf2055cd7e6730c23038593174ddd2a
Merge: fe80c8ea dcf4f828
Author: Mattia Rizzolo <mattia@debian.org>
Date:   Sat Aug 31 11:00:29 2019 +0200

    Merge branch 'origtargz-929786' of salsa.debian.org:yadd/devscripts
    
    MR: https://salsa.debian.org/debian/devscripts/merge_requests/159
    Signed-off-by: Mattia Rizzolo <mattia@debian.org>

commit dcf4f828d7389a65dbf744575c581e5b0358fa98
Author: Xavier <yadd@debian.org>
Date:   Fri Aug 30 20:37:05 2019 +0200

    origtargz: fix incompatibility with components
    
    Closes: #929786

commit bbdb57a4171a229f09228e38cd2c1aad38345c62
Author: Xavier Guimard <yadd@debian.org>
Date:   Wed Aug 28 14:10:39 2019 +0200

    uscan: fix git-shallow download when tag contains a "/"
    
    Closes: #935949

commit fe80c8eabcd409162e84b7b0514e9343068b161d
Author: Laurent Bigonville <bigon@debian.org>
Date:   Tue Aug 27 11:51:54 2019 +0200

    Fix typo in the French translation

commit 56fb8b983fddb5bcadd52fe2322d20fc149410ca
Author: Xavier Guimard <yadd@debian.org>
Date:   Sun Aug 25 23:18:43 2019 +0200

    Update French translation

commit fcff71f9f056bd5eea5c55ca36fe09d1e9861ef7
Author: Xavier Guimard <yadd@debian.org>
Date:   Fri Aug 23 10:11:30 2019 +0200

    Perltidy

commit a43f4ae32e8c86817a22b13440b496afef02506b
Author: Paul Wise <pabs@debian.org>
Date:   Thu Aug 22 08:25:34 2019 +0800

    chdist: Allow putting the dist name before the command instead of after
    
    This is a lot more intuitive than the current system of having it beforehand.

commit 3d2316410d6cf988f9cbdfb5de6bc258b95c29b5
Author: Christoph Berg <myon@debian.org>
Date:   Wed Aug 21 18:24:47 2019 +0200

    Refresh translations after dcontrol removal

commit 5d8d68f8a41182af911c0d419d8578c54b639959
Author: Christoph Berg <myon@debian.org>
Date:   Wed Aug 21 13:00:56 2019 +0200

    dcontrol: Remove, the backend on qa.debian.org has not been maintained for years.

commit cc6bed7961313a22fcc19f01fff5a87c4bfb8721
Author: Simon McVittie <smcv@debian.org>
Date:   Thu Jul 25 09:55:42 2019 +0100

    test_debi: Require new behaviour of --upgrade --with-depends
    
    Signed-off-by: Simon McVittie <smcv@debian.org>

commit 5c75c1fcaa356ffd5b7a7287aeac2c1192809a9f
Author: Simon McVittie <smcv@debian.org>
Date:   Thu Jul 25 09:55:15 2019 +0100

    debi: Let --upgrade install new dependencies from the same source
    
    Suppose we have this situation:
    
    * old packages:
        - foo: installed
        - foo-obscure: not installed
    * new packages:
        - foo: Depends: libfoo
        - foo-obscure: Depends: libfoo
        - libfoo
    
    and we install the new packages with
    `debi --upgrade --with-depends foo.changes`. It isn't completely obvious
    what should happen, but I think the right answer is that we upgrade to
    the new foo (because it was already installed) and install libfoo
    (despite --upgrade, because --with-depends told us to satisfy
    dependencies and the new foo now depends on it), but we still do not
    install foo-obscure (because --upgrade told us not to).
    
    This is consistent with the behaviour of
    `apt install --only-upgrade foo foo-obscure`, which would also upgrade
    foo and install the dependency libfoo but not install foo-obscure.
    
    Recent (>= stretch) apt versions can be told to satisfy dependencies
    from a .changes file without necessarily installing every package from
    that .changes file, by using --with-source.
    
    Signed-off-by: Simon McVittie <smcv@debian.org>

commit 7940fec2b6f7936992f13358226db6bc34627ef1
Author: Simon McVittie <smcv@debian.org>
Date:   Thu Jul 25 09:43:57 2019 +0100

    test_debi: Expect #932963 to have been fixed
    
    Signed-off-by: Simon McVittie <smcv@debian.org>

commit f4dbb37a7721911ad3c1c0724972278c1d1a1884
Author: Simon McVittie <smcv@debian.org>
Date:   Thu Jul 25 09:40:02 2019 +0100

    debi: Don't use apt install ./*.changes for --with-depends --upgrade
    
    The semantics of --with-depends --upgrade have historically been that
    we will upgrade existing packages mentioned in the given changes file,
    and we will install their dependencies if necessary, but we will not
    install new packages mentioned in the changes file.
    
    For example, suppose we have installed the development tool piuparts,
    but not the special-purpose package piuparts-master (which is only
    intended to be installed on piuparts master servers). If we are
    using debi to test a new version of piuparts that adds a dependency
    on uidmap, then debi --upgrade --with-depends ../piuparts.changes
    should install the new piuparts, and install its dependency uidmap,
    but should not install piuparts-master.
    
    apt --only-upgrade is not suitable here because it would prevent us
    from installing uidmap; apt without --only-upgrade is also not suitable
    because it would install piuparts-master. Fall back to using debpkg
    instead.
    
    Signed-off-by: Simon McVittie <smcv@debian.org>
    Closes: #932963

commit 06ca9c1b3a9911943fa8e23a1b4bd63cbd3f8506
Author: Simon McVittie <smcv@debian.org>
Date:   Thu Jul 25 09:29:55 2019 +0100

    test_debi: Expect #932640 to have been fixed
    
    Signed-off-by: Simon McVittie <smcv@debian.org>

commit d2a87f9b5930fe563e1de4db501b6f4a254c9719
Author: Simon McVittie <smcv@debian.org>
Date:   Thu Jul 25 09:27:27 2019 +0100

    debi: Don't use apt if applying neither --upgrade nor --with-depends
    
    apt doesn't appear to have a way to express the concept of: install
    the packages given on the command-line even if they are not already
    installed, but do not install any other new packages that would be
    pulled in by their dependencies.
    
    Signed-off-by: Simon McVittie <smcv@debian.org>
    Closes: #932640

commit 9eee2f691bbc9b04915312953b2af06b8636fbf6
Author: Simon McVittie <smcv@debian.org>
Date:   Sun Aug 18 18:02:33 2019 +0100

    test_debi: Make sure the scripts directory is in PATH at build-time
    
    Otherwise, we can't rely on finding debpkg, which debi uses.
    
    Signed-off-by: Simon McVittie <smcv@debian.org>

commit 29161efe640b0c68055158af7d60f007c181af1a
Author: Mattia Rizzolo <mattia@debian.org>
Date:   Sun Aug 18 18:36:37 2019 +0200

    tentatively speed up dependencies installation on CI
    
    Signed-off-by: Mattia Rizzolo <mattia@debian.org>

commit 55869a7f82bcba4e875e0421feaf6ab52a244a4c
Merge: e215f450 e878cad3
Author: Mattia Rizzolo <mattia@debian.org>
Date:   Sun Aug 18 18:31:37 2019 +0200

    Merge branch 'debi-test' of salsa.debian.org:smcv/devscripts
    
    MR: https://salsa.debian.org/debian/devscripts/merge_requests/141
    Signed-off-by: Mattia Rizzolo <mattia@debian.org>

commit e215f450fdcbb099dbc3c82d5dbbd21a94cb3b87
Merge: e6d5f63a 5ac8922b
Author: Mattia Rizzolo <mattia@debian.org>
Date:   Sun Aug 18 17:21:42 2019 +0200

    Merge branch 'perltidy-20190601-1' of salsa.debian.org:smcv/devscripts
    
    MR: https://salsa.debian.org/debian/devscripts/merge_requests/154
    Signed-off-by: Mattia Rizzolo <mattia@debian.org>

commit 5ac8922bab2fc143ff3d7656a2146a478e776988
Author: Simon McVittie <smcv@debian.org>
Date:   Sun Aug 18 14:13:25 2019 +0100

    Run perltidy -b using perltidy 20190601-1
    
    The new version of perltidy in unstable and Ubuntu devel is more strict
    about alignment than the version in buster, causing CI to fail.
    
    Signed-off-by: Simon McVittie <smcv@debian.org>

commit e878cad3cef5469f25a3f3a41716563bafb80245
Author: Simon McVittie <smcv@debian.org>
Date:   Wed Jul 24 22:58:58 2019 +0100

    test: Add an integration test for debi
    
    This detects some of the regressions since 2.19.5. It has to be run as
    root, preferably in an expendable testbed, because it actually installs
    packages: as a result it's wired up to autopkgtest but not run by default
    in test/Makefile.
    
    Signed-off-by: Simon McVittie <smcv@debian.org>

commit e6d5f63aa5edb3b748e1e0919722304233026ef4
Merge: d0361645 a892a9e0
Author: Mattia Rizzolo <mattia@debian.org>
Date:   Fri Aug 16 21:17:53 2019 +0200

    Merge branch 'salsa-no-fail-on-checkout' of salsa.debian.org:yadd/devscripts
    
    MR: https://salsa.debian.org/debian/devscripts/merge_requests/151
    Signed-off-by: Mattia Rizzolo <mattia@debian.org>

commit d0361645470374196f396534d2a7454071ad80c6
Merge: f5b6c199 773884e7
Author: Mattia Rizzolo <mattia@debian.org>
Date:   Fri Aug 16 18:45:47 2019 +0200

    Merge branch 'hardening-check-deadlock' of salsa.debian.org:mikesalvatore-guest/devscripts
    
    MR: https://salsa.debian.org/debian/devscripts/merge_requests/153
    Signed-off-by: Mattia Rizzolo <mattia@debian.org>

commit 773884e7615803bf5c3ac6fbe853f856c7674f21
Author: Mark Morlino <mark.morlino@canonical.com>
Date:   Fri Aug 16 10:44:35 2019 -0400

    hardening-check: Fix stdout/stderr deadlock in output()
    
    A deadlock can occur in output() in the following scenario:
    
    1) hardening-check executes readelf and attempts to read from stderr and
       stdout
    2) readelf writes to stderr.
    3) hardening-check calls read() on stderr.
            The behavior of read() is to read until EOF or the specified
            number of bytes have been read. readelf will not close stderr
            until it exits. hardening-check blocks, waiting for a total of
            4096 bytes to be written to stderr or readelf to exit.
    4) readelf writes to stdout.
            Since hardening-check is blocked waiting for stderr, readelf
            fills its write buffer and blocks, waiting for stdout to be read
            before it continues writing.
    5) Deadlock! hardening-check is waiting for stderr to close, readelf
       is waiting for stdout to be read and won't exit.
    
    This commit changes the way stderr and stdout are polled and changes
    from read() to sysread() in order to prevent the deadlock.
    
    Signed-off-by: Mike Salvatore <mike.salvatore@canonical.com>

commit a892a9e00d90dd9c0fef5587b9199976537a9fa8
Author: Xavier Guimard <yadd@debian.org>
Date:   Mon Aug 12 15:50:18 2019 +0200

    salsa: don't fail on checkout if --no-fail is set
    
    salsa: checkout: fix return code if --no-fail

commit b250c686ed87cd465c988974ece1956f9c167bc1
Author: Xavier <yadd@debian.org>
Date:   Fri Aug 16 11:28:58 2019 +0200

    salsa: add "search" in bash_completion (alias of search_project)

commit f5b6c1996981d0b8a92479f5540d2163375a9d81
Merge: 26c95c1e 80bfd494
Author: Mattia Rizzolo <mattia@debian.org>
Date:   Fri Aug 16 11:11:34 2019 +0200

    Merge branch 'uscan-fix-component-compression' of salsa.debian.org:yadd/devscripts
    
    MR: https://salsa.debian.org/debian/devscripts/merge_requests/149
    Signed-off-by: Mattia Rizzolo <mattia@debian.org>

commit 26c95c1e7b3608034e89a710e6709e15e871f77e
Merge: b53341b5 b57fa0c2
Author: Mattia Rizzolo <mattia@debian.org>
Date:   Fri Aug 16 11:06:35 2019 +0200

    Merge branch 'fix_bad_verification' of salsa.debian.org:yadd/devscripts
    
    MR: https://salsa.debian.org/debian/devscripts/merge_requests/150
    Signed-off-by: Mattia Rizzolo <mattia@debian.org>

commit b53341b58a6030f689698dff00001c97da923231
Merge: f3a1af60 c12a0d09
Author: Mattia Rizzolo <mattia@debian.org>
Date:   Fri Aug 16 11:02:46 2019 +0200

    Merge branch 'uscan-better-component-report' of salsa.debian.org:yadd/devscripts
    
    MR: https://salsa.debian.org/debian/devscripts/merge_requests/147
    Signed-off-by: Mattia Rizzolo <mattia@debian.org>

commit c12a0d09b3b0b7ba2f5017187e969aa5724ee3de
Author: Xavier <yadd@debian.org>
Date:   Fri Aug 9 11:48:55 2019 +0200

    uscan: better dehs display for components

commit b57fa0c2349328e4a0f32d73a69a3d88365361e1
Author: Xavier <yadd@debian.org>
Date:   Sun Aug 11 15:46:33 2019 +0200

    Fix bad https check
    
    This bug happens only when trying to embed uscan libraries (pkg-js-tools)

commit f3a1af60edada700df8b8c08450272e40b50c9f1
Merge: cb361f78 77ed6dee
Author: Mattia Rizzolo <mattia@debian.org>
Date:   Thu Aug 15 15:01:29 2019 +0200

    Merge branch 'uscan-better-component-display' of salsa.debian.org:yadd/devscripts
    
    MR: https://salsa.debian.org/debian/devscripts/merge_requests/146
    Signed-off-by: Mattia Rizzolo <mattia@debian.org>

commit cb361f780c8345d9a00c1c2a58606e9a45e3f498
Merge: 64b3f046 d6b625f2
Author: Mattia Rizzolo <mattia@debian.org>
Date:   Thu Aug 15 14:59:35 2019 +0200

    Merge branch 'bts-bad-warning' of salsa.debian.org:yadd/devscripts
    
    MR: https://salsa.debian.org/debian/devscripts/merge_requests/145
    Signed-off-by: Mattia Rizzolo <mattia@debian.org>

commit 64b3f046040ac6cdf610d9e56002046373a8637b
Merge: 9dc8b276 eea29e4a
Author: Mattia Rizzolo <mattia@debian.org>
Date:   Thu Aug 15 14:58:22 2019 +0200

    Merge branch 'installed-mergechanges' of salsa.debian.org:smcv/devscripts
    
    MR: https://salsa.debian.org/debian/devscripts/merge_requests/140
    Signed-off-by: Mattia Rizzolo <mattia@debian.org>

commit 9dc8b276582b34e0cd8ddfb60670a3944c4b1f40
Merge: 4b8f8b83 5adf51dd
Author: Mattia Rizzolo <mattia@debian.org>
Date:   Thu Aug 15 14:56:11 2019 +0200

    Merge branch 'master' of salsa.debian.org:eriberto/devscripts
    
    MR: https://salsa.debian.org/debian/devscripts/merge_requests/152
    Signed-off-by: Mattia Rizzolo <mattia@debian.org>

commit 80bfd494a9454ea01797b635f820323216245a25
Author: Xavier <yadd@debian.org>
Date:   Sun Aug 11 14:07:23 2019 +0200

    uscan: force component compression when it differs from main
    
    Closes: #934464

commit 5adf51ddc821894e31dd52fa35b7ce593cf4b1d8
Author: Joao Eriberto Mota Filho <eriberto@debian.org>
Date:   Mon Aug 12 16:51:17 2019 -0300

    debclean: work inside the package and avoid .git
    
    Allow debclean to work when in any path inside the package
    and avoid searching in .git directories. MR: !152

commit 4b8f8b8332ce2d8af20a199a7ff1521956e93c38
Author: Xavier Guimard <yadd@debian.org>
Date:   Tue Aug 6 20:57:00 2019 +0200

    Update French translation

commit 77ed6deec23b22037c06d651093585cbc59f53cb
Author: Xavier <yadd@debian.org>
Date:   Tue Aug 6 07:19:10 2019 +0200

    uscan: better display for component

commit d6b625f20dda6c91739db33e3f873c69ecd8facb
Author: Xavier Guimard <yadd@debian.org>
Date:   Mon Aug 5 15:20:48 2019 +0200

    bts: fix warning with "noaction" and undefined "from"
    
    Closes: #933607

commit eea29e4a123f530631bcbc8d7115245a41d3e33f
Author: Simon McVittie <smcv@debian.org>
Date:   Wed Jul 24 22:58:31 2019 +0100

    test_mergechanges: Fix detection of --installed option
    
    In Perl, the first command-line option is $ARGV[0], not $1. Previously,
    we were always testing scripts/mergechanges.sh and not the mergechanges
    in $PATH, even during autopkgtest.
    
    Signed-off-by: Simon McVittie <smcv@debian.org>

commit cae4b7f784927158e8a82c05c4a0c75109dd33aa
Author: Mattia Rizzolo <mattia@debian.org>
Date:   Wed Jul 24 16:44:30 2019 +0200

    nmudiff: document in the manpage the --no-pending and --no-dd options.
    
    Closes: #932848
    Signed-off-by: Mattia Rizzolo <mattia@debian.org>

commit 7a5230b629d76d4d7442a08df37f09a220c02c65
Merge: bc63d663 7fa00c71
Author: Mattia Rizzolo <mattia@debian.org>
Date:   Wed Jul 24 16:31:35 2019 +0200

    Merge branch 'master' of salsa.debian.org:hartge-guest/devscripts
    
    MR: https://salsa.debian.org/debian/devscripts/merge_requests/136
    Signed-off-by: Mattia Rizzolo <mattia@debian.org>

commit bc63d663f97e64b57bc3a721d5dfa66666b0e6a9
Merge: cc33d500 30c3bc4c
Author: Mattia Rizzolo <mattia@debian.org>
Date:   Wed Jul 24 16:28:56 2019 +0200

    Merge branch 'debi-reinstall' of salsa.debian.org:smcv/devscripts
    
    MR: https://salsa.debian.org/debian/devscripts/merge_requests/136
    Signed-off-by: Mattia Rizzolo <mattia@debian.org>

commit 7fa00c71c1b33ace4a9203da375660cb983f3cd0
Merge: 828c4a6a cc33d500
Author: Sven Hartge <sven@svenhartge.de>
Date:   Wed Jul 24 16:27:31 2019 +0200

    Merge remote-tracking branch 'debian-devscripts/master'

commit 828c4a6abb9d6feeec073a3fb5de4e5d2ffca729
Author: Sven Hartge <sven@svenhartge.de>
Date:   Wed Jul 24 16:24:02 2019 +0200

    Check correct variable before appending , to it.

commit cc33d5006cb7af19aaefbd7034d88cad2bf14a27
Merge: b6bd3142 0a94eb22
Author: Mattia Rizzolo <mattia@debian.org>
Date:   Wed Jul 24 16:19:23 2019 +0200

    Merge branch 'debi-wait' of salsa.debian.org:smcv/devscripts
    
    MR: https://salsa.debian.org/debian/devscripts/merge_requests/135
    Signed-off-by: Mattia Rizzolo <mattia@debian.org>

commit b6bd31421a81e85d68becfe68524859d6fa1c3b1
Merge: 521b35d7 39549240
Author: Mattia Rizzolo <mattia@debian.org>
Date:   Wed Jul 24 16:17:09 2019 +0200

    Merge branch 'git-deborig-stderr' of salsa.debian.org:debian/devscripts
    
    MR: https://salsa.debian.org/debian/devscripts/merge_requests/134
    Signed-off-by: Mattia Rizzolo <mattia@debian.org>

commit 521b35d7a56d178210f4cb0060596e8de1c019b6
Merge: 43054369 088e16db
Author: Mattia Rizzolo <mattia@debian.org>
Date:   Wed Jul 24 16:06:36 2019 +0200

    Merge branch 'salsa-broken-push' of salsa.debian.org:yadd/devscripts
    
    MR: https://salsa.debian.org/debian/devscripts/merge_requests/138
    Signed-off-by: Mattia Rizzolo <mattia@debian.org>

commit 30c3bc4c093796eec61a22738a3d530cfe67888e
Author: Simon McVittie <smcv@debian.org>
Date:   Sun Jul 21 14:42:08 2019 +0100

    debi: Invoke apt or apt-get with --reinstall
    
    Otherwise, if you are doing repeated test-builds of the same package
    with the intended next version number, apt will optimize away the
    reinstallation into nothing and it will not actually be reinstalled.
    
    Signed-off-by: Simon McVittie <smcv@debian.org>
    Fixes: 25d09aff "debi: replace dpkg + apt-get by "apt-get install" on .change file"

commit 0a94eb22eb07f654f5989d79186bf70bbfa9d6f6
Author: Simon McVittie <smcv@debian.org>
Date:   Sun Jul 21 14:38:57 2019 +0100

    debi: Wait for child processes
    
    Previously this code used system(), which waits for the child process
    to exit. Dpkg::IPC::spawn doesn't do that unless you pass
    a true value for the wait_child option.
    
    Signed-off-by: Simon McVittie <smcv@debian.org>
    Fixes: 25d09aff "debi: replace dpkg + apt-get by "apt-get install" on .change file"
    Closes: #932896

commit d1a64385e5783a2acab2534270c540505f69dac2
Author: Sven Hartge <sven@svenhartge.de>
Date:   Tue Jul 23 21:52:50 2019 +0200

    Keep original attribution line in changelog

commit 7a476ee0a2f39e240ab174ed894a94803a2cfb4c
Author: Sven Hartge <sven@svenhartge.de>
Date:   Tue Jul 23 21:51:11 2019 +0200

    Update Changelog

commit 249d8f15ed08c699512d7df50ed84cdf1a568d80
Author: Sven Hartge <sven@svenhartge.de>
Date:   Tue Jul 23 20:09:07 2019 +0200

    perltidify mk-build-deps.pl

commit b3db1369623ce5e0dccbe151c4fd5647034cd869
Author: Sven Hartge <sven@svenhartge.de>
Date:   Tue Jul 23 19:54:37 2019 +0200

    Implement parsing of Build-Depends-Arch and Build-Conflicts-Arch
    
    The Salsa CI pipeline uses mk-build-deps to install the needed
    build-dependencies for packages during testing.
    
    @gio noticed in
    https://salsa.debian.org/salsa-ci-team/pipeline/issues/72 that
    build-dependencies from Build-Depends-Arch where not installed.
    
    This MR here implements both parsing of Build-Depends-Arch and
    Build-Conflicts-Arch, adding those lists the the Build-Depends: and
    Build-Conflicts: output fields and the separate arch and indep cases.

commit 088e16db305eb13f91cd6a843289226c9be64d63
Author: Xavier <yadd@debian.org>
Date:   Mon Jul 22 10:33:47 2019 +0200

    salsa: fix broken "push" command
    
    Something changed in dependencies and now Dpkg::Source::Format is no more imported

commit 43054369810c3e9062522b7145bdea65192687c8
Author: Xavier Guimard <yadd@debian.org>
Date:   Mon Jul 22 08:16:21 2019 +0200

    Open 2.19.7

commit 39549240a7c2f23c14aec7036148ee10c02e7d98
Author: Sean Whitton <spwhitton@spwhitton.name>
Date:   Sat Jul 20 08:38:06 2019 +0100

    git-deborig: print to stderr, not stdout, when appropriate
    
    Closes: #931509
    
    Reported-by: Ian Jackson <ijackson@chiark.greenend.org.uk>