This is an automated email from the git hooks/post-receive script. jamessan pushed a commit to branch master in repository devscripts.
commit f3f8e32d1396fa7b8e250544c6af74aeb084d815 Author: James McCoy <[email protected]> Date: Mon Dec 5 23:34:06 2016 -0500 mergechanges: Add handling for buildinfo files Signed-off-by: James McCoy <[email protected]> --- debian/changelog | 8 ++++++++ scripts/mergechanges.sh | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 515fb2c..f84e221 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +devscripts (2.16.12) UNRELEASED; urgency=medium + + * mergechanges: + + Add handling for buildinfo files, based on a patch by Simon McVittie. + (Closes #843470) + + -- James McCoy <[email protected]> Mon, 05 Dec 2016 22:58:29 -0500 + devscripts (2.16.11) unstable; urgency=medium [ James McCoy ] diff --git a/scripts/mergechanges.sh b/scripts/mergechanges.sh index 1e07622..b8f21bb 100755 --- a/scripts/mergechanges.sh +++ b/scripts/mergechanges.sh @@ -125,17 +125,17 @@ checksum_uniq() { if test ${REMOVE_ARCHDEP} = 1 -o ${REMOVE_INDEP} = 1; then while read line; do case "$line" in - (*.dsc|*.diff.gz|*.tar.*) + (*.dsc|*.diff.gz|*.tar.*|*_source.buildinfo) # source echo "$line" ;; - (*_all.deb|*_all.udeb) + (*_all.deb|*_all.udeb|*_all.buildinfo) # architecture-indep if test ${REMOVE_INDEP} = 0; then echo "$line" fi ;; - (*.deb|*.udeb) + (*.deb|*.udeb|*.buildinfo) # architecture-specific if test ${REMOVE_ARCHDEP} = 0; then echo "$line" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git _______________________________________________ devscripts-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
