[X2go-Commits] nxcompshad.git - build-main (branch) updated: 3.4.0.4-9-g206dbbc

[X2go dev team]

The branch, build-main has been updated
       via  206dbbcb89c8fe99807f7d716d55efcbc2512f77 (commit)
       via  75ca06520cec411eb079b2bb81336e50bdc64e7d (commit)
       via  e0c24c7d40918090ffa5094a396c3ca660db20a1 (commit)
       via  654dbf053c060043dcac953a0007a8f8495a622f (commit)
       via  62ed93b79d2e3880f6f837ecf9a4f033cd26bda5 (commit)
      from  15da210f5b7229481a08351174fa62fec0e540e7 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 Makefile.in      |    4 ++--
 debian/changelog |    2 ++
 debian/control   |   12 ++++++++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/Makefile.in b/Makefile.in
index 3e5df7d..e93c896 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -195,7 +195,7 @@ install.lib: all
 	$(INSTALL_LINK) libXcompshad.so         $(DESTDIR)$(prefix)/lib
 	$(INSTALL_DATA) *.a                     $(DESTDIR)$(prefix)/lib/nx
 	$(INSTALL_DATA) *.h                     $(DESTDIR)$(prefix)/include/nx
-	echo "Running ldconfig tool, this may take a while..." && ldconfig
+	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
 
 install.man:
 
@@ -211,7 +211,7 @@ uninstall.lib:
 	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
+	echo "Running ldconfig tool, this may take a while..." && ldconfig || true
 
 uninstall.man:
 
diff --git a/debian/changelog b/debian/changelog
index 59f25ce..9325ded 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 nxcompshad (3.5.0-2-0~x2go2) UNRELEASED; urgency=low
 
   * Add dh-autoreconf as build-dep
+  * Don't let the Makefile run fail on ldconfig failure.
+  * Breaks/replaces package nxcompshad.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 30 Jun 2011 17:51:34 +0200
 
diff --git a/debian/control b/debian/control
index 457dd53..73b7eff 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,11 @@ Vcs-Browser: http://code.x2go.org/gitweb?p=nxcompshad.git;a=summary
 Package: libxcompshad3
 Section: x11
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends}
+Breaks: nxcompshad
+Replaces: nxcompshad
 Description: NX shadowing library
  NX is a software suite from NoMachine which implements very efficient
  compression of the X11 protocol. This increases performance when
@@ -31,7 +35,11 @@ Description: NX shadowing library
 Package: libxcompshad-dev
 Section: libdevel
 Architecture: any
-Depends: libxcompshad3 (=${binary:Version}), ${misc:Depends}
+Depends:
+ libxcompshad3 (=${binary:Version}),
+ ${misc:Depends}
+Breaks: nxcompshad-dev
+Replaces: nxcompshad-dev
 Description: NX shadowing library
  NX is a software suite from NoMachine which implements very efficient
  compression of the X11 protocol. This increases performance when


hooks/post-receive
-- 
nxcompshad.git (NX compshad 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 "nxcompshad.git" (NX compshad library).