[X2Go-Commits] [nx-libs] 25/53: debian/roll-tarball.sh: Allow patch files names having a dash next to the four digits (i.e., 1234-<patchname>.<suffix>).

[git-admin at x2go.org]

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

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

commit 701471e8e464558a05ff99eeeeb7b886c1a7cefa
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu May 28 13:29:27 2015 +0200

    debian/roll-tarball.sh: Allow patch files names having a dash next to the four digits (i.e., 1234-<patchname>.<suffix>).
---
 debian/roll-tarballs.sh |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh
index 954986b..a060212 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"

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