This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit be832e8e15a4a783431ef2d87c8eb4cab918635c Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jan 22 06:12:10 2015 +0100 Drop more unused code in nx-X11/programs/Xserver/hw/. Do this in roll-tarball.sh and in debian/rules alike. --- debian/changelog | 2 ++ debian/roll-tarballs.sh | 1 + debian/rules | 8 ++++++++ 3 files changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8728e28..ad6a97a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,8 @@ nx-libs (2:3.5.0.29-0x2go1) UNRELEASED; urgency=medium + Fix removal of unused code (that part of the code that we know of so far). (The debian/rules file is a Makefile and Makefiles don't understand shell globbing with curly braces). + * Drop more unused code in nx-X11/programs/Xserver/hw/. Do this in + roll-tarball.sh and in debian/rules alike. [ Horst Schirmeier ] * Update 320_nxagent_configurable-keystrokes.full.patch. Fix a typo that diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index 3da027c..6573a4f 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -140,6 +140,7 @@ rm -Rf "debian/" rm -Rf nx-X11/extras/{drm,expat,fontconfig,freetype2,fonts,ogl-sample,regex,rman,ttf2pt1,x86emu,zlib} rm -Rf nx-X11/lib/{expat,fontconfig,fontenc,font/FreeType,font/include/fontenc.h,freetype2,regex,zlib} rm -Rf nx-X11/lib/{FS,ICE,SM,Xaw,Xft,Xt,Xmu,Xmuu} +rm -Rf nx-X11/programs/Xserver/hw/{darwin,dmx,kdrive,sun,sunLynx,vfb,xnest,xwin} # remove files, that we do not want in the tarballs (build cruft) rm -Rf nx*/configure nx*/autom4te.cache* diff --git a/debian/rules b/debian/rules index df248d7..be1f905 100755 --- a/debian/rules +++ b/debian/rules @@ -40,6 +40,14 @@ UNUSED_CODE = nx-X11/extras/drm \ nx-X11/lib/Xt \ nx-X11/lib/Xmu \ nx-X11/lib/Xmuu \ + 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/xnest \ + nx-X11/programs/Xserver/hw/xwin \ $(NULL) override_dh_auto_clean: -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git