From c695a2e1edfedfa94af1faf6f620b0783f1246b4 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 4 Mar 2014 08:52:02 +0100 Subject: tarballrelease: only adopt debian/changelog if no upstream ChangeLog is present --- bin/tarballrelease | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" ) -- cgit v1.2.3