Unify source tree reduction (debian/rules vs. roll-tarball.sh) via file/folder…

debian/CODE-REDUCTION_CLEANUP-BRUTAL

+nx-X11/config/cf/
+nx-X11/extras/Mesa/
+nx-X11/extras/Xpm/

debian/CODE-REDUCTION_CLEANUP-UNUSED

+nx-X11/config/docbook/
+nx-X11/config/pswrap/
+nx-X11/extras/drm/
+nx-X11/extras/expat/
+nx-X11/extras/fontconfig/
+nx-X11/extras/fonts/
+nx-X11/extras/freetype2/
+nx-X11/extras/ogl-sample/
+nx-X11/extras/regex/
+nx-X11/extras/rman/
+nx-X11/extras/ttf2pt1/
+nx-X11/extras/x86emu/
+nx-X11/extras/zlib/
+nx-X11/lib/expat/
+nx-X11/lib/fontconfig/
+nx-X11/lib/fontenc/
+nx-X11/lib/font/FreeType/
+nx-X11/lib/font/include/fontenc.h
+nx-X11/lib/freetype2/
+nx-X11/lib/FS/
+nx-X11/lib/ICE/
+nx-X11/lib/regex/
+nx-X11/lib/SM/
+nx-X11/lib/Xaw/
+nx-X11/lib/Xft/
+nx-X11/lib/Xmu/
+nx-X11/lib/Xmuu/
+nx-X11/lib/Xt/
+nx-X11/lib/zlib/
+nx-X11/nls/
+nx-X11/programs/Xserver/afb/
+nx-X11/programs/Xserver/cfb/
+nx-X11/programs/Xserver/cfb16/
+nx-X11/programs/Xserver/cfb24/
+nx-X11/programs/Xserver/cfb32/
+nx-X11/programs/Xserver/hw/darwin/
+nx-X11/programs/Xserver/hw/dmx/
+nx-X11/programs/Xserver/hw/kdrive/
+nx-X11/programs/Xserver/hw/sun/
+nx-X11/programs/Xserver/hw/sunLynx/
+nx-X11/programs/Xserver/hw/vfb/
+nx-X11/programs/Xserver/hw/xfree86/
+nx-X11/programs/Xserver/hw/xfree86/
+nx-X11/programs/Xserver/hw/xnest/
+nx-X11/programs/Xserver/hw/xwin/
+nx-X11/programs/Xserver/ilbm/
+nx-X11/programs/Xserver/iplan2p2/
+nx-X11/programs/Xserver/iplan2p4/
+nx-X11/programs/Xserver/iplan2p8/
+nx-X11/programs/Xserver/lbx/
+nx-X11/programs/Xserver/mfb/
+nx-X11/programs/Xserver/miext/layer/
+nx-X11/programs/Xserver/miext/shadow/
+nx-X11/programs/Xserver/XpConfig/
+nx-X11/programs/Xserver/Xprint/
+nx-X11/programs/xterm/
+nx-X11/util/

debian/CODE-REDUCTION_PRESERVE-INCLUDED

+nx-X11/programs/Xserver/mfb/maskbits.h

debian/CODE-REDUCTION_PRESERVE-NEEDED

+nx-X11/config/cf/date.def
+nx-X11/config/cf/host.def
+nx-X11/config/cf/Imake.cf
+nx-X11/config/cf/Imakefile
+nx-X11/config/cf/Imake.rules
+nx-X11/config/cf/Imake.tmpl
+nx-X11/config/cf/Library.tmpl
+nx-X11/config/cf/linux.cf
+nx-X11/config/cf/lnxLib.rules
+nx-X11/config/cf/lnxLib.tmpl
+nx-X11/config/cf/Makefile
+nx-X11/config/cf/noop.rules
+nx-X11/config/cf/README
+nx-X11/config/cf/ServerLib.tmpl
+nx-X11/config/cf/Server.tmpl
+nx-X11/config/cf/site.def
+nx-X11/config/cf/Threads.tmpl
+nx-X11/config/cf/version.def
+nx-X11/config/cf/X11.rules
+nx-X11/config/cf/X11.tmpl
+nx-X11/config/cf/xf86.rules
+nx-X11/config/cf/xf86site.def
+nx-X11/config/cf/xf86.tmpl
+nx-X11/config/cf/xfree86.cf
+nx-X11/config/cf/xorg.cf
+nx-X11/config/cf/xorgsite.def
+nx-X11/config/cf/xorg.tmpl
+nx-X11/config/cf/xorgversion.def

debian/changelog

@@ -19,7 +19,7 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium
   * Extend 999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch. Allow
     separate .keyboard files for x2goagent and nxagent.
 
-  * NX code reduction efforts (from 93Mb to 52Mb):
+  * NX code reduction efforts (from 93Mb to 60Mb):
     - Drop more unused code in nx-X11/programs/Xserver/hw/. Do this in
       roll-tarball.sh and in debian/rules alike.
     - Stop shipping unused / very old xterm code.
@@ -32,6 +32,8 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium
       .  nx-X11/programs/Xserver/XpConfig/
       .  nx-X11/programs/Xserver/Xprint/
     -  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_*.
 
   * Debian/Ubuntu packaging:
     + Fully rework the way nx-libs gets packaged for Debian/Ubuntu.
@@ -53,6 +55,7 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium
       shell globbing with curly braces).
     + Correctly link config files (etc/rgb, etc/nxagent.keyboard,
       etc/x2goagent.keyboard) before dh_auto_build.
+    + Add to B-D: expat.
 
   * nx-libs.spec:
     + The gpg-offline bin:package is not available in our SLE repo. We can do

debian/control

@@ -20,6 +20,7 @@ Build-Depends:
  autoconf,
  pkg-config,
  x11proto-core-dev,
+ expat,
 Build-Conflicts:
  x11proto-kb-dev,
  x11proto-randr-dev,