This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch 3.6.x in repository nx-libs. from 6fc37fa Use shared libraries (301_nx-X11_use-shared-libs.full.patch). new 4436e97 Fix build when LDFLAGS (etc) contains spaces. new a7cc4ed Remove upstream nx-libs ChangeLog during override_dh_clean. new d569145 Makefile.nx-libs: Run make install for nxproxy first, then create the wrapper script. The 3 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 | 6 ++++-- debian/changelog | 3 +++ debian/rules | 9 +++++---- 3 files changed, 12 insertions(+), 6 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.6.x in repository nx-libs. commit 4436e97903aa6e2a7732fb98dcb46758a73fe130 Author: Mike DePaulo <mikedep333@gmail.com> Date: Wed Feb 11 19:02:57 2015 -0500 Fix build when LDFLAGS (etc) contains spaces. Was needed and was tested on Ubuntu 14.04. --- debian/rules | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/rules b/debian/rules index b8e4ad4..e406f56 100755 --- a/debian/rules +++ b/debian/rules @@ -2,10 +2,10 @@ NULL = -export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) -export CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) -export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) -export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) +export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS --export=cmdline) +export CFLAGS:=$(shell dpkg-buildflags --get CFLAGS --export=cmdline) +export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS --export=cmdline) +export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS --export=cmdline) export LIBDIR = "/usr/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)" export INCLUDEDIR = "/usr/include/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)" -- 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.6.x in repository nx-libs. commit a7cc4edef158a1d7c02eb074baf74b7bd3cb0fec Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Feb 12 09:59:12 2015 +0100 Remove upstream nx-libs ChangeLog during override_dh_clean. --- debian/changelog | 1 + debian/rules | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index bbd4372..00523ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -70,6 +70,7 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium etc/x2goagent.keyboard) before dh_auto_build. + Add to B-D: expat. + Install upstream ChangeLogs into bin:packages. + + Remove upstream nx-libs ChangeLog during override_dh_clean. * nx-libs.spec: + The gpg-offline bin:package is not available in our SLE repo. We can do diff --git a/debian/rules b/debian/rules index e406f56..1a9b123 100755 --- a/debian/rules +++ b/debian/rules @@ -20,6 +20,7 @@ override_dh_auto_clean: override_dh_clean: rm -f nx*/configure rm -f nx*/changelog + rm -f doc/changelog rm -f nx-X11/programs/Xserver/hw/nxagent/changelog rm -f nx-X11/programs/nxauth/changelog if [ ! -f replace.sh ] && [ ! -h replace.sh ]; then ln -s debian/Makefile.replace.sh replace.sh; fi -- 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.6.x in repository nx-libs. commit d569145e640c40ea4cccbdd8703a254618b10c73 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Feb 12 09:59:57 2015 +0100 Makefile.nx-libs: Run make install for nxproxy first, then create the wrapper script. --- debian/Makefile.nx-libs | 6 ++++-- debian/changelog | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs index e85f404..3aeda73 100644 --- a/debian/Makefile.nx-libs +++ b/debian/Makefile.nx-libs @@ -60,10 +60,12 @@ install: install-lite: $(INSTALL_DIR) $(DESTDIR)$(BINDIR) - for f in nxproxy; do \ - $(INSTALL_PROGRAM) bin/$$f $(DESTDIR)$(BINDIR); done for d in nxcomp nxproxy; do \ $(MAKE) -C $$d install; done + mkdir -p $(DESTDIR)$(NXLIBDIR)/bin/ + mv $(DESTDIR)$(BINDIR)/nxproxy $(DESTDIR)$(NXLIBDIR)/bin/ + for f in nxproxy; do \ + $(INSTALL_PROGRAM) bin/$$f $(DESTDIR)$(BINDIR); done $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/man/man1/ $(INSTALL_FILE) nxproxy/man/nxproxy.1 $(DESTDIR)$(PREFIX)/share/man/man1/ diff --git a/debian/changelog b/debian/changelog index 00523ba..5151861 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,8 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium * Makefile.nx-libs: Don't allow symlinks to point into buildroot. * Makefile.nx-libs: Install man pages via main Makefile. * Add Description: and Author: fields to various patch headers. + * Makefile.nx-libs: Run make install for nxproxy first, then create the + wrapper script. * 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
-
git-admin＠x2go.org