[X2go-Commits] nx-libs.git - master (branch) updated: redist-client/3.5.0.10-28-gc26e4bd

X2go dev team git-admin at x2go.org
Wed Feb 15 09:42:41 CET 2012


The branch, master has been updated
       via  c26e4bd825826462fc73242f94369555ae0f44fe (commit)
      from  b99168fc3f8b45a38d6efb370463ad71695cb3f9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c26e4bd825826462fc73242f94369555ae0f44fe
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Feb 15 09:42:35 2012 +0100

    Update patches: 012_nxcomp..., 013_nxcompext_..., 014_nxcompshad_.... Also make use of $(LIBFULL) in Makefile.in's install and uninstall stanzas. Inspired by Jan Engelhardt's so-version.diff patch. However, the version name change requested in that patch has been rejected for NX (redistributed).

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |    5 +++++
 ...omp_makefile-uninstall+autoconf.full+lite.patch |    4 ++--
 ...xcompext_makefile-uninstall+autoconf.full.patch |    8 +++++---
 ...compshad_makefile-uninstall+autoconf.full.patch |    4 ++--
 4 files changed, 14 insertions(+), 7 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 40d26e4..3139119 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,11 @@ nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low
   * Make patch headers DEP5 compliant (030_nx-X11_... and 031_nx-X11_...).
   * Update patch: 001_add-main-makefile.full+lite.patch, fix missing
     $(CONFIGURE) variable.
+  * Update patches: 012_nxcomp..., 013_nxcompext_..., 014_nxcompshad_....
+    Also make use of $(LIBFULL) in Makefile.in's install and uninstall stanzas.
+    Inspired by Jan Engelhardt's so-version.diff patch. However, the version
+    name change requested in that patch has been rejected for
+    NX (redistributed).
 
   [ Jan Engelhardt ]
   * Update patch: 001_add-main-makefile.full+lite.patch, allow passing of
diff --git a/debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch b/debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch
index fbeaa39..9b9da7e 100644
--- a/debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch
+++ b/debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch
@@ -38,7 +38,7 @@ Last-Update: 2012-02-14
 +install.lib: all
 +	./mkinstalldirs $(DESTDIR)${libdir}/nx
 +	./mkinstalldirs $(DESTDIR)${includedir}/nx
-+	$(INSTALL_DATA) libXcomp.so.3.*         $(DESTDIR)${libdir}/nx
++	$(INSTALL_DATA) $(LIBFULL)              $(DESTDIR)${libdir}/nx
 +	$(INSTALL_LINK) libXcomp.so.3           $(DESTDIR)${libdir}/nx
 +	$(INSTALL_LINK) libXcomp.so             $(DESTDIR)${libdir}/nx
 +	$(INSTALL_DATA) libXcomp.a              $(DESTDIR)${libdir}/nx
@@ -53,7 +53,7 @@ Last-Update: 2012-02-14
 +uninstall.bin:
 +
 +uninstall.lib:
-+	$(RM_FILE) $(DESTDIR)${libdir}/nx/libXcomp.so.3.*
++	$(RM_FILE) $(DESTDIR)${libdir}/nx/$(LIBFULL)
 +	$(RM_FILE) $(DESTDIR)${libdir}/nx/libXcomp.so.3
 +	$(RM_FILE) $(DESTDIR)${libdir}/nx/libXcomp.so
 +	$(RM_FILE) $(DESTDIR)${libdir}/nx/libXcomp.a
diff --git a/debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch b/debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch
index 934973c..f6c522a 100644
--- a/debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch
+++ b/debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch
@@ -27,7 +27,7 @@ Last-Update: 2012-02-14
  #
  # This should be autodetected.
  #
-@@ -147,12 +151,33 @@
+@@ -147,12 +151,35 @@
  		fi
  		touch depend.status
  
@@ -39,7 +39,8 @@ Last-Update: 2012-02-14
 +install.lib: all
 +	./mkinstalldirs $(DESTDIR)${libdir}/nx
 +	./mkinstalldirs $(DESTDIR)${includedir}/nx
-+	$(INSTALL_DATA) libXcompext.so.*        $(DESTDIR)${libdir}/nx
++	$(INSTALL_DATA) $(LIBFULL)              $(DESTDIR)${libdir}/nx
++	$(INSTALL_DATA) libXcompext.so.3	$(DESTDIR)${libdir}/nx
 +	$(INSTALL_LINK) libXcompext.so          $(DESTDIR)${libdir}/nx
 +	$(INSTALL_DATA) NX*.h                   $(DESTDIR)${includedir}/nx
 +	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
@@ -51,7 +52,8 @@ Last-Update: 2012-02-14
 +uninstall.bin:
 +
 +uninstall.lib:
-+	$(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompext.so.*
++	$(RM_FILE) $(DESTDIR)${libdir}/nx/$(LIBFULL)
++	$(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompext.so.3
 +	$(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompext.so
 +	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXlib.h
 +	$(RM_FILE) $(DESTDIR)${includedir}/nx/NXlibint.h
diff --git a/debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch b/debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch
index d1a8c1e..0577635 100644
--- a/debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch
+++ b/debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch
@@ -40,7 +40,7 @@ Last-Update: 2012-02-14
 +install.lib: all
 +	$(INSTALL_DIR)                          $(DESTDIR)${libdir}/nx
 +	$(INSTALL_DIR)                          $(DESTDIR)${includedir}/nx
-+	$(INSTALL_DATA) libXcompshad.so.3.*     $(DESTDIR)${libdir}/nx
++	$(INSTALL_DATA) $(LIBFULL)              $(DESTDIR)${libdir}/nx
 +	$(INSTALL_LINK) libXcompshad.so.3       $(DESTDIR)${libdir}/nx
 +	$(INSTALL_LINK) libXcompshad.so         $(DESTDIR)${libdir}/nx
 +	$(INSTALL_DATA) *.a                     $(DESTDIR)${libdir}/nx
@@ -54,7 +54,7 @@ Last-Update: 2012-02-14
 +uninstall.bin:
 +
 +uninstall.lib:
-+	$(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompshad.so.3.*
++	$(RM_FILE) $(DESTDIR)${libdir}/nx/$(LIBFULL)
 +	$(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompshad.so.3
 +	$(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompshad.so
 +	$(RM_FILE) $(DESTDIR)${libdir}/nx/libXcompshad.a


hooks/post-receive
-- 
nx-libs.git (NX (redistributed))

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nx-libs.git" (NX (redistributed)).




More information about the x2go-commits mailing list