summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2014-03-04 08:52:02 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2014-03-04 08:52:02 +0100
commitc695a2e1edfedfa94af1faf6f620b0783f1246b4 (patch)
treebc4807eaa3c3339ea68aae888b99b25d63689539
parent43bc094e10b5fd9c3e59c4fcfa79ab47b93b97f9 (diff)
downloadbuildscripts-c695a2e1edfedfa94af1faf6f620b0783f1246b4.tar.gz
buildscripts-c695a2e1edfedfa94af1faf6f620b0783f1246b4.tar.bz2
buildscripts-c695a2e1edfedfa94af1faf6f620b0783f1246b4.zip
tarballrelease: only adopt debian/changelog if no upstream ChangeLog is present
-rwxr-xr-xbin/tarballrelease2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/tarballrelease b/bin/tarballrelease
index 255bd7e..5b7fed1 100755
--- a/bin/tarballrelease
+++ b/bin/tarballrelease
@@ -38,7 +38,7 @@ trap "rm -f \"${MANIFEST}\"; rm -rf \"${TEMP_DIR}\"" 0
git clone . "$TEMP_DIR/${PROJECT}-$RELEASE"
( set -e; cd "$TEMP_DIR/${PROJECT}-$RELEASE/" && git checkout ${CHECKOUT} 2>/dev/null || true )
( set -e; cd "$TEMP_DIR" && rm -Rf "${PROJECT}-$RELEASE/.git"* )
-( set -e; cd "$TEMP_DIR" && cp debian/changelog ChangeLog )
+( set -e; cd "$TEMP_DIR" && test -f ChangeLog || { test -f debian/changelog && cp debian/changelog ChangeLog; } )
( set -e; cd "$TEMP_DIR" && rm -Rf debian/ )
( set -e; cd "$TEMP_DIR" && rm -f *.spec )
( set -e; cd "$TEMP_DIR" && find "${PROJECT}-$RELEASE" -type f | sed 's/^\.*\/*//' | sort > "$MANIFEST" )