This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch 3.5.0.x in repository nx-libs. from 7b0c8a2 Fix FTBFS due to the nxproxy executable already existing under /usr/lib/nx/bin/nx new db328b6 nx-libs.spec: Typo fix in comment. new 0a423ce Install "%{_libdir}/nx/bin" into nxproxy package. new d2ff213 Make install-lite rule in Makefile.nx-libs more predictable and not rely on nxproxy/Makefile.in. new ffb64d2 Makefile.nx-libs: Fix uninstall-lite rule. The nxproxy and nxcomp uninstallation has to be in uninstall-lite, not in uninstall-full. new f74f59d debian/changelog: fix too-long lines The 5 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/Makefile.nx-libs | 29 +++++++++++++++++++---------- debian/changelog | 13 +++++++++---- nx-libs.spec | 4 +++- 3 files changed, 31 insertions(+), 15 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 3.5.0.x in repository nx-libs. commit db328b616e76ce5f33fc782b69e8fb2e568350fb Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Feb 14 21:53:00 2015 +0100 nx-libs.spec: Typo fix in comment. --- nx-libs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nx-libs.spec b/nx-libs.spec index 95d71a7..d411f58 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -707,7 +707,7 @@ sed -i -e 's,/usr/local,/usr,' nx-X11/config/cf/site.def sed -i -e 's#-O3#%{optflags}#' nx-X11/config/cf/host.def # Use multilib dirs # We're installing binaries into %%{_libdir}/nx/bin rather than %%{_libexedir}/nx -# becuase upstream expects libraries and binaries in the same directory +# because upstream expects libraries and binaries in the same directory sed -i -e 's,/lib/nx,/%{_lib}/nx,' Makefile nx-X11/config/cf/X11.tmpl sed -i -e 's,/lib/x2go,/%{_lib}/x2go,' Makefile sed -i -e 's,/usr/lib/,/usr/%{_lib}/,' bin/* -- 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 3.5.0.x in repository nx-libs. commit 0a423ce8f689bb934831f1fecc41b6db5c5c8fdb Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Feb 14 21:55:30 2015 +0100 Install "%{_libdir}/nx/bin" into nxproxy package. --- debian/changelog | 1 + nx-libs.spec | 2 ++ 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 39105b0..304a7f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -108,6 +108,7 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium time. + Assure that BuildRoot: is set. + On SLE 11.x: libX* packages are prefixed with "xorg-x11-". + + Install "%{_libdir}/nx/bin" into nxproxy package. * debian/roll-tarball.sh: + Install etc/ files into etc/ subfolder (rgb, nxagent.keyboard, diff --git a/nx-libs.spec b/nx-libs.spec index d411f58..42d0416 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -1128,6 +1128,8 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama %{_bindir}/nxproxy %{_mandir}/man1/nxproxy.1* %{_datadir}/man/man1/nxproxy.1* +%dir %{_libdir}/nx/bin +%{_libdir}/nx/bin/nxproxy %files -n x2goagent %defattr(-,root,root) -- 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 3.5.0.x in repository nx-libs. commit d2ff2138b4710faab79145e8ac020d295754a8d6 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Feb 16 05:45:17 2015 +0100 Make install-lite rule in Makefile.nx-libs more predictable and not rely on nxproxy/Makefile.in. --- debian/Makefile.nx-libs | 15 ++++++++++----- debian/changelog | 2 ++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs index 52326fb..2c2cf35 100644 --- a/debian/Makefile.nx-libs +++ b/debian/Makefile.nx-libs @@ -59,17 +59,22 @@ install: [ ! -d nx-X11 ] || $(MAKE) install-full install-lite: + # install nxcomp library + $(MAKE) -C nxcomp install + + # install nxproxy wrapper script $(INSTALL_DIR) $(DESTDIR)$(BINDIR) - for d in nxcomp nxproxy; do \ - $(MAKE) -C $$d install; done - for f in nxproxy; do \ - $(INSTALL_PROGRAM) bin/$$f $(DESTDIR)$(BINDIR); done + $(INSTALL_PROGRAM) bin/nxproxy $(DESTDIR)$(BINDIR) + + # FIXME: the below install logic should work via nxproxy/Makefile.in + # overriding for now... + $(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/bin + $(INSTALL_PROGRAM) nxproxy/nxproxy $(DESTDIR)$(NXLIBDIR)/bin $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/man/man1/ $(INSTALL_FILE) nxproxy/man/nxproxy.1 $(DESTDIR)$(PREFIX)/share/man/man1/ gzip $(DESTDIR)$(PREFIX)/share/man/man1/*.1 - install-full: for f in nxagent nxauth x2goagent; do \ $(INSTALL_PROGRAM) bin/$$f $(DESTDIR)$(BINDIR); done diff --git a/debian/changelog b/debian/changelog index 304a7f8..da26c9b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,8 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium * Add Description: and Author: fields to various patch headers. * Makefile.nx-libs: Run make install for nxproxy first, then create the wrapper script. + * Make install-lite rule in Makefile.nx-libs more predictable and not + rely on nxproxy/Makefile.in. * NX code reduction efforts (from 93Mb to 41Mb): - Drop more unused code in nx-X11/programs/Xserver/hw/. Do this in -- 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 3.5.0.x in repository nx-libs. commit ffb64d2b0794af8aa59751b0d757110325b74e55 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Feb 16 05:51:02 2015 +0100 Makefile.nx-libs: Fix uninstall-lite rule. The nxproxy and nxcomp uninstallation has to be in uninstall-lite, not in uninstall-full. --- debian/Makefile.nx-libs | 14 +++++++++----- debian/changelog | 2 ++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs index 2c2cf35..f0c8a97 100644 --- a/debian/Makefile.nx-libs +++ b/debian/Makefile.nx-libs @@ -164,8 +164,15 @@ uninstall: [ ! -d nx-X11 ] || $(MAKE) uninstall-full uninstall-lite: - for f in nxproxy; do \ - $(RM_FILE) $(DESTDIR)$(BINDIR)/$$f; done + if test -f nxcomp/Makefile; then ${MAKE} -C nxcomp $@; fi + + # uninstall nproxy wrapper script + $(RM_FILE) $(DESTDIR)$(BINDIR)/nxproxy + # FIXME: don't use uninstall rule in nxproxy/Makefile.in, let's do + # it on our own for now... + $(RM_FILE) $(DESTDIR)$(NXLIBDIR)/bin/nxproxy + $(RM_DIR) $(DESTDIR)$(NXLIBDIR)/bin/ + $(RM_FILE) $(DESTDIR)$(PREFIX)/share/man/man1/*.1 uninstall-full: for f in nxagent nxauth x2goagent; do \ @@ -174,9 +181,6 @@ uninstall-full: $(RM_FILE) $(DESTDIR)$(X2GOLIBDIR)/bin/x2goagent $(RM_DIR) $(DESTDIR)$(X2GOLIBDIR)/bin/ - if test -f nxcomp/Makefile; then ${MAKE} -C nxcomp $@; fi - if test -f nxproxy/Makefile; then ${MAKE} -C nxproxy $@; fi - if test -d nx-X11; then \ if test -f nxcompext/Makefile; then ${MAKE} -C nxcompext $@; fi; \ if test -f nxcompshad/Makefile; then ${MAKE} -C nxcompshad $@; fi; \ diff --git a/debian/changelog b/debian/changelog index da26c9b..16978ec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,8 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium wrapper script. * Make install-lite rule in Makefile.nx-libs more predictable and not rely on nxproxy/Makefile.in. + * Makefile.nx-libs: Fix uninstall-lite rule. The nxproxy and nxcomp + uninstallation has to be in uninstall-lite, not in uninstall-full. * NX code reduction efforts (from 93Mb to 41Mb): - Drop more unused code in nx-X11/programs/Xserver/hw/. Do this in -- 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 3.5.0.x in repository nx-libs. commit f74f59d2f3962b227753d5eb0ecc1af82f41dbbc Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Feb 16 06:19:54 2015 +0100 debian/changelog: fix too-long lines --- debian/changelog | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 16978ec..efe018c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -53,12 +53,12 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium process. - Update 0600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch. Don't patch files matter to the NX code reduction efforts. - - Update 0031_nx-X11_parallel-make.full.patch. Don't patch .original files in - NX code tree. + - Update 0031_nx-X11_parallel-make.full.patch. Don't patch .original files + in NX code tree. - 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. + 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 -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
-
git-admin＠x2go.org