The following commit has been merged in the master branch:
commit 23a5c42b2eb1bf9f5a40c57f7921cd0f2d78d1fd
Author: James Vega <[email protected]>
Date: Fri Jul 8 17:52:48 2011 -0400
mergechanges: Do not drop fields in merged file.
We were calling sed such that all lines from the Files/Checksums-* fields to
the end of the input file were deleted. Since the ordering of the fields is
not relevant, sed expressions needed to be adjusted to only delete the
specific field.
Closes: #625620
Signed-off-by: James Vega <[email protected]>
diff --git a/debian/changelog b/debian/changelog
index 2f2f987..b98af6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ devscripts (2.11.1) UNRELEASED; urgency=low
Lindfors for the suggestion.
* uscan: Fix --destdir regression when repacking zip archives. Thanks to
Christian Kastner for the patch. (Closes: #628076)
+ * mergechanges: Do not drop fields when the Files/Checksums-* fields are not
+ at the end of the source files. (Closes: #625620)
[ Christoph Berg ]
* dscextract: new script, extracts a single file from a Debian source
diff --git a/scripts/mergechanges.sh b/scripts/mergechanges.sh
index 8c25945..bb8fceb 100755
--- a/scripts/mergechanges.sh
+++ b/scripts/mergechanges.sh
@@ -191,8 +191,9 @@ 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},' \
- -e '/^Files: /,$ d; /^Checksums-.*: /,$ d' \
- -e '/^Description:/,/^[^ ]/{/^Description:/d;/^[ ]/d}' \
+ -e '/^Checksums-.*:/,/^[^ ]/{/^Checksums-.*:/d;/^ /d}' \
+ -e '/^Files:/,/^[^ ]/{/^Files:/d;/^ /d}' \
+ -e '/^Description:/,/^[^ ]/{/^Description:/d;/^ /d}' \
-e '/^Changes:/{r '${DESCFILE} -e ';aChanges: ' -e ';d}' \
-e 's,^Format: .*,Format: ${FORMATS},' \
${OUTPUT} ${REDIR1}"
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
