Author: ryan
Date: 2009-11-16 05:32:34 +0000 (Mon, 16 Nov 2009)
New Revision: 2021
Modified:
trunk/debian/changelog
trunk/scripts/mergechanges.sh
Log:
mergechanges: make trailing whitespace consistent with how 'normal' .changes
file are
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2009-11-16 05:27:35 UTC (rev 2020)
+++ trunk/debian/changelog 2009-11-16 05:32:34 UTC (rev 2021)
@@ -24,9 +24,12 @@
* mk-build-deps: allow passing options to the command in
MKBUILDDEPS_TOOL. Setting MKBUILDDEPS_TOOL="aptitude --schedule-
only" in ~/.devscripts should work now. (Closes: #547164)
- * mergechanges: if both input files have the same file listed but with
- different checksums, keep the first and get rid of the one from the
- second.
+ * mergechanges:
+ + if both input files have the same file listed but with
+ different checksums, keep the first and get rid of the one from the
+ second.
+ + make trailing whitespace consistent with how 'normal'
+ .changes file are
-- Ryan Niebur <[email protected]> Sun, 18 Oct 2009 14:31:42 -0700
Modified: trunk/scripts/mergechanges.sh
===================================================================
--- trunk/scripts/mergechanges.sh 2009-11-16 05:27:35 UTC (rev 2020)
+++ trunk/scripts/mergechanges.sh 2009-11-16 05:32:34 UTC (rev 2021)
@@ -86,7 +86,7 @@
# 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' ' ')
+ARCHS=$(grep -h "^Architecture: " "$@" | sed -e "s,^Architecture: ,," | tr ' '
'\n' | sort -u | tr '\n' ' ' | sed 's/ $//')
checksum_uniq() {
awk '{if(arr[$NF] != 1){arr[$NF] = 1; print;}}'
@@ -178,7 +178,7 @@
trap "rm -f '${OUTPUT}' '${DESCFILE}'" 0 1 2 3 7 10 13 15
if test $(echo "${DESCRIPTIONS}" | wc -l) -ne 0; then
- echo "Description:" > "${DESCFILE}"
+ echo "Description: " > "${DESCFILE}"
echo "${DESCRIPTIONS}" >> "${DESCFILE}"
fi
@@ -194,7 +194,7 @@
eval "sed -e 's,^Architecture: .*,Architecture: ${ARCHS},' \
-e '/^Files: /,$ d; /^Checksums-.*: /,$ d' \
-e '/^Description:/,/^[^ ]/{/^Description:/d;/^[ ]/d}' \
- -e '/^Changes:/{r '${DESCFILE} -e ';aChanges:' -e ';d}' \
+ -e '/^Changes:/{r '${DESCFILE} -e ';aChanges: ' -e ';d}' \
-e 's,^Format: .*,Format: ${FORMATS},' \
${OUTPUT} ${REDIR1}"
--
To unsubscribe, send mail to [email protected].
