[X2Go-Commits] [nx-libs] 01/08: Fix patch rollout in tarball

git-admin at x2go.org git-admin at x2go.org
Tue Feb 3 05:11:22 CET 2015


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

x2go pushed a commit to branch master
in repository nx-libs.

commit f8fa7cb1993e56f47f2f919c2dcbef86e960e6a2
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Sun Feb 1 22:27:06 2015 +0100

    Fix patch rollout in tarball
---
 debian/roll-tarballs.sh |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh
index 9b63529..b8db6c6 100755
--- a/debian/roll-tarballs.sh
+++ b/debian/roll-tarballs.sh
@@ -82,9 +82,9 @@ mkdir -p doc/applied-patches
 
 # prepare patches for lite and full tarball
 if [ "x$MODE" = "xfull" ]; then
-    find debian/patches  | sort | egrep "(debian/patches/[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 $file doc/applied-patches
+        cp -v debian/patches/$file doc/applied-patches
         echo ${file##*/} >> doc/applied-patches/series
     done
     mkdir -p ./etc/
@@ -96,9 +96,9 @@ else
     rm -Rf "nxcompshad"*
     rm -Rf "nxcompext"*
     rm -Rf "nx-X11"*
-    find debian/patches | sort | egrep "(debian/patches/[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 $file doc/applied-patches
+        cp -v debian/patches/$file doc/applied-patches
         echo ${file##*/} >> doc/applied-patches/series
     done
 fi

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


More information about the x2go-commits mailing list