diff options
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rwxr-xr-x | debian/roll-tarballs.sh | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 15dc5000b..5580285d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -184,6 +184,7 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low in tarball (special focuse on the nx-libs-lite tarball). + Allow patch files names having a dash next to the four digits (i.e., 1234-<patchname>.<suffix>). + + Support tarring up the HEAD of the current branch. * debian/COPYING.full+lite: + Replace content with GPL-2 license text, because that is the overall (i.e., strictest) license we have to deal with in nx-libs. diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index 47b2b6b3e..36afd8203 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -53,13 +53,13 @@ else fi if [ x"$RELEASE" == "xHEAD" ]; then - CHECKOUT="HEAD" + CHECKOUT=refs/heads/$(git rev-parse --abbrev-ref HEAD) fi if ! git rev-parse --verify -q "$CHECKOUT" >/dev/null; then echo " '${RELEASE}' is not a valid release number because there is no git tag named ${CHECKOUT}." echo " Please specify one of the following releases:" - echo "HEAD" + echo "HEAD (on branch `git rev-parse --abbrev-ref HEAD`)" git tag -l | grep "^redist" | cut -f2 -d"/" | sort -u exit 1 fi |