aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2011-12-31 18:29:56 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2011-12-31 18:29:56 +0100
commitb494b528745c741d230e877098f5c191910cdcaa (patch)
treeba82cf0fedfd59ef6f87d1a9a7714a8b7fd60438
parent2fe05f6adf04c394228b03f37920c60a7ed80ff8 (diff)
downloadnx-libs-b494b528745c741d230e877098f5c191910cdcaa.tar.gz
nx-libs-b494b528745c741d230e877098f5c191910cdcaa.tar.bz2
nx-libs-b494b528745c741d230e877098f5c191910cdcaa.zip
Revert "Fix linking of doc folders for nxcomp*-dev."
This reverts commit 608bbb6d9e6d978a12dff1d22bca9a58c6c63e2f. Conflicts: debian/changelog
-rw-r--r--debian/changelog1
-rw-r--r--debian/libxcomp-dev.links2
-rw-r--r--debian/libxcompext-dev.links2
-rw-r--r--debian/libxcompshad-dev.links2
4 files changed, 3 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index efcdc661e..51f6bc49c 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 85dd7d7d7..ed40e8980 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 9d513e9d6..2346289d9 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 32701d22d..adeb7ecb5 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