aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2011-11-20 16:18:39 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2011-11-20 16:18:39 +0100
commite6fa2ca313e412ec89dc09a5219fcaa063fc50b2 (patch)
tree91bf749fe5f401811857044b5d036fe01d0cbc93
parentb3d3ea7d83bedd8a9ae62d8e8652fceda73a7331 (diff)
downloadnx-libs-e6fa2ca313e412ec89dc09a5219fcaa063fc50b2.tar.gz
nx-libs-e6fa2ca313e412ec89dc09a5219fcaa063fc50b2.tar.bz2
nx-libs-e6fa2ca313e412ec89dc09a5219fcaa063fc50b2.zip
Fix of nxproxy build in main Makefile (modifies 001_add-main-makefile.patch).
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/001_add-main-makefile.patch2
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 73f249f17..b98d79813 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,5 +18,7 @@ nx-libs (2:3.5.0-0~x2go1) UNRELEASED; urgency=low
* Add patch: 008_add-nxproxy-wrapper.patch. Build nxproxy package.
* Add patch: 009_nxproxy-add-man-page.patch.
* Add nxproxy man page to nxproxy package.
+ * Fix of nxproxy build in main Makefile (modifies
+ 001_add-main-makefile.patch).
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 14 Oct 2011 03:01:39 +0200
diff --git a/debian/patches/001_add-main-makefile.patch b/debian/patches/001_add-main-makefile.patch
index 02f8049d3..0f6c1b5a0 100644
--- a/debian/patches/001_add-main-makefile.patch
+++ b/debian/patches/001_add-main-makefile.patch
@@ -27,7 +27,7 @@
+ cd nxcompext && autoconf
+ cd nxcompshad && autoconf
+ cd nx-X11 && make World
-+ cd nxproxy && autoconf
++ cd nxproxy && autoconf && configure && make
+
+build-indep:
+