From 701471e8e464558a05ff99eeeeb7b886c1a7cefa Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 28 May 2015 13:29:27 +0200 Subject: debian/roll-tarball.sh: Allow patch files names having a dash next to the four digits (i.e., 1234-.). --- debian/roll-tarballs.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index 954986b5f..a060212f0 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -81,7 +81,7 @@ mkdir -p "doc/applied-patches" # prepare patches for lite and full tarball if [ "x$MODE" = "xfull" ]; then - cat "debian/patches/series" | sort | grep -v '^#' | egrep "([0-9]+_.*\.(full|full\+lite)\.patch)" | while read file + cat "debian/patches/series" | sort | grep -v '^#' | egrep "([0-9]+(_|-).*\.(full|full\+lite)\.patch)" | while read file do cp -v "debian/patches/$file" "doc/applied-patches/" echo "${file##*/}" >> "doc/applied-patches/series" @@ -90,7 +90,7 @@ else rm -Rf "nxcompshad"* rm -Rf "nxcompext"* rm -Rf "nx-X11"* - cat "debian/patches/series" | sort | grep -v '^#' | egrep "([0-9]+_.*\.full\+lite\.patch)" | while read file + cat "debian/patches/series" | sort | grep -v '^#' | egrep "([0-9]+(_|-).*\.full\+lite\.patch)" | while read file do cp -v "debian/patches/$file" "doc/applied-patches/" echo "${file##*/}" >> "doc/applied-patches/series" -- cgit v1.2.3 From 895ee3b3b1f199dae2ed4da9c393d1ba575820a0 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 28 May 2015 13:33:43 +0200 Subject: debian/roll-tarball.sh: Support tarring up the HEAD of the current branch. --- debian/roll-tarballs.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index a060212f0..ff777bd37 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -52,13 +52,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 -- cgit v1.2.3 From 47afc48ea312b3ab7a5138c15271942103ec3fee Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 28 May 2015 14:33:08 +0200 Subject: debian/roll-tarball.sh: Prevent several files/folders from ending up in nx-libs-lite tarball. * bin/{nxagent,nxauth,x2goagent} * etc/ * doc/nx-X11_vs_XOrg69_patches * README.keystrokes" * nx-libs.spec --- debian/roll-tarballs.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index ff777bd37..3e41092f8 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -87,9 +87,13 @@ if [ "x$MODE" = "xfull" ]; then echo "${file##*/}" >> "doc/applied-patches/series" done else + rm -f "bin/"{nxagent,nxauth,x2goagent} rm -Rf "nxcompshad"* rm -Rf "nxcompext"* rm -Rf "nx-X11"* + rm -Rf "etc"* + rm -Rf "doc/nx-X11_vs_XOrg69_patches"* + rm -f "README.keystrokes" cat "debian/patches/series" | sort | grep -v '^#' | egrep "([0-9]+(_|-).*\.full\+lite\.patch)" | while read file do cp -v "debian/patches/$file" "doc/applied-patches/" @@ -104,15 +108,16 @@ else echo "No patches applied at all. Very old release?" fi +# remove folders that we do not want to roll into the tarball +rm -Rf ".pc/" +rm -Rf "debian/" +rm -Rf "nx-libs.spec" + # very old release did not add any README for f in $(ls README* 2>/dev/null); do mv -v "$f" "doc/"; done -# remove folders that we do not want to roll into the tarball -rm -Rf ".pc/" -rm -Rf "debian/" - # remove files, that we do not want in the tarballs (build cruft) rm -Rf nx*/configure nx*/autom4te.cache* -- cgit v1.2.3 From 7e1effbe782644ddf1ec30354224d56e7f3f24ff Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 28 May 2015 14:49:40 +0200 Subject: debian/roll-tarball.sh: Rename README.md to README.NX-Development before moving it into doc/ folder. --- debian/roll-tarballs.sh | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index 3e41092f8..07e052268 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -113,6 +113,9 @@ rm -Rf ".pc/" rm -Rf "debian/" rm -Rf "nx-libs.spec" +# some file renamings +mv README.md README.NX-Development + # very old release did not add any README for f in $(ls README* 2>/dev/null); do mv -v "$f" "doc/"; -- cgit v1.2.3 From 438f3df14cf12a423aae3ec1a17c1067191b8686 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 28 May 2015 14:50:05 +0200 Subject: debian/roll-tarball.sh: Auto-generate ChangeLog from Git history. --- debian/roll-tarballs.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index 07e052268..ecaeac2e0 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -72,6 +72,7 @@ trap "rm -f \"${MANIFEST}\"; rm -rf \"${TEMP_DIR}\"" 0 # create local copy of Git project at temp location git archive --format=tar "${CHECKOUT}" --prefix="${PROJECT}-${RELEASE}/" | ( cd "$TEMP_DIR"; tar xf - ) +git --no-pager log --after "1972-01-01" --format="%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%d%n" > "${TEMP_DIR}/${PROJECT}-${RELEASE}/ChangeLog" echo "Created tarball for $CHECKOUT" -- cgit v1.2.3