[X2go-Commits] nx-libs.git - master (branch) updated: nxproxy/3.5.0-1-178-gb494b52

X2go dev team git-admin at x2go.org
Sat Dec 31 18:30:06 CET 2011


The branch, master has been updated
       via  b494b528745c741d230e877098f5c191910cdcaa (commit)
      from  2fe05f6adf04c394228b03f37920c60a7ed80ff8 (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 b494b528745c741d230e877098f5c191910cdcaa
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Dec 31 18:29:56 2011 +0100

    Revert "Fix linking of doc folders for nxcomp*-dev."
    
    This reverts commit 608bbb6d9e6d978a12dff1d22bca9a58c6c63e2f.
    
    Conflicts:
    
    	debian/changelog

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

Summary of changes:
 debian/changelog              |    1 -
 debian/libxcomp-dev.links     |    2 +-
 debian/libxcompext-dev.links  |    2 +-
 debian/libxcompshad-dev.links |    2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index efcdc66..51f6bc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -73,7 +73,6 @@ nx-libs (2:3.5.0-2) UNRELEASED; urgency=low
   * Remove patch: 104_nxagent_enable_debug.patch, as it breaks package build.
   * Add patch headers to all patch files, report most patches upstream. Waiting for
     feedback and quotable URLs from NoMachine.
-  * Fix linking of doc folders for nxcomp*-dev.
   * Transfer patch: 009_nxproxy_add-man-page.patch into man page file
     in /debian/man.
   * Add patch: 011_nxcomp_sa-restorer.patch.
diff --git a/debian/libxcomp-dev.links b/debian/libxcomp-dev.links
index 85dd7d7..ed40e89 100644
--- a/debian/libxcomp-dev.links
+++ b/debian/libxcomp-dev.links
@@ -1 +1 @@
-usr/share/doc/libxcomp3 usr/share/doc/libxcomp-dev
+usr/share/doc/libxcomp3 usr/share/doc/libxcomp3-dev
diff --git a/debian/libxcompext-dev.links b/debian/libxcompext-dev.links
index 9d513e9..2346289 100644
--- a/debian/libxcompext-dev.links
+++ b/debian/libxcompext-dev.links
@@ -1 +1 @@
-usr/share/doc/libxcompext3 usr/share/doc/libxcompext-dev
+usr/share/doc/libxcompext3 usr/share/doc/libxcompext3-dev
diff --git a/debian/libxcompshad-dev.links b/debian/libxcompshad-dev.links
index 32701d2..adeb7ec 100644
--- a/debian/libxcompshad-dev.links
+++ b/debian/libxcompshad-dev.links
@@ -1,2 +1,2 @@
-usr/share/doc/libxcompshad3 usr/share/doc/libxcompshad-dev
+usr/share/doc/libxcompshad3 usr/share/doc/libxcompshad3-dev
 


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

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 libraries).




More information about the x2go-commits mailing list