aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2011-11-19 17:40:33 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2011-11-19 17:40:33 +0100
commit1234d1b898a0d8862595ad4cc58bcfbd0fbead1b (patch)
treef45cb57db903831a607f856b214b7ae0b05f1f06 /debian
parent85be77cb3987999186be52686043c3f666d168dc (diff)
downloadnx-libs-1234d1b898a0d8862595ad4cc58bcfbd0fbead1b.tar.gz
nx-libs-1234d1b898a0d8862595ad4cc58bcfbd0fbead1b.tar.bz2
nx-libs-1234d1b898a0d8862595ad4cc58bcfbd0fbead1b.zip
Add patch: 004_nx-x11-fix-nxcompshad-build.patch.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/004_nx-x11-fix-nxcompshad-build.patch11
-rw-r--r--debian/patches/series1
3 files changed, 13 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index cd4504025..b52f854c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,5 +6,6 @@ nx-libs (2:3.5.0-0~x2go1) UNRELEASED; urgency=low
* Add main Makefile via patch: 001_add-main-makefile.patch.
* Add patch: 002_nxcompshad-build-against-nx-x11-only.patch
* Add patch: 003_nxcompshad-gcc43.patch
+ * Add patch: 004_nx-x11-fix-nxcompshad-build.patch.
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 14 Oct 2011 03:01:39 +0200
diff --git a/debian/patches/004_nx-x11-fix-nxcompshad-build.patch b/debian/patches/004_nx-x11-fix-nxcompshad-build.patch
new file mode 100644
index 000000000..386dfef2e
--- /dev/null
+++ b/debian/patches/004_nx-x11-fix-nxcompshad-build.patch
@@ -0,0 +1,11 @@
+--- a/nx-X11/programs/Xserver/Imakefile
++++ b/nx-X11/programs/Xserver/Imakefile
+@@ -1047,7 +1047,7 @@
+ #else
+ $(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET)
+ cd $(NX_XSHADOWLIBDIR) && \
+- make
++ rm -f *.o && make
+ #endif
+
+ ServerTarget(nxagent,$(NX_XSHADOWLIBTARGET) $(NXAGENTDIRS),$(NXAGENTOBJS), \
diff --git a/debian/patches/series b/debian/patches/series
index 615573a8c..38a604183 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
001_add-main-makefile.patch
002_nxcompshad-build-against-nx-x11-only.patch
003_nxcompshad-gcc43.patch
+004_nx-x11-fix-nxcompshad-build.patch