[X2Go-Commits] nx-libs.git - build-baikal (branch) updated: redist-client/3.5.0.15-4-gfbb3ba9
X2Go dev team
git-admin at x2go.org
Fri Aug 30 16:25:33 CEST 2013
The branch, build-baikal has been updated
via fbb3ba912eac86753514da2175a14d8616ff91df (commit)
from cd631e0bcdb50f95f7e7e42d3741f68579889140 (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:
debian/changelog | 2 ++
debian/patches/032_no-x11r6.debian.patch | 11 +++++++++++
debian/patches/032_no-x11r6.full.patch | 2 +-
debian/patches/series | 1 +
4 files changed, 15 insertions(+), 1 deletion(-)
create mode 100644 debian/patches/032_no-x11r6.debian.patch
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 12af210..65fc3c7 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 at 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 0000000..09cbf4f
--- /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 97ce88c..fff06e8 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 235a41f..3130888 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
hooks/post-receive
--
nx-libs.git (NX (redistributed))
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 (redistributed)).
More information about the x2go-commits
mailing list