Commit 23fc7ee7 authored by Mike Gabriel's avatar Mike Gabriel

Allow patch files names having a dash next to the four digits (i.e., 1234-<patchname>.<suffix>).

parent a27a8aae
......@@ -182,6 +182,8 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low
* debian/roll-tarball.sh:
+ Make sure *.keyboard, debian/**, nx-libs.spec, .pc/** don't end up
in tarball (special focuse on the nx-libs-lite tarball).
+ Allow patch files names having a dash next to the four digits (i.e.,
1234-<patchname>.<suffix>).
* debian/COPYING.full+lite:
+ Replace content with GPL-2 license text, because that is the overall
(i.e., strictest) license we have to deal with in nx-libs.
......
......@@ -82,7 +82,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"
......@@ -96,7 +96,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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment