From 08114b1e41f4128cd753217bdb4e037d4be64140 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sun, 1 Feb 2015 22:27:06 +0100 Subject: 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 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 -- cgit v1.2.3