aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-03 05:04:38 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-03 05:04:38 +0100
commit21398f37754e68dc88d8c157cddd95eca9ec3c9e (patch)
treeafab47300fbbdfae7e2e1636cd1bd987a4e937b3 /debian
parentb992fdaa0f0789e4e1db6d121cfff979210dcb52 (diff)
parentf8fa7cb1993e56f47f2f919c2dcbef86e960e6a2 (diff)
downloadnx-libs-21398f37754e68dc88d8c157cddd95eca9ec3c9e.tar.gz
nx-libs-21398f37754e68dc88d8c157cddd95eca9ec3c9e.tar.bz2
nx-libs-21398f37754e68dc88d8c157cddd95eca9ec3c9e.zip
Merge pull request #1 from uli42/x2go
Only apply patches listed in debian/patches/series.
Diffstat (limited to 'debian')
-rwxr-xr-xdebian/roll-tarballs.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh
index 9b63529f7..b8db6c618 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