aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2014-11-13 21:38:24 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2014-11-13 21:38:24 +0100
commit6f59493da91642c030a319d4899c260b254f8ffc (patch)
tree008ba502f9b1ae65a8240c3a92702a8d0b284f88
parentd1f040121c5e2452ca2e8f76fe3ff5256188e6f8 (diff)
downloadnx-libs-6f59493da91642c030a319d4899c260b254f8ffc.tar.gz
nx-libs-6f59493da91642c030a319d4899c260b254f8ffc.tar.bz2
nx-libs-6f59493da91642c030a319d4899c260b254f8ffc.zip
Revert "401_nxcomp_bigrequests.full+lite.patch: PATCH DISABLED FOR NOW, IT CAUSES NXPROXY CRASHES EVERY 1-2 minutes."
This reverts commit d505944e064f54c82c8bc66943238b49db05d37f.
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/series2
2 files changed, 1 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index b716f974c..606931192 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,7 +15,6 @@ nx-libs (2:3.5.0.28-0x2go1) UNRELEASED; urgency=medium
nx-libs-full tarball release.
* Add 401_nxcomp_big-requests.full+lite.patch. Support usage of the
BIG-REQUESTS X11 extension on the server-side. (See Debian bug #766299).
- (PATCH DISABLED FOR NOW, IT CAUSES NXPROXY CRASHES EVERY 1-2 minutes).
* debian/libnx-x11.postinst:
+ Don't use dpkg-architecture (bin:package dpkg-dev) in postinst script.
Instead prep a libnx-x11.postinst script at build time. (Fixes:
diff --git a/debian/patches/series b/debian/patches/series
index 4e792a27c..899fde99f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -62,7 +62,7 @@
302_nx-X11_xkbbasedir-detection.full.patch
320_nxagent_configurable-keystrokes.full.patch
400_nxcomp-version.full+lite.patch
-#401_nxcomp_big-requests.full+lite.patch
+401_nxcomp_big-requests.full+lite.patch
600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch
601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch
602_nx-X11_initgroups.full.patch