diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-10-05 14:37:20 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-10-05 14:37:20 +0200 |
| commit | fbb3ba912eac86753514da2175a14d8616ff91df (patch) | |
| tree | 8dc6bdad0c6da71e21a1f19327b4917bee8bbc21 | |
| parent | cd631e0bcdb50f95f7e7e42d3741f68579889140 (diff) | |
| download | nx-libs-fbb3ba912eac86753514da2175a14d8616ff91df.tar.gz nx-libs-fbb3ba912eac86753514da2175a14d8616ff91df.tar.bz2 nx-libs-fbb3ba912eac86753514da2175a14d8616ff91df.zip | |
Modify patch: 032_no-x11r6.full.patch. Install nx-X11 to /usr/local/lib/nx. Add patch: 032_no-x11r6.debian.patch. Use /usr/lib/nx for nx-X11 on Debian.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/032_no-x11r6.debian.patch | 11 | ||||
| -rw-r--r-- | debian/patches/032_no-x11r6.full.patch | 2 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
4 files changed, 15 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 12af2108f..65fc3c7b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ nx-libs (2:3.5.0.16-0) UNRELEASED; urgency=low * Fix installation of header files in Debian package. * Fix patch file names concerning component nx-X11. + * Modify patch: 032_no-x11r6.full.patch. Install nx-X11 to /usr/local/lib/nx. + * Add patch: 032_no-x11r6.debian.patch. Use /usr/lib/nx for nx-X11 on Debian. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 21 Sep 2012 10:06:54 +0200 diff --git a/debian/patches/032_no-x11r6.debian.patch b/debian/patches/032_no-x11r6.debian.patch new file mode 100644 index 000000000..09cbf4f37 --- /dev/null +++ b/debian/patches/032_no-x11r6.debian.patch @@ -0,0 +1,11 @@ +--- a/nx-X11/config/cf/site.def ++++ b/nx-X11/config/cf/site.def +@@ -72,7 +72,7 @@ + #ifdef AfterVendorCF + + #ifndef ProjectRoot +-#define ProjectRoot /usr/local/lib/nx ++#define ProjectRoot /usr/lib/nx + #endif + + /* diff --git a/debian/patches/032_no-x11r6.full.patch b/debian/patches/032_no-x11r6.full.patch index 97ce88c51..fff06e820 100644 --- a/debian/patches/032_no-x11r6.full.patch +++ b/debian/patches/032_no-x11r6.full.patch @@ -18,7 +18,7 @@ Index: nx-X11/config/cf/site.def #ifndef ProjectRoot -#define ProjectRoot /usr/X11R6 -+#define ProjectRoot /usr/lib/NX3 ++#define ProjectRoot /usr/local/lib/nx #endif /* diff --git a/debian/patches/series b/debian/patches/series index 235a41fe4..3130888fb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -48,3 +48,4 @@ 999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch 016_nx-X11_install-location.debian.patch 102_xserver-xext_set-securitypolicy-path.debian.patch +032_no-x11r6.debian.patch |