This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository nx-libs. from 24986dd Update 320_nxagent_configurable-keystrokes.full.patch. Fix patch header referring to keystrokes.cfg (plural), not keystroke.cfg. new 694523e debian/rules: Backup nxcomp/VERSION file from NoMachine before replacing it with a symlink to debian/VERSION. Recreate the original file when cleaning up. new 040962d 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). new be832e8 Drop more unused code in nx-X11/programs/Xserver/hw/. Do this in roll-tarball.sh and in debian/rules alike. new b590ce3 Stop shipping unused / very old xterm code. The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 10 ++++++++++ debian/roll-tarballs.sh | 2 ++ debian/rules | 49 +++++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 57 insertions(+), 4 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 694523eeecf6b591e2929ab5830b9cb96b5f3bc4 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jan 22 06:06:37 2015 +0100 debian/rules: Backup nxcomp/VERSION file from NoMachine before replacing it with a symlink to debian/VERSION. Recreate the original file when cleaning up. --- debian/changelog | 4 ++++ debian/rules | 2 ++ 2 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 19a12a8..3395cda 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,10 @@ nx-libs (2:3.5.0.29-0x2go1) UNRELEASED; urgency=medium without. * Update 320_nxagent_configurable-keystrokes.full.patch. Fix patch header referring to keystrokes.cfg (plural), not keystroke.cfg. + * debian/rules: + + Backup nxcomp/VERSION file from NoMachine before replacing it with + a symlink to debian/VERSION. Recreate the original file when cleaning + up. [ Horst Schirmeier ] * Update 320_nxagent_configurable-keystrokes.full.patch. Fix a typo that diff --git a/debian/rules b/debian/rules index 0a7899b..02eaec1 100755 --- a/debian/rules +++ b/debian/rules @@ -22,6 +22,7 @@ override_dh_clean: rm -f nx-X11/programs/nxauth/changelog rm -Rf replace.sh Makefile bin rgb VERSION.x2goagent etc/keystrokes.cfg rm -f debian/libnx-x11.postinst + if [ -f nxcomp/.VERSION.NoMachine ]; then mv nxcomp/.VERSION.NoMachine nxcomp/VERSION; fi dh_clean override_dh_auto_install: @@ -32,6 +33,7 @@ override_dh_auto_build: # create copies of upstream changelogs so that names apply to Debian policy... cp -a nx-X11/CHANGELOG nx-X11/changelog cp -a nxcomp/CHANGELOG nxcomp/changelog + if [ -f nxcomp/VERSION ]; then cp nxcomp/VERSION nxcomp/.VERSION.NoMachine; fi cp -a nxcompext/CHANGELOG nxcompext/changelog cp -a nxcompshad/CHANGELOG nxcompshad/changelog cp -a nx-X11/programs/Xserver/hw/nxagent/CHANGELOG nx-X11/programs/Xserver/hw/nxagent/changelog -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 040962da790c010f8900b09e9c108323719775d8 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jan 22 06:10:11 2015 +0100 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). --- debian/changelog | 3 +++ debian/rules | 38 ++++++++++++++++++++++++++++++++++---- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3395cda..8728e28 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,9 @@ nx-libs (2:3.5.0.29-0x2go1) UNRELEASED; urgency=medium + Backup nxcomp/VERSION file from NoMachine before replacing it with a symlink to debian/VERSION. Recreate the original file when cleaning up. + + 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). [ Horst Schirmeier ] * Update 320_nxagent_configurable-keystrokes.full.patch. Fix a typo that diff --git a/debian/rules b/debian/rules index 02eaec1..df248d7 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,6 @@ #!/usr/bin/make -f +NULL = CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -11,6 +12,36 @@ endif %: CONFIGURE="./configure --prefix=/usr" LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh $@ --with quilt +# before build, we will remove unused code / bundled libraries (keep this in sync with roll-tarball.sh) +UNUSED_CODE = nx-X11/extras/drm \ + nx-X11/extras/expat \ + nx-X11/extras/fontconfig \ + nx-X11/extras/freetype2 \ + nx-X11/extras/fonts \ + 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/regex \ + nx-X11/lib/zlib \ + nx-X11/lib/FS \ + nx-X11/lib/ICE \ + nx-X11/lib/SM \ + nx-X11/lib/Xaw \ + nx-X11/lib/Xft \ + nx-X11/lib/Xt \ + nx-X11/lib/Xmu \ + nx-X11/lib/Xmuu \ + $(NULL) + override_dh_auto_clean: rm -Rf nx-X11/.build-exports LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh_auto_clean @@ -51,10 +82,9 @@ override_dh_auto_build: # let's prep the libnx-x11.postinst script with the value of the build systems's DEB_BUILD_MULTIARCH variable sed debian/libnx-x11.postinst.in -e 's/#DEB_BUILD_MULTIARCH#/$(DEB_BUILD_MULTIARCH)/' > debian/libnx-x11.postinst - # remove bundled libraries (keep this in sync with roll-tarball.sh) - 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} + # remove unused code / bundled libraries (see at the top of this file + # for the exact list of files and folders + rm -Rf $(UNUSED_CODE) LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh_auto_build --parallel -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
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
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit b590ce38cfceafb7f838ba2e78555fee7f73835b Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jan 22 06:19:42 2015 +0100 Stop shipping unused / very old xterm code. --- debian/changelog | 1 + debian/roll-tarballs.sh | 1 + debian/rules | 1 + 3 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index ad6a97a..3f9d3f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,7 @@ nx-libs (2:3.5.0.29-0x2go1) UNRELEASED; urgency=medium 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. + * Stop shipping unused / very old xterm code. [ 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 6573a4f..3d6588b 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -141,6 +141,7 @@ rm -Rf nx-X11/extras/{drm,expat,fontconfig,freetype2,fonts,ogl-sample,regex,rman 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} +rm -Rf nx-X11/programs/xterm # 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 be1f905..aa76c2b 100755 --- a/debian/rules +++ b/debian/rules @@ -48,6 +48,7 @@ UNUSED_CODE = nx-X11/extras/drm \ nx-X11/programs/Xserver/hw/vfb \ nx-X11/programs/Xserver/hw/xnest \ nx-X11/programs/Xserver/hw/xwin \ + nx-X11/programs/xterm \ $(NULL) override_dh_auto_clean: -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git