[X2go-Commits] nxcompext.git - build-main (branch) updated: 3.4.0.2-7-g31d18d9

X2go dev team git-admin at x2go.org
Mon Jul 4 17:13:24 CEST 2011


The branch, build-main has been updated
       via  31d18d973420050a6360ac4f8f84926c00f3663d (commit)
       via  eec1bf88f8a3c55a90719e2a2d42570c4fc753d2 (commit)
       via  060b8367d27cf19309af042b6252338a022a74c5 (commit)
       via  5801077f3994d5fc372f30c56f9f75fb9bdae79b (commit)
      from  75a05a65fb014c9c058788dd242d633829b30ebc (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 31d18d973420050a6360ac4f8f84926c00f3663d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jul 4 17:13:14 2011 +0200

    Don't let the Makefile run fail on ldconfig failure.

commit eec1bf88f8a3c55a90719e2a2d42570c4fc753d2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jul 4 17:12:25 2011 +0200

    typo

commit 060b8367d27cf19309af042b6252338a022a74c5
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jul 4 17:11:32 2011 +0200

    not released yet...

commit 5801077f3994d5fc372f30c56f9f75fb9bdae79b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jul 4 17:11:11 2011 +0200

    Use mkinstalldirs to create installation dirs.

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

Summary of changes:
 Makefile.in      |    6 ++++--
 debian/changelog |    7 ++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/Makefile.in b/Makefile.in
index 6895876..99170b3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -156,10 +156,12 @@ install:       install.bin install.lib install.man
 install.bin:
 
 install.lib: all
+	./mkinstalldirs $(DESTDIR)$(prefix)/lib
+	./mkinstalldirs $(DESTDIR)$(prefix)/include
 	$(INSTALL_DATA) libXcompext.so.*        $(DESTDIR)$(prefix)/lib
 	$(INSTALL_LINK) libXcompext.so          $(DESTDIR)$(prefix)/lib
 	$(INSTALL_DATA) NX*.h                   $(DESTDIR)$(prefix)/include
-	echo "Running ldconfig tool, this may take a while..." && ldconfig
+	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
 
 install.man:
 
@@ -172,7 +174,7 @@ uninstall.lib:
 	$(RM_FILE) $(DESTDIR)$(prefix)/lib/libXcompext.so
 	$(RM_FILE) $(DESTDIR)$(prefix)/include/NXlib.h
 	$(RM_FILE) $(DESTDIR)$(prefix)/include/NXlibint.h
-	echo "Running ldconfig tool, this may take a while..." && ldconfig
+	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
 
 uninstall.man:
 
diff --git a/debian/changelog b/debian/changelog
index f8908d0..defc67e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
-nxcompext (1:3.5.0-1-0~x2go1) unstable; urgency=low
+nxcompext (1:3.5.0-1-0~x2go1) UNRELEASED; urgency=low
 
+  [ Reinhard Tartler ]
   * New upstream version
 
+  [ Mike Gabriel ]
+  * Use mkinstalldirs to create installation dirs.
+  * Don't let the Makefile run fail on ldconfig failure.
+
  -- Reinhard Tartler <siretart at tauware.de>  Wed, 29 Jun 2011 15:49:59 +0200
 
 nxcompext (1:3.4.0.2-0~x2go1) unstable; urgency=low


hooks/post-receive
-- 
nxcompext.git (NX compext library)

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 "nxcompext.git" (NX compext library).




More information about the x2go-commits mailing list