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. at bccb275 Fix build when LDFLAGS (etc) contains spaces. This branch includes the following new commits: new a097b2c Fix RPM spec syntax error new 75c4785 Remove upstream nx-libs ChangeLog during override_dh_clean. new 4157e82 Makefile.nx-libs: Run make install for nxproxy first, then create the wrapper script. new bccb275 Fix build when LDFLAGS (etc) contains spaces. 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. -- 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 a097b2c0513165e291555e9d44b170ae8eb1eb2b Author: Mike DePaulo <mikedep333@gmail.com> Date: Mon Feb 9 08:37:40 2015 -0500 Fix RPM spec syntax error --- nx-libs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nx-libs.spec b/nx-libs.spec index e1549d3..95d71a7 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -1147,4 +1147,4 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama %changelog * Thu Jan 29 2015 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> 3.5.0.29 -- See debian/changelog for details. \ No newline at end of file +- See debian/changelog for details. -- 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 75c4785216a1e91bb403787eba7ce1959b6acd97 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 fba89b2..c3993b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -82,6 +82,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 099050b..bdb9e64 100755 --- a/debian/rules +++ b/debian/rules @@ -28,6 +28,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.5.0.x in repository nx-libs. commit 4157e8258b2f9f2d760df5aae1ccfadb5f3eb393 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 c3993b6..c8d0314 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
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 bccb2750bd5e630401e73528f9afb0bb0692f15b 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/changelog | 4 ++++ debian/rules | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index c8d0314..a8c2480 100644 --- a/debian/changelog +++ b/debian/changelog @@ -116,6 +116,10 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium launched as x2goagent, use X2Go-specific paths for the keystrokes.cfg file. (Fixes: #744). + [ Michael DePaulo ] + * debian/rules: + + Fix build for LDFLAGS containing spaces. + [ Mihai Moldovan ] * Change string "X2go" to "X2Go" where appropriate. diff --git a/debian/rules b/debian/rules index bdb9e64..2953882 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
-
git-admin＠x2go.org