aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2015-02-01 22:27:06 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-13 06:33:08 +0100
commit08114b1e41f4128cd753217bdb4e037d4be64140 (patch)
treec85269dcd4f0cc5d4be5ebcffd5236995a579288
parentfa8fb728824ab71cf578b1463e0daddc601f5fc8 (diff)
downloadnx-libs-08114b1e41f4128cd753217bdb4e037d4be64140.tar.gz
nx-libs-08114b1e41f4128cd753217bdb4e037d4be64140.tar.bz2
nx-libs-08114b1e41f4128cd753217bdb4e037d4be64140.zip
Fix patch rollout in tarball
-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 a8d3cf63f..3ff7667f7 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