[X2Go-Commits] [buildscripts] 02/02: tarballrelease: only adopt debian/changelog if no upstream ChangeLog is present

git-admin at x2go.org git-admin at x2go.org
Tue Mar 4 08:52:23 CET 2014


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit c695a2e1edfedfa94af1faf6f620b0783f1246b4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Mar 4 08:52:02 2014 +0100

    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" )

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git



More information about the x2go-commits mailing list