Your message dated Mon, 21 Apr 2008 19:02:03 +0000 with message-id <[EMAIL PROTECTED]> and subject line Bug#475957: fixed in devscripts 2.10.26 has caused the Debian Bug report #475957, regarding [mergechanges] Add support for Checksums-Sha(1|256) 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.) -- 475957: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=475957 Debian Bug Tracking System Contact [EMAIL PROTECTED] with problems
--- Begin Message ---Package: devscripts Version: 2.10.25 Severity: normal Tags: patch Hi, I use mergechanges to merge a _sources.changes file (only orig.tar.gz, diff.gz and dsc files) with an _i386.changes file (only i386 and all arch files, no sources) before my uploads. With the current mergechanges, the resulting changes file only contains the Checksums-Sha* fields of the _sources.changes (the ones from the _i386.changes file are discarded). I made a patch to correct this on my system. You may want to apply it upstream (or rewrite it). As for the other parts of the mergechanges script, it makes assumptions about the order in the changes files... Best regards, Vincent -- Package-specific info: --- /etc/devscripts.conf --- --- ~/.devscripts --- DEBCHANGE_RELEASE_HEURISTIC=changelog -- System Information: Debian Release: lenny/sid APT prefers unstable APT policy: (990, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental') Architecture: i386 (i686) Kernel: Linux 2.6.25-rc8-686 (SMP w/1 CPU core) Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash Versions of packages devscripts depends on: ii debianutils 2.28.4 Miscellaneous utilities specific t ii dpkg-dev 1.14.18 package building tools for Debian ii libc6 2.7-10 GNU C Library: Shared libraries ii perl 5.8.8-12 Larry Wall's Practical Extraction ii sed 4.1.5-7 The GNU sed stream editor Versions of packages devscripts recommends: ii at 3.1.10.1 Delayed job execution and batch pr ii bsd-mailx [mailx] 8.1.2-0.20071201cvs-2 A simple mail user agent ii build-essential 11.3 informational list of build-essent ii bzr 1.3-1 easy to use distributed version co ii curl 7.18.0-1 Get a file from an HTTP, HTTPS or ii cvs 1:1.12.13-10 Concurrent Versions System ii cvs-buildpackage 5.21 A set of Debian package scripts fo ii dctrl-tools 2.12 Command-line tools to process Debi ii debian-keyring 2007.12.04 GnuPG (and obsolete PGP) keys of D ii debian-maintainers 1.27 GPG keys of Debian maintainers ii dput 0.9.2.30 Debian package upload tool ii dupload 2.6.3.3 utility to upload Debian packages ii epiphany-gecko [ww 2.20.3-1.1 Intuitive GNOME web browser - Geck ii equivs 2.0.7-0.1 Circumvent Debian package dependen ii fakeroot 1.9.4 Gives a fake root environment ii git-core 1:1.5.5-1 fast, scalable, distributed revisi ii gnupg 1.4.6-2.1 GNU privacy guard - a free PGP rep ii gnuplot 4.2.2-1 A command-line driven interactive ii iceape-browser [ww 1.1.9-1 Iceape Navigator (Internet browser ii iceweasel [www-bro 3.0~b5-1 lightweight web browser based on M ii konqueror [www-bro 4:3.5.9.dfsg.1-2+b1 KDE's advanced file manager, web b ii libauthen-sasl-per 2.10-1.1 Authen::SASL - SASL Authentication ii libcrypt-ssleay-pe 0.57-1 Support for https protocol in LWP ii libfile-desktopent 0.04-0.1 Perl module to handle freedesktop ii libparse-debcontro 2.005-2 Easy OO parsing of Debian control- ii libsoap-lite-perl 0.71-2 Client and server side SOAP implem ii libterm-size-perl 0.2-4 Perl extension for retrieving term ii libtimedate-perl 1.1600-9 Time and date functions for Perl ii liburi-perl 1.35.dfsg.1-1 Manipulates and accesses URI strin ii libwww-perl 5.808-1 WWW client/server library for Perl ii lintian 1.23.46 Debian package checker ii lsb-release 3.2-7 Linux Standard Base version report ii lynx [www-browser] 2.8.6-2 Text-mode WWW Browser ii mailx 1:20071201-2 Transitional package for mailx ren ii man-db 2.5.1-3 on-line manual pager ii mercurial 1.0-1 Scalable distributed version contr ii openssh-client [ss 1:4.7p1-8 secure shell client, an rlogin/rsh ii patch 2.5.9-4 Apply a diff file to an original ii patchutils 0.2.31-4 Utilities to work with patches ii perl [libdigest-md 5.8.8-12 Larry Wall's Practical Extraction ii strace 4.5.15-1.2 A system call tracer ii subversion 1.4.6dfsg1-2 Advanced version control system ii svk 2.0.1-1 A Distributed Version Control Syst ii unzip 5.52-11 De-archiver for .zip files ii w3m [www-browser] 0.5.1-5.1+b1 WWW browsable pager with excellent ii wdiff 0.5-17 Compares two files word by word ii wget 1.11.1-1 retrieves files from the web -- no debconf information--- /tmp/mergechanges.orig 2008-04-14 09:25:47.000000000 +0200 +++ /usr/bin/mergechanges 2008-04-14 09:40:07.000000000 +0200 @@ -96,6 +96,10 @@ SOURCE=$(grep -h "^Source: " "$@" | sed -e "s,^Source: ,," | sort -u) # Extract & merge the files from all files FILES=$(egrep -h "^ [0-9a-f]{32} [0-9]+" "$@" | sort -u) +# Extract & merge the Sha1 from all files +SHA1=$(egrep -h "^ [0-9a-f]{40} [0-9]+" "$@" | sort -u) +# Extract & merge the Sha256 from all files +SHA256=$(egrep -h "^ [0-9a-f]{64} [0-9]+" "$@" | sort -u) # Extract & merge the description from all files DESCRIPTIONS=$(sed '/^Description:/,/^[^ ]/{/^ /p;d};d' "$@" | sort -u) @@ -143,14 +147,28 @@ cp "$1" ${OUTPUT} fi -# Replace the Architecture: field, nuke the value of Files:, and insert -# the Description: field before the Changes: field -eval "sed -e 's,^Architecture: .*,Architecture: ${ARCHS},; /^Files: /q' \ +# Replace the Architecture: field, nuke the value of Files:, Checksums-Sha1: +# and/or Checksums-Sha256:, and insert the Description: field before the +# Changes: field +eval "sed -e 's,^Architecture: .*,Architecture: ${ARCHS},; /^\(Files\|Checksums-Sha\(1\|256\)\): /Q' \ -e '/^Description:/,/^[^ ]/{/^Description:/d;/^[ ]/d}' \ -e '/^Changes:/{r '${DESCFILE} -e ';aChanges:' -e ';d}' \ ${OUTPUT} ${REDIR1}" +# Voodoo magic to get the merged Checksums-Sha1 into the output (if any) +if test $(echo "${SHA1}" | wc -l) -ge 1; then + eval "echo 'Checksums-Sha1: ' ${REDIR2}" + eval "echo '${SHA1}' ${REDIR2}" +fi + +# Voodoo magic to get the merged Checksums-Sha256 into the output (if any) +if test $(echo "${SHA256}" | wc -l) -ge 1; then + eval "echo 'Checksums-Sha1: ' ${REDIR2}" + eval "echo '${SHA256}' ${REDIR2}" +fi + # Voodoo magic to get the merged filelist into the output +eval "echo 'Files: ' ${REDIR2}" eval "echo '${FILES}' ${REDIR2}" exit 0
--- End Message ---
--- Begin Message ---Source: devscripts Source-Version: 2.10.26 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: devscripts_2.10.26.dsc to pool/main/d/devscripts/devscripts_2.10.26.dsc devscripts_2.10.26.tar.gz to pool/main/d/devscripts/devscripts_2.10.26.tar.gz devscripts_2.10.26_amd64.deb to pool/main/d/devscripts/devscripts_2.10.26_amd64.deb 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. Adam D. Barratt <[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: SHA1 Format: 1.7 Date: Mon, 21 Apr 2008 19:45:34 +0100 Source: devscripts Binary: devscripts Architecture: source amd64 Version: 2.10.26 Distribution: unstable Urgency: low Maintainer: Devscripts Devel Team <[EMAIL PROTECTED]> Changed-By: Adam D. Barratt <[EMAIL PROTECTED]> Description: devscripts - scripts to make the life of a Debian Package maintainer easier Closes: 472922 475337 475578 475750 475828 475896 475957 476100 476240 476251 476264 476985 Changes: devscripts (2.10.26) unstable; urgency=low . [ Adam D. Barratt ] * bts: Update documentation for "forwarded" to indicate that it may also be used with a URL (for instance, for an upstream bug tracker) (Closes: #475896) * checkbashisms: + Add experimental makefile support (only enabled if -f is used) + Modify the "2>&foo" check to allow a valid file descriptor followed by a backslash (for line continuations) + Check the initial lines of shell script wrappers. Based on a patch from Raphael Geissert + Fix a couple of the quoted block detection checks so as not to trigger on escaped quotes and correctly count quotes within lines containing '' or "" + Only rebuild the lists of expressions to search for when required, rather than for each line of each file + Disable "makefile mode" after checking a makefile if the next file to check isn't a makefile + Several enhancements to heredoc detection: - Heredoc delimiters may contain "non word" characters if the delimiter is quoted. As a side-effect, delimiters which match one of the bashism expressions may now be flagged due to the order in which checks are performed. - SUS specifies that a heredoc ends on a line consisting solely of a delimiter, so we enforce that and also don't check such lines. - Delimiters may now contain regular expression meta-characters. + Match shell script wrappers that don't pass on parameters when execing (for example for scripts which take all input from STDIN) + Add a check for process substitution (using "foo <(bar)") * debchange: + Allow a changelog with no entries to be created. (Note that such a changelog will cause a warning from dpkg-parsehchangelog the next time debchange is used with it) (Closes: #475578) + Correctly handle control files containing comments when checking for NMUs (Closes: #475750) + Fix a side-effect of the automagic NMU detection functionality which could lead to a spurious stanza being added to the end of the changelog + Skip automatic NMU detection if -a or -r was passed on the command line or if libparse-debcontrol-perl is not installed + Add {oldstable-,testing-,}proposed-updates to the list of supported distributions (Closes: #476264) + Add oldstable to the list of supported distributions, as updates to oldstable have been possible for some time + Allow automatic NMU detection to be disabled from the command line (Closes: #476985) * debcommit: Modify the "strip message" functionality so that: + Changelog lines beginning with any of *, + or - are considered to indicate a "change" for the purposes of deciding whether to strip the message + When trimming leading whitespace on continuation lines, only spaces and tabs are considered rather than line breaks (Closes: #475337) * debdiff: + Make the diffstat header for comparisons between two Debian revisions the same as that between two upstream versions + Normalise directory names in all file headers within a diff, not just the first * debian/control: + Suggest instead of Recommending gnuplot and cvs-buildpackage + Suggest svn-buildpackage (Closes: #476240) + Drop libparse-debcontrol-perl build-dependency now that debchange no longer fails in the absence of the package * debuild: + Run dpkg-buildpackage directly where possible, rather than emulating it. Emulation will still be used if any of the clean, dpkg-source, build, binary, dpkg-genchanges or final-clean hooks are defined, as dpkg does not currently support them. (Closes: #476100) + Make it clearer that a particular invocation is using the emulated dpkg-buildpackage, and why. + Automatically preserve the (C, CPP, CXX, LD and F)FLAGS variables and the corresponding *FLAGS_APPEND variables + Add *FLAGS and *FLAGS_APPEND support to the emulated dpkg-buildpackage + When running dpkg-buildpackage directly, pass through unrecognised options (with a warning) rather than aborting the build ourselves * diff2patches: Update to new upstream version. * dscverify: + Update for the .changes and .dsc format introduced with dpkg 1.14.17: - Handle Checksums-Sha(1|256) - Reject .changes files with unsupported Formats and any file with unsupported Checksums fields * licensecheck: Replace a literal copyright symbol with a hex escape so that the package builds using etch's po4a (Closes: #476251) * mergechanges: + Update for the new .changes format introduced with dpkg 1.14.17: - Handle Checksums-Sha(1|256) (Closes: #475957) - Only allow .changes files with the same Format to be merged - Reject .changes files with unsupported Formats or Checksums fields * rmadison: Allow custom shorthand URLs to be defined (Closes: #472922) * uscan: Allow a particular upstream release to be downloaded rather than the most recent (assuming it is in the list retrieved by the watch file) (Closes: #475828) . [ Christoph Berg ] * dcmd: If no command is given, print filenames line-by-line. Files: 8668d939f4e86e73d11636e91c372c49 1184 devel optional devscripts_2.10.26.dsc 343afd1648a408058dbe9897e98fbc99 554176 devel optional devscripts_2.10.26.tar.gz 0e5c32986c01746dc06283c9fe41fa18 474692 devel optional devscripts_2.10.26_amd64.deb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQFIDON0okcE1TReOoURAvWDAJ0XhtcBbHGCeY/vVOq1LGykjqrG0gCgliDc 2207d+3tDN92rhbOJnOKphE= =TeIN -----END PGP SIGNATURE-----
--- End Message ---
