[X2Go-Dev] [PATCH 6/8] drop debian/patches/001_add-main-makefile.full+lite.patch

[Reinhard Tartler]

On Wed, Dec 12, 2012 at 1:34 PM, Mike Gabriel
<mike.gabriel at das-netzwerkteam.de> wrote:
> -1 from me!!! This will break the tarball generation. Note that we provide
> nx-libs to several other distros that have no clue about what the /debian
> folder is for.
>
> Such a patch is only ok, if you fix the tarball creator in nx-buildscripts
> (branch in nx-libs.git).

Well, that would require just an additional 'cp' command in this script, right?

diff --git a/bin/nx-tarballrelease b/bin/nx-tarballrelease
index 0465179..93bc143 100755
--- a/bin/nx-tarballrelease
+++ b/bin/nx-tarballrelease
@@ -62,6 +62,9 @@ if [ "x$RELEASE" != "xHEAD" ]; then
 	( set -e; cd "$TEMP_DIR/${PROJECT}-$RELEASE/" && git checkout $CHECKOUT; )
 fi

+# copy the top-level makefile
+( set -e; cd "$TEMP_DIR/${PROJECT}-$RELEASE/" && cp -v
debian/patches/Makefile.nx-libs Makefile
+
 # prepare patches for lite and full tarball
 if [ "x$MODE" = "xfull" ]; then
 	( set -e; cd "$TEMP_DIR/${PROJECT}-$RELEASE/" && mkdir -p
doc/applied-patches && find debian/patches | egrep
"(debian/patches/[0-9]+_.*\.(full|full\+lite)\.patch)" | while read
file; do cp -a $file doc/applied-patches; done)


-- 
regards,
    Reinhard