Add patches: 012, 013, 014 - Makefile uninstall stanza patches for nxcomp, nxcompext, nxcompshad.

5 files changed, 172 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 17e5b3028..2d63fc33b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,5 +24,7 @@ nx-libs (2:3.5.0-0~x2go1) UNRELEASED; urgency=low
   * Add patch: 011_add-nxauth-wrapper.patch.
   * Build nxauth package.
   * Add lintian overrides for libxcomp*: breaks-without-version.
+  * Add patches: 012, 013, 014 - Makefile uninstall stanza patches for
+    nxcomp, nxcompext, nxcompshad.
 
  -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Fri, 14 Oct 2011 03:01:39 +0200
diff --git a/debian/patches/012_nxcomp-makefile-uninstall.patch b/debian/patches/012_nxcomp-makefile-uninstall.patch
new file mode 100644
index 000000000..9545a5766
--- /dev/null
+++ b/debian/patches/012_nxcomp-makefile-uninstall.patch
@@ -0,0 +1,60 @@
+Index: nx-libs/nxcomp/Makefile.in
+===================================================================
+--- nx-libs.orig/nxcomp/Makefile.in	2011-12-05 09:16:34.000000000 +0100
++++ nx-libs/nxcomp/Makefile.in	2011-12-05 09:19:28.000000000 +0100
+@@ -68,6 +68,9 @@
+ INSTALL         = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA    = @INSTALL_DATA@
++INSTALL_LINK    = cp -av
++DESTDIR         =
++RM_FILE         = rm -f
+ 
+ #
+ # This should be autodetected.
+@@ -264,12 +267,44 @@
+ 		fi
+ 		touch depend.status
+ 
+-install:	install.bin install.man
++install:	install.bin install.lib install.man
+ 
+ install.bin:
+ 
++install.lib: all
++	./mkinstalldirs $(DESTDIR)$(prefix)/lib/nx
++	./mkinstalldirs $(DESTDIR)$(prefix)/include/nx
++	$(INSTALL_DATA) libXcomp.so.3.*         $(DESTDIR)$(prefix)/lib/nx
++	$(INSTALL_LINK) libXcomp.so.3           $(DESTDIR)$(prefix)/lib/nx
++	$(INSTALL_LINK) libXcomp.so             $(DESTDIR)$(prefix)/lib/nx
++	$(INSTALL_DATA) libXcomp.a              $(DESTDIR)$(prefix)/lib/nx
++	$(INSTALL_DATA) NX*.h                   $(DESTDIR)$(prefix)/include/nx
++	$(INSTALL_DATA) MD5.h                   $(DESTDIR)$(prefix)/include/nx
++	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
++
+ install.man:
+ 
++uninstall:	uninstall.bin uninstall.lib uninstall.man
++
++uninstall.bin:
++
++uninstall.lib:
++	$(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcomp.so.3.*
++	$(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcomp.so.3
++	$(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcomp.so
++	$(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcomp.a
++	$(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXalert.h
++	$(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NX.h
++	$(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXmitshm.h
++	$(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXpack.h
++	$(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXproto.h
++	$(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXrender.h
++	$(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXvars.h
++	$(RM_FILE) $(DESTDIR)$(prefix)/include/nx/MD5.h
++	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
++
++uninstall.man:
++
+ clean:
+ 		-rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* \
+ 		@ALL@
diff --git a/debian/patches/013_nxcompext-makefile-uninstall.patch b/debian/patches/013_nxcompext-makefile-uninstall.patch
new file mode 100644
index 000000000..f4002a565
--- /dev/null
+++ b/debian/patches/013_nxcompext-makefile-uninstall.patch
@@ -0,0 +1,50 @@
+Index: nx-libs/nxcompext/Makefile.in
+===================================================================
+--- nx-libs.orig/nxcompext/Makefile.in	2011-12-05 09:20:15.000000000 +0100
++++ nx-libs/nxcompext/Makefile.in	2011-12-05 09:24:37.000000000 +0100
+@@ -60,7 +60,9 @@
+ INSTALL         = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA    = @INSTALL_DATA@
+-
++INSTALL_LINK    = cp -av
++DESTDIR         =
++RM_FILE         = rm -f
+ #
+ # This should be autodetected.
+ #
+@@ -147,12 +149,33 @@
+ 		fi
+ 		touch depend.status
+ 
+-install:	install.bin install.man
++install:       install.bin install.lib install.man
+ 
+ install.bin:
+ 
++install.lib: all
++	./mkinstalldirs $(DESTDIR)$(prefix)/lib/nx
++	./mkinstalldirs $(DESTDIR)$(prefix)/include/nx
++	$(INSTALL_DATA) libXcompext.so.*        $(DESTDIR)$(prefix)/lib/nx
++	$(INSTALL_LINK) libXcompext.so          $(DESTDIR)$(prefix)/lib/nx
++	$(INSTALL_DATA) NX*.h                   $(DESTDIR)$(prefix)/include/nx
++	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
++
+ install.man:
+ 
++uninstall:     uninstall.bin uninstall.lib uninstall.man
++
++uninstall.bin:
++
++uninstall.lib:
++	$(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompext.so.*
++	$(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompext.so
++	$(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXlib.h
++	$(RM_FILE) $(DESTDIR)$(prefix)/include/nx/NXlibint.h
++	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
++
++uninstall.man:
++
+ clean:
+ 		-rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* \
+ 		@ALL@
diff --git a/debian/patches/014_nxcompshad-makefile-uninstall.patch b/debian/patches/014_nxcompshad-makefile-uninstall.patch
new file mode 100644
index 000000000..43dd17345
--- /dev/null
+++ b/debian/patches/014_nxcompshad-makefile-uninstall.patch
@@ -0,0 +1,56 @@
+--- a/nxcompshad/Makefile.in
++++ b/nxcompshad/Makefile.in
+@@ -76,8 +76,13 @@
+ VPATH       = @srcdir@
+ 
+ INSTALL         = @INSTALL@
++INSTALL_DIR     = $(INSTALL) -d -o root -g root -m 0755 
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA    = @INSTALL_DATA@
++INSTALL_LINK    = cp -av
++DESTDIR         =
++RM_FILE         = rm -f
++RM_DIR          = rmdir -p --ignore-fail-on-non-empty
+ 
+ #
+ # This should be autodetected.
+@@ -178,12 +183,38 @@
+ 		fi
+ 		touch depend.status
+ 
+-install:	install.bin install.man
++install:       install.bin install.lib install.man
+ 
+ install.bin:
+ 
++install.lib: all
++	$(INSTALL_DIR)                          $(DESTDIR)$(prefix)/lib/nx
++	$(INSTALL_DIR)                          $(DESTDIR)$(prefix)/include/nx
++	$(INSTALL_DATA) libXcompshad.so.3.*     $(DESTDIR)$(prefix)/lib/nx
++	$(INSTALL_LINK) libXcompshad.so.3       $(DESTDIR)$(prefix)/lib/nx
++	$(INSTALL_LINK) libXcompshad.so         $(DESTDIR)$(prefix)/lib/nx
++	$(INSTALL_DATA) *.a                     $(DESTDIR)$(prefix)/lib/nx
++	$(INSTALL_DATA) *.h                     $(DESTDIR)$(prefix)/include/nx
++	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
++
+ install.man:
+ 
++uninstall:     uninstall.bin uninstall.lib uninstall.man
++
++uninstall.bin:
++
++uninstall.lib:
++	$(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompshad.so.3.*
++	$(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompshad.so.3
++	$(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompshad.so
++	$(RM_FILE) $(DESTDIR)$(prefix)/lib/nx/libXcompshad.a
++	for header in *.h; do $(RM_FILE) $(DESTDIR)$(prefix)/include/nx/$$header; done
++	$(RM_DIR) $(DESTDIR)$(prefix)/lib/nx/
++	$(RM_DIR) $(DESTDIR)$(prefix)/include/nx/
++	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
++
++uninstall.man:
++
+ clean:
+ 		-rm -f *~ *.o *.gch *.bak st?????? core core.* *.out.* *.exe.stackdump \
+ 		$(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) $(LIBDLL) $(LIBDLLSTATIC) $(PROGRAM) $(PROGRAM).exe
diff --git a/debian/patches/series b/debian/patches/series
index 234b0c267..a6aa4921d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,7 @@
 009_nxproxy-add-man-page.patch
 010_nxauth-fix-binary-name-in-man-page.patch
 011_add-nxauth-wrapper.patch
+012_nxcomp-makefile-uninstall.patch
+013_nxcompext-makefile-uninstall.patch
+014_nxcompshad-makefile-uninstall.patch
+015_nxproxy-makefile-uninstall.patch