Your message dated Sun, 26 Apr 2015 07:42:58 +0000 with message-id <[email protected]> and subject line Bug#782354: fixed in devscripts 2.15.4 has caused the Debian Bug report #782354, regarding mergechanges: option to discard architecture-specific packages to be marked as done.
This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact [email protected] immediately.) -- 782354: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=782354 Debian Bug Tracking System Contact [email protected] with problems
--- Begin Message ---Package: devscripts Version: 2.15.3 Severity: wishlist Tags: patch The Debian archive does not currently accept source-only uploads for source packages with Architecture: all binaries, but it does allow source+all uploads, which result in the architecture-dependent binaries actually used by typical Debian users being built in a predictable environment. The attached patch adds an --indep (-i) option to mergechanges, which takes the source and the Architecture: all parts of a binary build, and discards the rest. Typical use: debuild cd .. # install and test it mergechanges -f -i foo_1.2-3_amd64.changes debsign foo_1.2-3_multi.changes dput ftp-master foo_1.2-3_multi.changes or (this is more like how I actually use it): debuild -S cd .. sbuild -A -d unstable foo_1.2-3.dsc # install and test it mergechanges -f -i foo_1.2-3_{amd64,source}.changes debsign foo_1.2-3_multi.changes dput ftp-master foo_1.2-3_multi.changes Regards, S>From 78605629c088250d3a2899513ab5cc3c982ad7f2 Mon Sep 17 00:00:00 2001 From: Simon McVittie <[email protected]> Date: Fri, 10 Apr 2015 20:26:16 +0100 Subject: [PATCH] mergechanges: add --indep option to skip architecture-specific packages This makes it easy to upload the minimum required packages for the Debian archive (source + Architecture: all), and have all architectures' binary packages built by the buildds. --- scripts/mergechanges.1 | 11 ++++++++--- scripts/mergechanges.sh | 37 ++++++++++++++++++++++++++++++++++--- 2 files changed, 42 insertions(+), 6 deletions(-) diff --git a/scripts/mergechanges.1 b/scripts/mergechanges.1 index 9496731..e68b587 100644 --- a/scripts/mergechanges.1 +++ b/scripts/mergechanges.1 @@ -2,7 +2,7 @@ .SH NAME mergechanges \- merge multiple changes files .SH SYNOPSIS -\fBmergechanges\fR [\fB\-f\fR] \fIfile1 file2\fR [\fIfile\fR...] +\fBmergechanges\fR [\fB\-f\fR] [\fB\-i\fR] \fIfile1 file2\fR [\fIfile\fR...] .SH DESCRIPTION \fBmergechanges\fR merges two or more \fI.changes\fR files, merging the Architecture, Description and Files (and Checksums-*, if present) @@ -15,7 +15,12 @@ The output is normally written to \fIstdout\fR. If the \fB\-f\fR option is given, the output is written to \fIpackage\fR_\fIversion\fR_multi.changes instead, in the same directory as the first changes file listed. +.PP +If the \fB\-i\fR or \fB\-\-indep\fR option is given, source packages +and architecture-independent (Architecture: all) packages are included +in the output, but architecture-dependent packages are not. .SH AUTHOR Gergely Nagy <[email protected]>, -modifications by Julian Gilbey <[email protected]> and -Adam D. Barratt <[email protected]>. +modifications by Julian Gilbey <[email protected]>, +Adam D. Barratt <[email protected]> and +Simon McVittie <[email protected]>. diff --git a/scripts/mergechanges.sh b/scripts/mergechanges.sh index 3ecb355..439aa95 100755 --- a/scripts/mergechanges.sh +++ b/scripts/mergechanges.sh @@ -43,6 +43,7 @@ GNU General Public License, version 2 or later." # Commandline parsing FILE=0 +INDEP_ONLY=0 while [ $# -gt 0 ]; do case "$1" in @@ -58,6 +59,10 @@ while [ $# -gt 0 ]; do FILE=1 shift ;; + -i|--indep) + INDEP_ONLY=1 + shift + ;; -*) echo "Unrecognised option $1. Use $progname --help for help" >&2 exit 1 @@ -84,11 +89,37 @@ for f in "$@"; do done # Extract the Architecture: field from all .changes files, -# and merge them, sorting out duplicates -ARCHS=$(grep -h "^Architecture: " "$@" | sed -e "s,^Architecture: ,," | tr ' ' '\n' | sort -u | tr '\n' ' ' | sed 's/ $//') +# and merge them, sorting out duplicates. Skip architectures +# other than all and source if desired. +ARCHS=$(grep -h "^Architecture: " "$@" | sed -e "s,^Architecture: ,," | tr ' ' '\n' | sort -u) +if test ${INDEP_ONLY} = 1; then + ARCHS=$(echo "$ARCHS" | grep -E '^(all|source)$') +fi +ARCHS=$(echo "$ARCHS" | tr '\n' ' ' | sed 's/ $//') checksum_uniq() { - awk '{if(arr[$NF] != 1){arr[$NF] = 1; print;}}' + local line + local IFS= + if test ${INDEP_ONLY} = 1; then + while read line; do + case "$line" in + (*.dsc|*.diff.gz|*.tar.*|*_all.deb|*_all.udeb) + # source or architecture-independent + echo "$line" + ;; + (*.deb|*.udeb) + # architecture-specific, ignore + ;; + (*) + echo "Unrecognised file, is it architecture-dependent?" >&2 + echo "$line" >&2 + exit 1 + ;; + esac + done | awk '{if(arr[$NF] != 1){arr[$NF] = 1; print;}}' + else + awk '{if(arr[$NF] != 1){arr[$NF] = 1; print;}}' + fi } # Extract & merge the Version: field from all files.. -- 2.1.4
--- End Message ---
--- Begin Message ---Source: devscripts Source-Version: 2.15.4 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 [email protected], and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. James McCoy <[email protected]> (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 [email protected]) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Format: 1.8 Date: Sat, 25 Apr 2015 21:58:50 -0400 Source: devscripts Binary: devscripts Architecture: source amd64 Version: 2.15.4 Distribution: unstable Urgency: medium Maintainer: Devscripts Devel Team <[email protected]> Changed-By: James McCoy <[email protected]> Description: devscripts - scripts to make the life of a Debian Package maintainer easier Closes: 728607 765338 768345 774276 774544 774685 775084 776209 776318 777344 777345 777346 778648 778860 778963 779279 780167 781611 782354 Changes: devscripts (2.15.4) unstable; urgency=medium . [ Dominique Dumont ] * licensecheck: + Handle license like GPL version 2 or 3 (which is not GPL-2+) + Ignore .pc directories + print copyrights in a non random-order . [ Daniel Kahn Gillmor ] * uscan: explicitly dearmor, rather than --import upstream signing key (Closes: #768345) . [ James McCoy ] * debsnap: When specified version or architectures aren't available, warn and exit with error code 2. (Closes: #774276) * rmadison: + Display the usage to the specified fd instead of ignoring it. + Display the known URL aliases in the usage. + Display all the URLs in --help when $default_url is a comma-separated list. + Remove 404ing myon and debug URLs + Use https://api.ftp-master.debian.org/madison for debian and new URLs. This also fixes support for the -b option. (Closes: #775084) + Strip arch-qualifiers from package names. (Closes: #780167) * mk-origtargz: Avoid adding the same file to the "to be deleted" list multiple times. This may also cause patterns to be declared as unused if a file is matched by multiple patterns. (Closes: #776318) * who-uploads: + Fix extraction of uploader's key id. * Create a temporary GNUPGHOME to avoid “gpg --list-key” erroring when no ~/.gnupg exists. (Closes: #776209) * bts: Cancel the mail if the spawned editor exits with a non-zero exit code. This is an alternative way to cancel a command, rather than saving an empty message. (Closes: #778648) * who-permits-upload: Update URL to use https. * Replace use of Parse::DebControl with Dpkg::Control to work around #780138 and remove a dependency. * uscan: + Always remove the Referer header for Sourceforge, not just when going via the redirector. (Closes: #778860) + Let the OS assign a port to the test's HTTP server so tests don't fail when something is already using port 8000. * Ensure all LWP-using scripts honor a proxy set in the environment. (Closes: #781611) . [ Johannes Schauer ] * chdist: Also set Apt::Architectures to prevent foreign architectures from the host leaking into the apt tree (Closes: #774685) . [ Iain Lane ] * rmadison: The short option for --regex is -r, not -s. . [ Fabian Greffrath ] * wrap-and-sort: Add dirs, docs, examples, info, links, maintscript and manpages (all can also be prefixed by the binary package name) to the files in the debian/ directory that get sorted alphabetically. (Closes: #765338) . [ Ian Jackson ] * grep-excuses: + Minor manpage corrections. (Closes: #777344) + Add --debug option. (Closes: #777345) + Search for autoremovals too, by default. (Closes: #777346) . [ Hideki Yamane ] * Add bash completion for dch, debsign, and uupdate. (Closes: #774544, #778963, #779279) . [ Peter Eisenstraut ] * Consistently use Makefile variables to control the installation layout. (Closes: #728607) . [ Antonio Terceiro ] * chdist: also create /etc/apt/sources.list.d . [ Simon McVittie ] * mergechanges: Add --indep option to skip architecture-specific packages. (Closes: #782354) Checksums-Sha1: 306206dd2eab250ce314c6d8efaf23ed58490043 2206 devscripts_2.15.4.dsc 8476fd0d5b1819759c91042a5d8460d75edbe9ef 612464 devscripts_2.15.4.tar.xz a578ad58d76e0591ca639076a5c1b1c84bec7ec4 903668 devscripts_2.15.4_amd64.deb Checksums-Sha256: b9fc82e8b4ac934706e176910f6c863d88ac7574c7bf9c9bb63604053338d6fc 2206 devscripts_2.15.4.dsc e2e091d9339ab9ba36143a2e0a516e415766567e06479ffe712da977405f8d0e 612464 devscripts_2.15.4.tar.xz 9a501b5ee393b5a7649723c4118f6d31320c2f6852cc2711d97449646f2b4750 903668 devscripts_2.15.4_amd64.deb Files: 5e6f704f285ccbe3b86e8ec98b5922e0 2206 devel optional devscripts_2.15.4.dsc 940e520d057b68fa565f15f057e73d52 612464 devel optional devscripts_2.15.4.tar.xz a1026d996ef8554b59e45ec9ef3eb83e 903668 devel optional devscripts_2.15.4_amd64.deb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQJ8BAEBCgBmBQJVPEjXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MUJGQkY0RDY5NTZCRDVERjdCNzJEMjNE RkU2OTFBRTMzMUJBM0RCAAoJEN/mka4zG6Pbvu0P/0doMNsOSvPYv/gAdOE6VBS0 mqjqeKdhEItcO165JIBr+TPkb8ccv/fCyM6ckCmebwAAGYsisFtxrf/aTv82D9x0 xzU6f1L9NFS6U+CKBw2490bQ+WXrrRIQaWdoUknmq9d6TbSPoa7R+jCOtyvaWTCH BLrM5rXQyyALO2emr+qbufWCVwrv1JzmA2phuh0o2mZHvAJoMGQ1062DJVB/+smZ L3S6wD9PPLjwNYjV4407kobEuhyUgd35oxkGGoxa23jnF+o7VWSJMrUD4qmU+8r+ 9WxlJVWUfZnndmnZa24CYrqPl8Xl1uQnccwY+VG1H4sjdGlJHQZtVPZn06PqKFJi P9Nqld9EUtxWLsGvp46BzxP+goZZhJjn8Ds1sJ9XJZ8LiN2dIDMq1Z6bGV99dLSe ACNXxJUW/+05nkeCxNk8n3If/DopjgcLlY/ffJoECyeVI58NTHBciOV4UoShCul5 K5KDIYpCQSt7PUrxDPgLm8EOdfVTWmFmH3+TOAeTVO0HDFcLZcsa45IiBEnWIYLb eRXa0IwZjyZ5CqEQynj4EvHnDg8ouAmAIfFXEOZwSWhgrnXbhj1+XYcPJWzyfUUB 1AtcAUytfap5YbxFVwAUlG43PlvOKLQVXE1t7Vz/fQlhE5cO+MpHPustnLycOlJK IwtqdhIRCzbwTRKa5AfB =fa7E -----END PGP SIGNATURE-----
--- End Message ---
_______________________________________________ devscripts-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
