aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rw-r--r--debian/patches/212_nxcomp_build-on-Android.full+lite.patch (renamed from debian/patches/212_nxcomp_build-on-Android.patch)0
-rw-r--r--debian/patches/302_nx-X11_xkbbasedir-detection.full.patch (renamed from debian/patches/302_nx-X11_xkbbasedir-detection.patch)0
-rw-r--r--debian/patches/series4
4 files changed, 7 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 8d8bf1710..57498f1d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
nx-libs (2:3.5.0.26-0x2go1) UNRELEASED; urgency=medium
- * Continue development...
+ * Fix patch names:
+ + 212_nxcomp_build-on-Android.patch ->
+ 212_nxcomp_build-on-Android.full+lite.patch
+ + 302_nx-X11_xkbbasedir-detection.patch ->
+ 302_nx-X11_xkbbasedir-detection.full.patch
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 30 Jun 2014 14:24:42 +0200
diff --git a/debian/patches/212_nxcomp_build-on-Android.patch b/debian/patches/212_nxcomp_build-on-Android.full+lite.patch
index 528d33b74..528d33b74 100644
--- a/debian/patches/212_nxcomp_build-on-Android.patch
+++ b/debian/patches/212_nxcomp_build-on-Android.full+lite.patch
diff --git a/debian/patches/302_nx-X11_xkbbasedir-detection.patch b/debian/patches/302_nx-X11_xkbbasedir-detection.full.patch
index dac3d8a08..dac3d8a08 100644
--- a/debian/patches/302_nx-X11_xkbbasedir-detection.patch
+++ b/debian/patches/302_nx-X11_xkbbasedir-detection.full.patch
diff --git a/debian/patches/series b/debian/patches/series
index 5c3f659c8..a7634ba05 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -52,11 +52,11 @@
209_x2goagent_add-man-page.full.patch
210_nxagent+nxcomp_save_session_state.full+lite.patch
211_nxcomp_set_default_options.full+lite.patch
-212_nxcomp_build-on-Android.patch
+212_nxcomp_build-on-Android.full+lite.patch
220_nxproxy_bind-loopback-only.full+lite.patch
300_nxagent_set-wm-class.full.patch
301_nx-X11_use-shared-libs.full.patch
-302_nx-X11_xkbbasedir-detection.patch
+302_nx-X11_xkbbasedir-detection.full.patch
320_nxagent_configurable-keystrokes.full.patch
600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch
601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch