78 files changed, 96 insertions, 92 deletions
diff --git a/debian/changelog b/debian/changelog
index 6ce69dbc5..e88feca54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,26 +1,26 @@
 nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium
 
   [ Paul Szabo ]
-  * DISABLED:401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch.
+  * DISABLED:0401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch.
     Enable support for the X11 big requests extension and the generic events
     extension.
 
   [ Mike Gabriel ]
-  * Update 320_nxagent_configurable-keystrokes.full.patch. Fix patch header
+  * Update 0320_nxagent_configurable-keystrokes.full.patch. Fix patch header
     referring to keystrokes.cfg (plural), not keystroke.cfg.
   * Allow sysadmins to manipulate nxagent's / x2goagent's rgb file by placing
     it into /etc/nxagent or /etc/x2go.
   * Provide support for separate .keyboard files for nxagent/x2goagent.
-  * Modify 101_nxagent_set-rgb-path.full.patch. Allow configurable rgb files.
-  * Extend 999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch. Let rgb
+  * Modify 0101_nxagent_set-rgb-path.full.patch. Allow configurable rgb files.
+  * Extend 0999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch. Let rgb
     file shipped with x2goagent supersede rgb file shipped with nxagent.
     FIXME: a better approach would be to decide at runtime if to use
     /etc/x2go/rgb or /etc/nxagent/rgb.
-  * Extend 999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch. Allow
+  * Extend 0999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch. Allow
     separate .keyboard files for x2goagent and nxagent.
-  * Update 600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch. Don't
+  * Update 0600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch. Don't
     patch files that get removed during code reduction.
-  * Add 991_fix-hr-typos.full+lite.patch and 991_fix-hr-typos.full.patch.
+  * Add 0991_fix-hr-typos.full+lite.patch and 991_fix-hr-typos.full.patch.
     Fix several typos in upstream code detected by lintian.
   * Makefile.nx-libs: Don't allow symlinks to point into buildroot.
   * Makefile.nx-libs: Install man pages via main Makefile.
@@ -43,19 +43,23 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium
     - Makefile.nx-libs: Don't install Mesa header files into DESTDIR anymore.
     - Unify source tree reduction (debian/rules vs. roll-tarball.sh) via file/
       folder lists in text files named debian/CODE-REDUCTION_*.
-    - Update 991_fix-hr-typos.full.patch. Don't patch files that get removed by
+    - Update 0991_fix-hr-typos.full.patch. Don't patch files that get removed by
       the NX code reduction effort.
-    - Drop 604_nx-X11_recent-freetype-API.full.patch. Not used in current build
+    - Drop 0604_nx-X11_recent-freetype-API.full.patch. Not used in current build
       process.
-    - Update 600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch. Don't
+    - Update 0600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch. Don't
       patch files matter to the NX code reduction efforts.
-    - Update 031_nx-X11_parallel-make.full.patch. Don't patch .original files in
+    - Update 0031_nx-X11_parallel-make.full.patch. Don't patch .original files in
       NX code tree.
-    - Drop patches: 017_nx-X11_update-autotools-helper-files.full.patch,
-      018_nx-X11_update-libtool-ltmain-script.full.patch,
-      019_nx-X11_expat-build-against-system-libxmltok.full.patch. They patch files
+    - Drop patches: 0017_nx-X11_update-autotools-helper-files.full.patch,
+      0018_nx-X11_update-libtool-ltmain-script.full.patch,
+      0019_nx-X11_expat-build-against-system-libxmltok.full.patch. They patch files
       that are not used at build time.
 
+  * Patch system:
+    - Prepend a "0" to every patch file name in debian/patches/. Adapt only this
+      changelog stanza to this modification.
+
   * Debian/Ubuntu packaging:
     + Fully rework the way nx-libs gets packaged for Debian/Ubuntu.
     + Split up libnx-x11 into individual packages.
@@ -110,10 +114,10 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium
       x2goagent.keyboard).
 
   [ Horst Schirmeier ]
-  * Update 320_nxagent_configurable-keystrokes.full.patch. Fix a typo that
+  * Update 0320_nxagent_configurable-keystrokes.full.patch. Fix a typo that
     prevented the /etc/nxagent/keystrokes.cfg file from being parsed. (Fixes:
     #741).
-  * Add 321_nxagent_x2go-specific-keystroke-config.full.patch. If nxagent is
+  * Add 0321_nxagent_x2go-specific-keystroke-config.full.patch. If nxagent is
     launched as x2goagent, use X2Go-specific paths for the keystrokes.cfg file.
     (Fixes: #744).
 
diff --git a/debian/patches/000_add-NX-redistribution-README.full+lite.patch b/debian/patches/0000_add-NX-redistribution-README.full+lite.patch
index 3e1f2e878..3e1f2e878 100644
--- a/debian/patches/000_add-NX-redistribution-README.full+lite.patch
+++ b/debian/patches/0000_add-NX-redistribution-README.full+lite.patch
diff --git a/debian/patches/002_nxcompshad_build-against-nx-x11-only.full.patch b/debian/patches/0002_nxcompshad_build-against-nx-x11-only.full.patch
index 4e92c3b04..4e92c3b04 100644
--- a/debian/patches/002_nxcompshad_build-against-nx-x11-only.full.patch
+++ b/debian/patches/0002_nxcompshad_build-against-nx-x11-only.full.patch
diff --git a/debian/patches/003_nxcompshad_gcc43.full.patch b/debian/patches/0003_nxcompshad_gcc43.full.patch
index 165c30035..165c30035 100644
--- a/debian/patches/003_nxcompshad_gcc43.full.patch
+++ b/debian/patches/0003_nxcompshad_gcc43.full.patch
diff --git a/debian/patches/004_nx-X11_fix-nxcompshad-build.full.patch b/debian/patches/0004_nx-X11_fix-nxcompshad-build.full.patch
index f65fb7877..f65fb7877 100644
--- a/debian/patches/004_nx-X11_fix-nxcompshad-build.full.patch
+++ b/debian/patches/0004_nx-X11_fix-nxcompshad-build.full.patch
diff --git a/debian/patches/005_nxcomp_gcc43.full+lite.patch b/debian/patches/0005_nxcomp_gcc43.full+lite.patch
index bb758c2bd..bb758c2bd 100644
--- a/debian/patches/005_nxcomp_gcc43.full+lite.patch
+++ b/debian/patches/0005_nxcomp_gcc43.full+lite.patch
diff --git a/debian/patches/006_nxcomp_libpng15.full+lite.patch b/debian/patches/0006_nxcomp_libpng15.full+lite.patch
index a75c59bac..a75c59bac 100644
--- a/debian/patches/006_nxcomp_libpng15.full+lite.patch
+++ b/debian/patches/0006_nxcomp_libpng15.full+lite.patch
diff --git a/debian/patches/007_nxcompshad_clean-gch-files.full.patch b/debian/patches/0007_nxcompshad_clean-gch-files.full.patch
index 897e27890..897e27890 100644
--- a/debian/patches/007_nxcompshad_clean-gch-files.full.patch
+++ b/debian/patches/0007_nxcompshad_clean-gch-files.full.patch
diff --git a/debian/patches/008_nxcomp_sa-restorer.full+lite.patch b/debian/patches/0008_nxcomp_sa-restorer.full+lite.patch
index f1447ccb0..f1447ccb0 100644
--- a/debian/patches/008_nxcomp_sa-restorer.full+lite.patch
+++ b/debian/patches/0008_nxcomp_sa-restorer.full+lite.patch
diff --git a/debian/patches/009_nxagent_add-man-page.full.patch b/debian/patches/0009_nxagent_add-man-page.full.patch
index cec8c7527..cec8c7527 100644
--- a/debian/patches/009_nxagent_add-man-page.full.patch
+++ b/debian/patches/0009_nxagent_add-man-page.full.patch
diff --git a/debian/patches/009_nxproxy_add-man-page.full+lite.patch b/debian/patches/0009_nxproxy_add-man-page.full+lite.patch
index b60e218ee..b60e218ee 100644
--- a/debian/patches/009_nxproxy_add-man-page.full+lite.patch
+++ b/debian/patches/0009_nxproxy_add-man-page.full+lite.patch
diff --git a/debian/patches/010_nxauth_fix-binary-name-in-man-page.full.patch b/debian/patches/0010_nxauth_fix-binary-name-in-man-page.full.patch
index c8f76b51a..c8f76b51a 100644
--- a/debian/patches/010_nxauth_fix-binary-name-in-man-page.full.patch
+++ b/debian/patches/0010_nxauth_fix-binary-name-in-man-page.full.patch
diff --git a/debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch b/debian/patches/0012_nxcomp_makefile-uninstall+autoconf.full+lite.patch
index af778fefc..af778fefc 100644
--- a/debian/patches/012_nxcomp_makefile-uninstall+autoconf.full+lite.patch
+++ b/debian/patches/0012_nxcomp_makefile-uninstall+autoconf.full+lite.patch
diff --git a/debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch b/debian/patches/0013_nxcompext_makefile-uninstall+autoconf.full.patch
index 300c0a39e..300c0a39e 100644
--- a/debian/patches/013_nxcompext_makefile-uninstall+autoconf.full.patch
+++ b/debian/patches/0013_nxcompext_makefile-uninstall+autoconf.full.patch
diff --git a/debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch b/debian/patches/0014_nxcompshad_makefile-uninstall+autoconf.full.patch
index 921eccc4f..921eccc4f 100644
--- a/debian/patches/014_nxcompshad_makefile-uninstall+autoconf.full.patch
+++ b/debian/patches/0014_nxcompshad_makefile-uninstall+autoconf.full.patch
diff --git a/debian/patches/015_nxproxy_makefile-uninstall.full+lite.patch b/debian/patches/0015_nxproxy_makefile-uninstall.full+lite.patch
index 554c86aa4..554c86aa4 100644
--- a/debian/patches/015_nxproxy_makefile-uninstall.full+lite.patch
+++ b/debian/patches/0015_nxproxy_makefile-uninstall.full+lite.patch
diff --git a/debian/patches/016_nx-X11_install-location.debian.patch b/debian/patches/0016_nx-X11_install-location.debian.patch
index 94e2cb075..94e2cb075 100644
--- a/debian/patches/016_nx-X11_install-location.debian.patch
+++ b/debian/patches/0016_nx-X11_install-location.debian.patch
diff --git a/debian/patches/016_nx-X11_install-location.full.patch b/debian/patches/0016_nx-X11_install-location.full.patch
index 6571aea9e..6571aea9e 100644
--- a/debian/patches/016_nx-X11_install-location.full.patch
+++ b/debian/patches/0016_nx-X11_install-location.full.patch
diff --git a/debian/patches/024_fix-make-clean.full+lite.patch b/debian/patches/0024_fix-make-clean.full+lite.patch
index 7f0b327cf..7f0b327cf 100644
--- a/debian/patches/024_fix-make-clean.full+lite.patch
+++ b/debian/patches/0024_fix-make-clean.full+lite.patch
diff --git a/debian/patches/024_fix-make-clean.full.patch b/debian/patches/0024_fix-make-clean.full.patch
index 356ce47d8..356ce47d8 100644
--- a/debian/patches/024_fix-make-clean.full.patch
+++ b/debian/patches/0024_fix-make-clean.full.patch
diff --git a/debian/patches/025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch b/debian/patches/0025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch
index 66ca8c33e..66ca8c33e 100644
--- a/debian/patches/025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch
+++ b/debian/patches/0025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch
diff --git a/debian/patches/026_nxcomp_honour-optflags.full+lite.patch b/debian/patches/0026_nxcomp_honour-optflags.full+lite.patch
index a2713a1bc..a2713a1bc 100644
--- a/debian/patches/026_nxcomp_honour-optflags.full+lite.patch
+++ b/debian/patches/0026_nxcomp_honour-optflags.full+lite.patch
diff --git a/debian/patches/026_nxcompext_honour-optflags.full.patch b/debian/patches/0026_nxcompext_honour-optflags.full.patch
index 4d5df3e6b..4d5df3e6b 100644
--- a/debian/patches/026_nxcompext_honour-optflags.full.patch
+++ b/debian/patches/0026_nxcompext_honour-optflags.full.patch
diff --git a/debian/patches/026_nxcompshad_honour-optflags.full.patch b/debian/patches/0026_nxcompshad_honour-optflags.full.patch
index ea1d2ad80..ea1d2ad80 100644
--- a/debian/patches/026_nxcompshad_honour-optflags.full.patch
+++ b/debian/patches/0026_nxcompshad_honour-optflags.full.patch
diff --git a/debian/patches/027_nxcomp_abstract-X11-socket.full+lite.patch b/debian/patches/0027_nxcomp_abstract-X11-socket.full+lite.patch
index 4c457c5d5..4c457c5d5 100644
--- a/debian/patches/027_nxcomp_abstract-X11-socket.full+lite.patch
+++ b/debian/patches/0027_nxcomp_abstract-X11-socket.full+lite.patch
diff --git a/debian/patches/028_nx-X11_abstract-kernel-sockets.full.patch b/debian/patches/0028_nx-X11_abstract-kernel-sockets.full.patch
index 279f9a9af..279f9a9af 100644
--- a/debian/patches/028_nx-X11_abstract-kernel-sockets.full.patch
+++ b/debian/patches/0028_nx-X11_abstract-kernel-sockets.full.patch
diff --git a/debian/patches/029_nxcomp_ppc64.full+lite.patch b/debian/patches/0029_nxcomp_ppc64.full+lite.patch
index 9d454d5db..9d454d5db 100644
--- a/debian/patches/029_nxcomp_ppc64.full+lite.patch
+++ b/debian/patches/0029_nxcomp_ppc64.full+lite.patch
diff --git a/debian/patches/030_nx-X11_configure-args.full.patch b/debian/patches/0030_nx-X11_configure-args.full.patch
index 67184d330..67184d330 100644
--- a/debian/patches/030_nx-X11_configure-args.full.patch
+++ b/debian/patches/0030_nx-X11_configure-args.full.patch
diff --git a/debian/patches/031_nx-X11_parallel-make.full.patch b/debian/patches/0031_nx-X11_parallel-make.full.patch
index 496020545..496020545 100644
--- a/debian/patches/031_nx-X11_parallel-make.full.patch
+++ b/debian/patches/0031_nx-X11_parallel-make.full.patch
diff --git a/debian/patches/051_nxcomp_macos105-fdisset.full+lite.patch b/debian/patches/0051_nxcomp_macos105-fdisset.full+lite.patch
index 6b78a6bc2..6b78a6bc2 100644
--- a/debian/patches/051_nxcomp_macos105-fdisset.full+lite.patch
+++ b/debian/patches/0051_nxcomp_macos105-fdisset.full+lite.patch
diff --git a/debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch b/debian/patches/0052_nxcomp_macos10-nxauth-location.full+lite.patch
index 813363e69..813363e69 100644
--- a/debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch
+++ b/debian/patches/0052_nxcomp_macos10-nxauth-location.full+lite.patch
diff --git a/debian/patches/053_nx-X11_no-xcomp1-install-target.full.patch b/debian/patches/0053_nx-X11_no-xcomp1-install-target.full.patch
index acf9374e5..acf9374e5 100644
--- a/debian/patches/053_nx-X11_no-xcomp1-install-target.full.patch
+++ b/debian/patches/0053_nx-X11_no-xcomp1-install-target.full.patch
diff --git a/debian/patches/054_nx-X11_ppc64-ftbfs.full.patch b/debian/patches/0054_nx-X11_ppc64-ftbfs.full.patch
index d60426e91..d60426e91 100644
--- a/debian/patches/054_nx-X11_ppc64-ftbfs.full.patch
+++ b/debian/patches/0054_nx-X11_ppc64-ftbfs.full.patch
diff --git a/debian/patches/055_nx-X11_imake-Werror-format-security.full.patch b/debian/patches/0055_nx-X11_imake-Werror-format-security.full.patch
index 6e5b4c80e..6e5b4c80e 100644
--- a/debian/patches/055_nx-X11_imake-Werror-format-security.full.patch
+++ b/debian/patches/0055_nx-X11_imake-Werror-format-security.full.patch
diff --git a/debian/patches/056_nx-X11_Werror-format-security.full.patch b/debian/patches/0056_nx-X11_Werror-format-security.full.patch
index a047de774..a047de774 100644
--- a/debian/patches/056_nx-X11_Werror-format-security.full.patch
+++ b/debian/patches/0056_nx-X11_Werror-format-security.full.patch
diff --git a/debian/patches/057_nx-X11_sanitize-eventmasks.full.patch b/debian/patches/0057_nx-X11_sanitize-eventmasks.full.patch
index 9c1171712..9c1171712 100644
--- a/debian/patches/057_nx-X11_sanitize-eventmasks.full.patch
+++ b/debian/patches/0057_nx-X11_sanitize-eventmasks.full.patch
diff --git a/debian/patches/101_nxagent_set-rgb-path.full.patch b/debian/patches/0101_nxagent_set-rgb-path.full.patch
index 9d20bee24..9d20bee24 100644
--- a/debian/patches/101_nxagent_set-rgb-path.full.patch
+++ b/debian/patches/0101_nxagent_set-rgb-path.full.patch
diff --git a/debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch b/debian/patches/0102_xserver-xext_set-securitypolicy-path.debian.patch
index 0d11f2f0a..0d11f2f0a 100644
--- a/debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch
+++ b/debian/patches/0102_xserver-xext_set-securitypolicy-path.debian.patch
diff --git a/debian/patches/102_xserver-xext_set-securitypolicy-path.full.patch b/debian/patches/0102_xserver-xext_set-securitypolicy-path.full.patch
index 9d27a372f..9d27a372f 100644
--- a/debian/patches/102_xserver-xext_set-securitypolicy-path.full.patch
+++ b/debian/patches/0102_xserver-xext_set-securitypolicy-path.full.patch
diff --git a/debian/patches/103_nxagent_set-X0-config-path.full.patch b/debian/patches/0103_nxagent_set-X0-config-path.full.patch
index eb705ca81..eb705ca81 100644
--- a/debian/patches/103_nxagent_set-X0-config-path.full.patch
+++ b/debian/patches/0103_nxagent_set-X0-config-path.full.patch
diff --git a/debian/patches/105_nxagent_export-remote-keyboard-config.full.patch b/debian/patches/0105_nxagent_export-remote-keyboard-config.full.patch
index 389feaf92..389feaf92 100644
--- a/debian/patches/105_nxagent_export-remote-keyboard-config.full.patch
+++ b/debian/patches/0105_nxagent_export-remote-keyboard-config.full.patch
diff --git a/debian/patches/106_nxagent_utf8-copy-clipboard.full.patch b/debian/patches/0106_nxagent_utf8-copy-clipboard.full.patch
index 9c0a047d6..9c0a047d6 100644
--- a/debian/patches/106_nxagent_utf8-copy-clipboard.full.patch
+++ b/debian/patches/0106_nxagent_utf8-copy-clipboard.full.patch
diff --git a/debian/patches/107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch b/debian/patches/0107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch
index 129cb707e..129cb707e 100644
--- a/debian/patches/107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch
+++ b/debian/patches/0107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch
diff --git a/debian/patches/108_nxagent_wine-close-delay.full.patch b/debian/patches/0108_nxagent_wine-close-delay.full.patch
index 7a9c18cf2..7a9c18cf2 100644
--- a/debian/patches/108_nxagent_wine-close-delay.full.patch
+++ b/debian/patches/0108_nxagent_wine-close-delay.full.patch
diff --git a/debian/patches/110_nxagent_createpixmap-bounds-check.full.patch b/debian/patches/0110_nxagent_createpixmap-bounds-check.full.patch
index d65862bdc..d65862bdc 100644
--- a/debian/patches/110_nxagent_createpixmap-bounds-check.full.patch
+++ b/debian/patches/0110_nxagent_createpixmap-bounds-check.full.patch
diff --git a/debian/patches/200_nxagent_check-binary-x2go-flavour.full.patch b/debian/patches/0200_nxagent_check-binary-x2go-flavour.full.patch
index c69202088..c69202088 100644
--- a/debian/patches/200_nxagent_check-binary-x2go-flavour.full.patch
+++ b/debian/patches/0200_nxagent_check-binary-x2go-flavour.full.patch
diff --git a/debian/patches/201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch b/debian/patches/0201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch
index 48e4c4a4b..48e4c4a4b 100644
--- a/debian/patches/201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch
+++ b/debian/patches/0201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch
diff --git a/debian/patches/202_nx-X11_enable-xinerama.full.patch b/debian/patches/0202_nx-X11_enable-xinerama.full.patch
index 6845ec51e..6845ec51e 100644
--- a/debian/patches/202_nx-X11_enable-xinerama.full.patch
+++ b/debian/patches/0202_nx-X11_enable-xinerama.full.patch
diff --git a/debian/patches/203_nxagent_disable-rootless-exit.full.patch b/debian/patches/0203_nxagent_disable-rootless-exit.full.patch
index 74579f4d8..74579f4d8 100644
--- a/debian/patches/203_nxagent_disable-rootless-exit.full.patch
+++ b/debian/patches/0203_nxagent_disable-rootless-exit.full.patch
diff --git a/debian/patches/204_nxagent_repaint-solidpict.full.patch b/debian/patches/0204_nxagent_repaint-solidpict.full.patch
index 139a46ad3..139a46ad3 100644
--- a/debian/patches/204_nxagent_repaint-solidpict.full.patch
+++ b/debian/patches/0204_nxagent_repaint-solidpict.full.patch
diff --git a/debian/patches/205_nxagent_refresh-adsl.full.patch b/debian/patches/0205_nxagent_refresh-adsl.full.patch
index 4840ea7ce..4840ea7ce 100644
--- a/debian/patches/205_nxagent_refresh-adsl.full.patch
+++ b/debian/patches/0205_nxagent_refresh-adsl.full.patch
diff --git a/debian/patches/206_nxagent_clipboard-as-nxoption.full.patch b/debian/patches/0206_nxagent_clipboard-as-nxoption.full.patch
index 12b51dc0e..12b51dc0e 100644
--- a/debian/patches/206_nxagent_clipboard-as-nxoption.full.patch
+++ b/debian/patches/0206_nxagent_clipboard-as-nxoption.full.patch
diff --git a/debian/patches/207_nxagent_fix-xfixes-selection.full.patch b/debian/patches/0207_nxagent_fix-xfixes-selection.full.patch
index 712b36914..712b36914 100644
--- a/debian/patches/207_nxagent_fix-xfixes-selection.full.patch
+++ b/debian/patches/0207_nxagent_fix-xfixes-selection.full.patch
diff --git a/debian/patches/209_x2goagent_add-man-page.full.patch b/debian/patches/0209_x2goagent_add-man-page.full.patch
index 310fa87d6..310fa87d6 100644
--- a/debian/patches/209_x2goagent_add-man-page.full.patch
+++ b/debian/patches/0209_x2goagent_add-man-page.full.patch
diff --git a/debian/patches/210_nxagent_save_session_state.full.patch b/debian/patches/0210_nxagent_save_session_state.full.patch
index 223d0bc7a..223d0bc7a 100644
--- a/debian/patches/210_nxagent_save_session_state.full.patch
+++ b/debian/patches/0210_nxagent_save_session_state.full.patch
diff --git a/debian/patches/210_nxcomp_save_session_state.full+lite.patch b/debian/patches/0210_nxcomp_save_session_state.full+lite.patch
index 1ef4440d8..1ef4440d8 100644
--- a/debian/patches/210_nxcomp_save_session_state.full+lite.patch
+++ b/debian/patches/0210_nxcomp_save_session_state.full+lite.patch
diff --git a/debian/patches/211_nxcomp_set_default_options.full+lite.patch b/debian/patches/0211_nxcomp_set_default_options.full+lite.patch
index 7bd8a781d..7bd8a781d 100644
--- a/debian/patches/211_nxcomp_set_default_options.full+lite.patch
+++ b/debian/patches/0211_nxcomp_set_default_options.full+lite.patch
diff --git a/debian/patches/212_nxcomp_build-on-Android.full+lite.patch b/debian/patches/0212_nxcomp_build-on-Android.full+lite.patch
index 528d33b74..528d33b74 100644
--- a/debian/patches/212_nxcomp_build-on-Android.full+lite.patch
+++ b/debian/patches/0212_nxcomp_build-on-Android.full+lite.patch
diff --git a/debian/patches/220_nxproxy_bind-loopback-only.full+lite.patch b/debian/patches/0220_nxproxy_bind-loopback-only.full+lite.patch
index c65b85501..c65b85501 100644
--- a/debian/patches/220_nxproxy_bind-loopback-only.full+lite.patch
+++ b/debian/patches/0220_nxproxy_bind-loopback-only.full+lite.patch
diff --git a/debian/patches/300_nxagent_set-wm-class.full.patch b/debian/patches/0300_nxagent_set-wm-class.full.patch
index 70b1c9212..70b1c9212 100644
--- a/debian/patches/300_nxagent_set-wm-class.full.patch
+++ b/debian/patches/0300_nxagent_set-wm-class.full.patch
diff --git a/debian/patches/301_nx-X11_use-shared-libs.full.patch b/debian/patches/0301_nx-X11_use-shared-libs.full.patch
index 200147449..200147449 100644
--- a/debian/patches/301_nx-X11_use-shared-libs.full.patch
+++ b/debian/patches/0301_nx-X11_use-shared-libs.full.patch
diff --git a/debian/patches/302_nx-X11_xkbbasedir-detection.full.patch b/debian/patches/0302_nx-X11_xkbbasedir-detection.full.patch
index dac3d8a08..dac3d8a08 100644
--- a/debian/patches/302_nx-X11_xkbbasedir-detection.full.patch
+++ b/debian/patches/0302_nx-X11_xkbbasedir-detection.full.patch
diff --git a/debian/patches/320_nxagent_configurable-keystrokes.full.patch b/debian/patches/0320_nxagent_configurable-keystrokes.full.patch
index c799c8b93..c799c8b93 100644
--- a/debian/patches/320_nxagent_configurable-keystrokes.full.patch
+++ b/debian/patches/0320_nxagent_configurable-keystrokes.full.patch
diff --git a/debian/patches/321_nxagent_x2go-specific-keystroke-config.full.patch b/debian/patches/0321_nxagent_x2go-specific-keystroke-config.full.patch
index 795f10b76..795f10b76 100644
--- a/debian/patches/321_nxagent_x2go-specific-keystroke-config.full.patch
+++ b/debian/patches/0321_nxagent_x2go-specific-keystroke-config.full.patch
diff --git a/debian/patches/400_nxcomp-version.full+lite.patch b/debian/patches/0400_nxcomp-version.full+lite.patch
index 703cec823..703cec823 100644
--- a/debian/patches/400_nxcomp-version.full+lite.patch
+++ b/debian/patches/0400_nxcomp-version.full+lite.patch
diff --git a/debian/patches/401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch b/debian/patches/0401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch
index ab16864df..ab16864df 100644
--- a/debian/patches/401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch
+++ b/debian/patches/0401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch
diff --git a/debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch b/debian/patches/0600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch
index 7c21c6fe5..7c21c6fe5 100644
--- a/debian/patches/600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch
+++ b/debian/patches/0600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch
diff --git a/debian/patches/601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch b/debian/patches/0601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch
index dbb2e85b0..dbb2e85b0 100644
--- a/debian/patches/601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch
+++ b/debian/patches/0601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch
diff --git a/debian/patches/602_nx-X11_initgroups.full.patch b/debian/patches/0602_nx-X11_initgroups.full.patch
index 182b378dc..182b378dc 100644
--- a/debian/patches/602_nx-X11_initgroups.full.patch
+++ b/debian/patches/0602_nx-X11_initgroups.full.patch
diff --git a/debian/patches/603_nx-X11_compilation_warnings.full.patch b/debian/patches/0603_nx-X11_compilation_warnings.full.patch
index 3656461b6..3656461b6 100644
--- a/debian/patches/603_nx-X11_compilation_warnings.full.patch
+++ b/debian/patches/0603_nx-X11_compilation_warnings.full.patch
diff --git a/debian/patches/605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch b/debian/patches/0605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch
index 60f33ce3f..60f33ce3f 100644
--- a/debian/patches/605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch
+++ b/debian/patches/0605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch
diff --git a/debian/patches/606_nx-X11_build-on-aarch64.full.patch b/debian/patches/0606_nx-X11_build-on-aarch64.full.patch
index bda43399a..bda43399a 100644
--- a/debian/patches/606_nx-X11_build-on-aarch64.full.patch
+++ b/debian/patches/0606_nx-X11_build-on-aarch64.full.patch
diff --git a/debian/patches/607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch b/debian/patches/0607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch
index 535671fef..535671fef 100644
--- a/debian/patches/607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch
+++ b/debian/patches/0607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch
diff --git a/debian/patches/990_fix-DEBUG-and-TEST-builds.full.patch b/debian/patches/0990_fix-DEBUG-and-TEST-builds.full.patch
index 23c8508a2..23c8508a2 100644
--- a/debian/patches/990_fix-DEBUG-and-TEST-builds.full.patch
+++ b/debian/patches/0990_fix-DEBUG-and-TEST-builds.full.patch
diff --git a/debian/patches/991_fix-hr-typos.full+lite.patch b/debian/patches/0991_fix-hr-typos.full+lite.patch
index 4ff18462e..4ff18462e 100644
--- a/debian/patches/991_fix-hr-typos.full+lite.patch
+++ b/debian/patches/0991_fix-hr-typos.full+lite.patch
diff --git a/debian/patches/991_fix-hr-typos.full.patch b/debian/patches/0991_fix-hr-typos.full.patch
index 3836adf55..3836adf55 100644
--- a/debian/patches/991_fix-hr-typos.full.patch
+++ b/debian/patches/0991_fix-hr-typos.full.patch
diff --git a/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch b/debian/patches/0999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch
index 62c85cfb2..62c85cfb2 100644
--- a/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch
+++ b/debian/patches/0999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch
diff --git a/debian/patches/series b/debian/patches/series
index e6398bc19..efd6f2988 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,76 +1,76 @@
-000_add-NX-redistribution-README.full+lite.patch
-002_nxcompshad_build-against-nx-x11-only.full.patch
-003_nxcompshad_gcc43.full.patch
-004_nx-X11_fix-nxcompshad-build.full.patch
-005_nxcomp_gcc43.full+lite.patch
-006_nxcomp_libpng15.full+lite.patch
-007_nxcompshad_clean-gch-files.full.patch
-008_nxcomp_sa-restorer.full+lite.patch
-009_nxproxy_add-man-page.full+lite.patch
-009_nxagent_add-man-page.full.patch
-010_nxauth_fix-binary-name-in-man-page.full.patch
-012_nxcomp_makefile-uninstall+autoconf.full+lite.patch
-013_nxcompext_makefile-uninstall+autoconf.full.patch
-014_nxcompshad_makefile-uninstall+autoconf.full.patch
-015_nxproxy_makefile-uninstall.full+lite.patch
-016_nx-X11_install-location.full.patch
-024_fix-make-clean.full.patch
-024_fix-make-clean.full+lite.patch
-025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch
-026_nxcompext_honour-optflags.full.patch
-026_nxcomp_honour-optflags.full+lite.patch
-026_nxcompshad_honour-optflags.full.patch
-027_nxcomp_abstract-X11-socket.full+lite.patch
-028_nx-X11_abstract-kernel-sockets.full.patch
-029_nxcomp_ppc64.full+lite.patch
-030_nx-X11_configure-args.full.patch
-031_nx-X11_parallel-make.full.patch
-051_nxcomp_macos105-fdisset.full+lite.patch
-052_nxcomp_macos10-nxauth-location.full+lite.patch
-053_nx-X11_no-xcomp1-install-target.full.patch
-054_nx-X11_ppc64-ftbfs.full.patch
-055_nx-X11_imake-Werror-format-security.full.patch
-056_nx-X11_Werror-format-security.full.patch
-057_nx-X11_sanitize-eventmasks.full.patch
-101_nxagent_set-rgb-path.full.patch
-102_xserver-xext_set-securitypolicy-path.full.patch
-103_nxagent_set-X0-config-path.full.patch
-105_nxagent_export-remote-keyboard-config.full.patch
-106_nxagent_utf8-copy-clipboard.full.patch
-107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch
-108_nxagent_wine-close-delay.full.patch
-110_nxagent_createpixmap-bounds-check.full.patch
-200_nxagent_check-binary-x2go-flavour.full.patch
-201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch
-202_nx-X11_enable-xinerama.full.patch
-203_nxagent_disable-rootless-exit.full.patch
-204_nxagent_repaint-solidpict.full.patch
-205_nxagent_refresh-adsl.full.patch
-206_nxagent_clipboard-as-nxoption.full.patch
-207_nxagent_fix-xfixes-selection.full.patch
-209_x2goagent_add-man-page.full.patch
-210_nxagent_save_session_state.full.patch
-210_nxcomp_save_session_state.full+lite.patch
-211_nxcomp_set_default_options.full+lite.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.full.patch
-320_nxagent_configurable-keystrokes.full.patch
-321_nxagent_x2go-specific-keystroke-config.full.patch
-400_nxcomp-version.full+lite.patch
-#401_nxcomp_bigrequests-and-genericevent-extensions.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
-603_nx-X11_compilation_warnings.full.patch
-605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch
-606_nx-X11_build-on-aarch64.full.patch
-607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch
-990_fix-DEBUG-and-TEST-builds.full.patch
-991_fix-hr-typos.full+lite.patch
-991_fix-hr-typos.full.patch
-999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch
-016_nx-X11_install-location.debian.patch
-102_xserver-xext_set-securitypolicy-path.debian.patch
+0000_add-NX-redistribution-README.full+lite.patch
+0002_nxcompshad_build-against-nx-x11-only.full.patch
+0003_nxcompshad_gcc43.full.patch
+0004_nx-X11_fix-nxcompshad-build.full.patch
+0005_nxcomp_gcc43.full+lite.patch
+0006_nxcomp_libpng15.full+lite.patch
+0007_nxcompshad_clean-gch-files.full.patch
+0008_nxcomp_sa-restorer.full+lite.patch
+0009_nxproxy_add-man-page.full+lite.patch
+0009_nxagent_add-man-page.full.patch
+0010_nxauth_fix-binary-name-in-man-page.full.patch
+0012_nxcomp_makefile-uninstall+autoconf.full+lite.patch
+0013_nxcompext_makefile-uninstall+autoconf.full.patch
+0014_nxcompshad_makefile-uninstall+autoconf.full.patch
+0015_nxproxy_makefile-uninstall.full+lite.patch
+0016_nx-X11_install-location.full.patch
+0024_fix-make-clean.full.patch
+0024_fix-make-clean.full+lite.patch
+0025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch
+0026_nxcompext_honour-optflags.full.patch
+0026_nxcomp_honour-optflags.full+lite.patch
+0026_nxcompshad_honour-optflags.full.patch
+0027_nxcomp_abstract-X11-socket.full+lite.patch
+0028_nx-X11_abstract-kernel-sockets.full.patch
+0029_nxcomp_ppc64.full+lite.patch
+0030_nx-X11_configure-args.full.patch
+0031_nx-X11_parallel-make.full.patch
+0051_nxcomp_macos105-fdisset.full+lite.patch
+0052_nxcomp_macos10-nxauth-location.full+lite.patch
+0053_nx-X11_no-xcomp1-install-target.full.patch
+0054_nx-X11_ppc64-ftbfs.full.patch
+0055_nx-X11_imake-Werror-format-security.full.patch
+0056_nx-X11_Werror-format-security.full.patch
+0057_nx-X11_sanitize-eventmasks.full.patch
+0101_nxagent_set-rgb-path.full.patch
+0102_xserver-xext_set-securitypolicy-path.full.patch
+0103_nxagent_set-X0-config-path.full.patch
+0105_nxagent_export-remote-keyboard-config.full.patch
+0106_nxagent_utf8-copy-clipboard.full.patch
+0107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch
+0108_nxagent_wine-close-delay.full.patch
+0110_nxagent_createpixmap-bounds-check.full.patch
+0200_nxagent_check-binary-x2go-flavour.full.patch
+0201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch
+0202_nx-X11_enable-xinerama.full.patch
+0203_nxagent_disable-rootless-exit.full.patch
+0204_nxagent_repaint-solidpict.full.patch
+0205_nxagent_refresh-adsl.full.patch
+0206_nxagent_clipboard-as-nxoption.full.patch
+0207_nxagent_fix-xfixes-selection.full.patch
+0209_x2goagent_add-man-page.full.patch
+0210_nxagent_save_session_state.full.patch
+0210_nxcomp_save_session_state.full+lite.patch
+0211_nxcomp_set_default_options.full+lite.patch
+0212_nxcomp_build-on-Android.full+lite.patch
+0220_nxproxy_bind-loopback-only.full+lite.patch
+0300_nxagent_set-wm-class.full.patch
+0301_nx-X11_use-shared-libs.full.patch
+0302_nx-X11_xkbbasedir-detection.full.patch
+0320_nxagent_configurable-keystrokes.full.patch
+0321_nxagent_x2go-specific-keystroke-config.full.patch
+0400_nxcomp-version.full+lite.patch
+#0401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch
+0600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch
+0601_nx-X11_build-option-changes-to-not-use-bundled-libraries.full.patch
+0602_nx-X11_initgroups.full.patch
+0603_nx-X11_compilation_warnings.full.patch
+0605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch
+0606_nx-X11_build-on-aarch64.full.patch
+0607_nxcomp_macosx-X11-launcher-in-private-tmp.full+lite.patch
+0990_fix-DEBUG-and-TEST-builds.full.patch
+0991_fix-hr-typos.full+lite.patch
+0991_fix-hr-typos.full.patch
+0999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch
+0016_nx-X11_install-location.debian.patch
+0102_xserver-xext_set-securitypolicy-path.debian.patch