aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorOleksandr Shneyder <o.shneyder@phoca-gmbh.de>2014-06-27 10:52:52 +0200
committerOleksandr Shneyder <o.shneyder@phoca-gmbh.de>2014-06-27 10:52:52 +0200
commit92a0f58e85f79f96f9ad4ee04a8a82d7aac77294 (patch)
treeae0bf4f66ee692c46cf310040dfd3ecf4aacdb3d /debian
parent0cf283dca109ff29e18cd36fdbd2e51dadd52772 (diff)
downloadnx-libs-92a0f58e85f79f96f9ad4ee04a8a82d7aac77294.tar.gz
nx-libs-92a0f58e85f79f96f9ad4ee04a8a82d7aac77294.tar.bz2
nx-libs-92a0f58e85f79f96f9ad4ee04a8a82d7aac77294.zip
Rename Patches 210 and 211. Update series file.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/210_nxagent+nxcomp_save_session_state.full+lite.patch (renamed from debian/patches/210_nxagent_nxcomp_save_session_state.patch)0
-rw-r--r--debian/patches/211_nxcomp_set_default_options.full+lite.patch (renamed from debian/patches/211_nxcomp_set_default_options.patch)0
-rw-r--r--debian/patches/series4
4 files changed, 3 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 461c5a950..f9534c466 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -58,6 +58,7 @@ nx-libs (2:3.5.0.25-0x2go1) UNRELEASED; urgency=low
* Add 211_nxcomp_set_default_options.patch. Set default arguments for options
'link' and 'pack' to avoid session damage by resuming with incorrect options
file.
+ * Rename Patches 210 and 211. Update series file.
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 07 May 2014 09:58:10 +0200
diff --git a/debian/patches/210_nxagent_nxcomp_save_session_state.patch b/debian/patches/210_nxagent+nxcomp_save_session_state.full+lite.patch
index fa0284894..fa0284894 100644
--- a/debian/patches/210_nxagent_nxcomp_save_session_state.patch
+++ b/debian/patches/210_nxagent+nxcomp_save_session_state.full+lite.patch
diff --git a/debian/patches/211_nxcomp_set_default_options.patch b/debian/patches/211_nxcomp_set_default_options.full+lite.patch
index 9178fb5bf..9178fb5bf 100644
--- a/debian/patches/211_nxcomp_set_default_options.patch
+++ b/debian/patches/211_nxcomp_set_default_options.full+lite.patch
diff --git a/debian/patches/series b/debian/patches/series
index 733f49ce7..c3957f398 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -50,6 +50,8 @@
205_nxagent_refresh-adsl.full.patch
206_nxagent_clipboard-as-nxoption.full.patch
209_x2goagent_add-man-page.full.patch
+210_nxagent+nxcomp_save_session_state.full+lite.patch
+211_nxcomp_set_default_options.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
@@ -66,5 +68,3 @@
999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch
016_nx-X11_install-location.debian.patch
102_xserver-xext_set-securitypolicy-path.debian.patch
-210_nxagent_nxcomp_save_session_state.patch
-211_nxcomp_set_default_options.patch