diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-05-28 13:28:33 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-05-28 14:18:36 +0200 |
| commit | 23fc7ee7e26068283cea71a6816fca2a4faf9829 (patch) | |
| tree | 1e96442b4dab1a5f8c22e20f97b017d3ccb3f012 | |
| parent | a27a8aae3ca7a3f70e05152ac3d347942e11159d (diff) | |
| download | nx-libs-23fc7ee7e26068283cea71a6816fca2a4faf9829.tar.gz nx-libs-23fc7ee7e26068283cea71a6816fca2a4faf9829.tar.bz2 nx-libs-23fc7ee7e26068283cea71a6816fca2a4faf9829.zip | |
Allow patch files names having a dash next to the four digits (i.e., 1234-<patchname>.<suffix>).
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rwxr-xr-x | debian/roll-tarballs.sh | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index df9348a0c..15dc5000b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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. diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index e5dd8e6b3..47b2b6b3e 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -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" |