41 files changed, 46 insertions, 39 deletions
diff --git a/debian/changelog b/debian/changelog
index 1e9f3a444..f1e90e2c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nx-libs (2:3.5.0.8-0) UNRELEASED; urgency=low
+
+  * Reorganize patch names, to reflect patch inclusion into lite+full or
+    full-only ,,NX (redistributed)'' tarball.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Mon, 16 Jan 2012 22:28:13 +0100
+
 nx-libs (2:3.5.0.7-0) unstable; urgency=low
 
   * Drop patch: 011_nxcomp_sa-restorer.patch.
diff --git a/debian/patches/000_add-NX-redistribution-README.patch b/debian/patches/000_add-NX-redistribution-README.full+lite.patch
index c9641ccd4..c9641ccd4 100644
--- a/debian/patches/000_add-NX-redistribution-README.patch
+++ b/debian/patches/000_add-NX-redistribution-README.full+lite.patch
diff --git a/debian/patches/001_add-main-makefile.patch b/debian/patches/001_add-main-makefile.full+lite.patch
index df3f4e71f..df3f4e71f 100644
--- a/debian/patches/001_add-main-makefile.patch
+++ b/debian/patches/001_add-main-makefile.full+lite.patch
diff --git a/debian/patches/002_nxcompshad_build-against-nx-x11-only.patch b/debian/patches/002_nxcompshad_build-against-nx-x11-only.full.patch
index 4e92c3b04..4e92c3b04 100644
--- a/debian/patches/002_nxcompshad_build-against-nx-x11-only.patch
+++ b/debian/patches/002_nxcompshad_build-against-nx-x11-only.full.patch
diff --git a/debian/patches/003_nxcompshad_gcc43.patch b/debian/patches/003_nxcompshad_gcc43.full.patch
index 165c30035..165c30035 100644
--- a/debian/patches/003_nxcompshad_gcc43.patch
+++ b/debian/patches/003_nxcompshad_gcc43.full.patch
diff --git a/debian/patches/004_nx-x11_fix-nxcompshad-build.patch b/debian/patches/004_nx-x11_fix-nxcompshad-build.full.patch
index f65fb7877..f65fb7877 100644
--- a/debian/patches/004_nx-x11_fix-nxcompshad-build.patch
+++ b/debian/patches/004_nx-x11_fix-nxcompshad-build.full.patch
diff --git a/debian/patches/005_nxcomp_gcc43.patch b/debian/patches/005_nxcomp_gcc43.full+lite.patch
index 31cb98484..31cb98484 100644
--- a/debian/patches/005_nxcomp_gcc43.patch
+++ b/debian/patches/005_nxcomp_gcc43.full+lite.patch
diff --git a/debian/patches/007_nxcompshad_clean-gch-files.patch b/debian/patches/007_nxcompshad_clean-gch-files.full.patch
index 897e27890..897e27890 100644
--- a/debian/patches/007_nxcompshad_clean-gch-files.patch
+++ b/debian/patches/007_nxcompshad_clean-gch-files.full.patch
diff --git a/debian/patches/009_nxagent-add-man-page.patch b/debian/patches/009_nxagent-add-man-page.full.patch
index 8befcf70d..8befcf70d 100644
--- a/debian/patches/009_nxagent-add-man-page.patch
+++ b/debian/patches/009_nxagent-add-man-page.full.patch
diff --git a/debian/patches/009_nxproxy-add-man-page.patch b/debian/patches/009_nxproxy-add-man-page.full+lite.patch
index f872f846e..f872f846e 100644
--- a/debian/patches/009_nxproxy-add-man-page.patch
+++ b/debian/patches/009_nxproxy-add-man-page.full+lite.patch
diff --git a/debian/patches/010_nxauth_fix-binary-name-in-man-page.patch b/debian/patches/010_nxauth_fix-binary-name-in-man-page.full.patch
index a3de56597..a3de56597 100644
--- a/debian/patches/010_nxauth_fix-binary-name-in-man-page.patch
+++ b/debian/patches/010_nxauth_fix-binary-name-in-man-page.full.patch
diff --git a/debian/patches/012_nxcomp_makefile-uninstall.patch b/debian/patches/012_nxcomp_makefile-uninstall.full+lite.patch
index 36f1555f6..36f1555f6 100644
--- a/debian/patches/012_nxcomp_makefile-uninstall.patch
+++ b/debian/patches/012_nxcomp_makefile-uninstall.full+lite.patch
diff --git a/debian/patches/013_nxcompext_makefile-uninstall.patch b/debian/patches/013_nxcompext_makefile-uninstall.full.patch
index 97e4f03f6..97e4f03f6 100644
--- a/debian/patches/013_nxcompext_makefile-uninstall.patch
+++ b/debian/patches/013_nxcompext_makefile-uninstall.full.patch
diff --git a/debian/patches/014_nxcompshad_makefile-uninstall.patch b/debian/patches/014_nxcompshad_makefile-uninstall.full.patch
index 1a7888546..1a7888546 100644
--- a/debian/patches/014_nxcompshad_makefile-uninstall.patch
+++ b/debian/patches/014_nxcompshad_makefile-uninstall.full.patch
diff --git a/debian/patches/015_nxproxy_makefile-uninstall.patch b/debian/patches/015_nxproxy_makefile-uninstall.full+lite.patch
index 554c86aa4..554c86aa4 100644
--- a/debian/patches/015_nxproxy_makefile-uninstall.patch
+++ b/debian/patches/015_nxproxy_makefile-uninstall.full+lite.patch
diff --git a/debian/patches/016a_debian_nx-X11_install-location.patch b/debian/patches/016_nx-X11_install-location.debian.patch
index 9d4fe1bf5..9d4fe1bf5 100644
--- a/debian/patches/016a_debian_nx-X11_install-location.patch
+++ b/debian/patches/016_nx-X11_install-location.debian.patch
diff --git a/debian/patches/016_nx-x11_install-location.patch b/debian/patches/016_nx-x11_install-location.full.patch
index 0231bcba7..0231bcba7 100644
--- a/debian/patches/016_nx-x11_install-location.patch
+++ b/debian/patches/016_nx-x11_install-location.full.patch
diff --git a/debian/patches/017_nx-x11_update-autotools-helper-files.patch b/debian/patches/017_nx-x11_update-autotools-helper-files.full.patch
index 4d7d95abf..4d7d95abf 100644
--- a/debian/patches/017_nx-x11_update-autotools-helper-files.patch
+++ b/debian/patches/017_nx-x11_update-autotools-helper-files.full.patch
diff --git a/debian/patches/018_nx-x11_update-libtool-ltmain-script.patch b/debian/patches/018_nx-x11_update-libtool-ltmain-script.full.patch
index 156712266..156712266 100644
--- a/debian/patches/018_nx-x11_update-libtool-ltmain-script.patch
+++ b/debian/patches/018_nx-x11_update-libtool-ltmain-script.full.patch
diff --git a/debian/patches/019_nx-x11_expat-build-against-system-libxmltok.patch b/debian/patches/019_nx-x11_expat-build-against-system-libxmltok.full.patch
index d32e570a3..d32e570a3 100644
--- a/debian/patches/019_nx-x11_expat-build-against-system-libxmltok.patch
+++ b/debian/patches/019_nx-x11_expat-build-against-system-libxmltok.full.patch
diff --git a/debian/patches/020_add-nxagent-wrapper.patch b/debian/patches/020_add-nxagent-wrapper.full.patch
index daee69d36..daee69d36 100644
--- a/debian/patches/020_add-nxagent-wrapper.patch
+++ b/debian/patches/020_add-nxagent-wrapper.full.patch
diff --git a/debian/patches/021_add-nxauth-wrapper.patch b/debian/patches/021_add-nxauth-wrapper.full.patch
index 6e3ea8389..6e3ea8389 100644
--- a/debian/patches/021_add-nxauth-wrapper.patch
+++ b/debian/patches/021_add-nxauth-wrapper.full.patch
diff --git a/debian/patches/022_add-nxproxy-wrapper.patch b/debian/patches/022_add-nxproxy-wrapper.full+lite.patch
index df603fd0c..df603fd0c 100644
--- a/debian/patches/022_add-nxproxy-wrapper.patch
+++ b/debian/patches/022_add-nxproxy-wrapper.full+lite.patch
diff --git a/debian/patches/023_add-x2goagent-wrapper.patch b/debian/patches/023_add-x2goagent-wrapper.full.patch
index d23d3f0ee..d23d3f0ee 100644
--- a/debian/patches/023_add-x2goagent-wrapper.patch
+++ b/debian/patches/023_add-x2goagent-wrapper.full.patch
diff --git a/debian/patches/101_nxagent_set-rgb-path.patch b/debian/patches/101_nxagent_set-rgb-path.full.patch
index 793b19d5b..793b19d5b 100644
--- a/debian/patches/101_nxagent_set-rgb-path.patch
+++ b/debian/patches/101_nxagent_set-rgb-path.full.patch
diff --git a/debian/patches/102a_debian_xserver-xext_set-securitypolicy-path.patch b/debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch
index 0d11f2f0a..0d11f2f0a 100644
--- a/debian/patches/102a_debian_xserver-xext_set-securitypolicy-path.patch
+++ b/debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch
diff --git a/debian/patches/102_xserver-xext_set-securitypolicy-path.patch b/debian/patches/102_xserver-xext_set-securitypolicy-path.full.patch
index 9d27a372f..9d27a372f 100644
--- a/debian/patches/102_xserver-xext_set-securitypolicy-path.patch
+++ b/debian/patches/102_xserver-xext_set-securitypolicy-path.full.patch
diff --git a/debian/patches/103_nxagent_set-X0-config-path.patch b/debian/patches/103_nxagent_set-X0-config-path.full.patch
index eb705ca81..eb705ca81 100644
--- a/debian/patches/103_nxagent_set-X0-config-path.patch
+++ b/debian/patches/103_nxagent_set-X0-config-path.full.patch
diff --git a/debian/patches/105_nxagent_export-remote-keyboard-config.patch b/debian/patches/105_nxagent_export-remote-keyboard-config.full.patch
index 2ea3a2c1f..2ea3a2c1f 100644
--- a/debian/patches/105_nxagent_export-remote-keyboard-config.patch
+++ b/debian/patches/105_nxagent_export-remote-keyboard-config.full.patch
diff --git a/debian/patches/106_nxagent_utf8-copy-clipboard.patch b/debian/patches/106_nxagent_utf8-copy-clipboard.full.patch
index 9c0a047d6..9c0a047d6 100644
--- a/debian/patches/106_nxagent_utf8-copy-clipboard.patch
+++ b/debian/patches/106_nxagent_utf8-copy-clipboard.full.patch
diff --git a/debian/patches/107_nxagent_clipboard-compound-text+small-bed-sheets.patch b/debian/patches/107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch
index 129cb707e..129cb707e 100644
--- a/debian/patches/107_nxagent_clipboard-compound-text+small-bed-sheets.patch
+++ b/debian/patches/107_nxagent_clipboard-compound-text+small-bed-sheets.full.patch
diff --git a/debian/patches/108_nxagent_wine-close-delay.patch b/debian/patches/108_nxagent_wine-close-delay.full.patch
index 875571c48..875571c48 100644
--- a/debian/patches/108_nxagent_wine-close-delay.patch
+++ b/debian/patches/108_nxagent_wine-close-delay.full.patch
diff --git a/debian/patches/109_nxagent_locale-utf8-compound-text.patch b/debian/patches/109_nxagent_locale-utf8-compound-text.full.patch
index 74bd53bd0..74bd53bd0 100644
--- a/debian/patches/109_nxagent_locale-utf8-compound-text.patch
+++ b/debian/patches/109_nxagent_locale-utf8-compound-text.full.patch
diff --git a/debian/patches/110_nxagent_createpixmap-bounds-check.patch b/debian/patches/110_nxagent_createpixmap-bounds-check.full.patch
index d65862bdc..d65862bdc 100644
--- a/debian/patches/110_nxagent_createpixmap-bounds-check.patch
+++ b/debian/patches/110_nxagent_createpixmap-bounds-check.full.patch
diff --git a/debian/patches/200_nxagent_check-binary-x2go-flavour.patch b/debian/patches/200_nxagent_check-binary-x2go-flavour.full.patch
index 089b57022..089b57022 100644
--- a/debian/patches/200_nxagent_check-binary-x2go-flavour.patch
+++ b/debian/patches/200_nxagent_check-binary-x2go-flavour.full.patch
diff --git a/debian/patches/201_nxagent_set-x2go-icon-if-x2goagent-flavour.patch b/debian/patches/201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch
index ff3861d6e..ff3861d6e 100644
--- a/debian/patches/201_nxagent_set-x2go-icon-if-x2goagent-flavour.patch
+++ b/debian/patches/201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch
diff --git a/debian/patches/202_nx-x11_enable-xinerama.patch b/debian/patches/202_nx-x11_enable-xinerama.full.patch
index f097f0ba7..f097f0ba7 100644
--- a/debian/patches/202_nx-x11_enable-xinerama.patch
+++ b/debian/patches/202_nx-x11_enable-xinerama.full.patch
diff --git a/debian/patches/209_x2goagent-add-man-page.patch b/debian/patches/209_x2goagent-add-man-page.full.patch
index 00ade43f8..00ade43f8 100644
--- a/debian/patches/209_x2goagent-add-man-page.patch
+++ b/debian/patches/209_x2goagent-add-man-page.full.patch
diff --git a/debian/patches/300_nxagent_set-wm-class.patch b/debian/patches/300_nxagent_set-wm-class.full.patch
index 765d6bc46..765d6bc46 100644
--- a/debian/patches/300_nxagent_set-wm-class.patch
+++ b/debian/patches/300_nxagent_set-wm-class.full.patch
diff --git a/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.patch b/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch
index 7a5ce5437..7a5ce5437 100644
--- a/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.patch
+++ b/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch
diff --git a/debian/patches/series b/debian/patches/series
index 52558c076..d22f4b4c8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,40 +1,40 @@
-000_add-NX-redistribution-README.patch
-001_add-main-makefile.patch
-002_nxcompshad_build-against-nx-x11-only.patch
-003_nxcompshad_gcc43.patch
-004_nx-x11_fix-nxcompshad-build.patch
-005_nxcomp_gcc43.patch
-007_nxcompshad_clean-gch-files.patch
-009_nxproxy-add-man-page.patch
-009_nxagent-add-man-page.patch
-010_nxauth_fix-binary-name-in-man-page.patch
-012_nxcomp_makefile-uninstall.patch
-013_nxcompext_makefile-uninstall.patch
-014_nxcompshad_makefile-uninstall.patch
-015_nxproxy_makefile-uninstall.patch
-016_nx-x11_install-location.patch
-016a_debian_nx-X11_install-location.patch
-017_nx-x11_update-autotools-helper-files.patch
-018_nx-x11_update-libtool-ltmain-script.patch
-019_nx-x11_expat-build-against-system-libxmltok.patch
-020_add-nxagent-wrapper.patch
-021_add-nxauth-wrapper.patch
-022_add-nxproxy-wrapper.patch
-023_add-x2goagent-wrapper.patch
-101_nxagent_set-rgb-path.patch
-102_xserver-xext_set-securitypolicy-path.patch
-102a_debian_xserver-xext_set-securitypolicy-path.patch
-103_nxagent_set-X0-config-path.patch
-105_nxagent_export-remote-keyboard-config.patch
-106_nxagent_utf8-copy-clipboard.patch
-107_nxagent_clipboard-compound-text+small-bed-sheets.patch
-108_nxagent_wine-close-delay.patch
-109_nxagent_locale-utf8-compound-text.patch
-110_nxagent_createpixmap-bounds-check.patch
-200_nxagent_check-binary-x2go-flavour.patch
-201_nxagent_set-x2go-icon-if-x2goagent-flavour.patch
-202_nx-x11_enable-xinerama.patch
-209_x2goagent-add-man-page.patch
-300_nxagent_set-wm-class.patch
-999_nxagent_unbrand-nxagent-brand-x2goagent.patch
+000_add-NX-redistribution-README.full+lite.patch
+001_add-main-makefile.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
+007_nxcompshad_clean-gch-files.full.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.full+lite.patch
+013_nxcompext_makefile-uninstall.full.patch
+014_nxcompshad_makefile-uninstall.full.patch
+015_nxproxy_makefile-uninstall.full+lite.patch
+016_nx-x11_install-location.full.patch
+016_nx-X11_install-location.debian.patch
+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
+020_add-nxagent-wrapper.full.patch
+021_add-nxauth-wrapper.full.patch
+022_add-nxproxy-wrapper.full+lite.patch
+023_add-x2goagent-wrapper.full.patch
+101_nxagent_set-rgb-path.full.patch
+102_xserver-xext_set-securitypolicy-path.full.patch
+102_xserver-xext_set-securitypolicy-path.debian.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
+109_nxagent_locale-utf8-compound-text.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
+209_x2goagent-add-man-page.full.patch
+300_nxagent_set-wm-class.full.patch
+999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch