The branch, master has been updated via 0e3b58b7f13327685354b82dfa003fbc8f4987b5 (commit) via 93b716f787d61ce91bbfa1360189fc2dc52a2b0c (commit) from 21a85ffbe8d97fd7d5d71149360afca13f842878 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0e3b58b7f13327685354b82dfa003fbc8f4987b5 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Dec 29 16:33:57 2011 +0100 Add patch: 019_nx-x11_expat-build-against-system-libxmltok.patch, fixes lintian error: embedded-library: expat. Build-depend on libxmltok1-dev. commit 93b716f787d61ce91bbfa1360189fc2dc52a2b0c Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Dec 29 16:28:19 2011 +0100 Disable patch: 006_remove-configure-files.patch, remove configure files from within /debian/rules. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++ debian/control | 1 + ...-x11_expat-build-against-system-libxmltok.patch | 35 ++++++++++++++++++++ debian/patches/series | 3 +- debian/rules | 3 ++ 5 files changed, 45 insertions(+), 1 deletions(-) create mode 100644 debian/patches/019_nx-x11_expat-build-against-system-libxmltok.patch The diff of changes is: diff --git a/debian/changelog b/debian/changelog index fa30cd8..86ccbdb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -49,6 +49,10 @@ nx-libs (2:3.5.0-0~x2go2) UNRELEASED; urgency=low touch any directory controlled by /etc/ld.so.conf, amongst others see BTS issue #205142). * Make sure upstream changelog file names are in lower case. + * Disable patch: 006_remove-configure-files.patch, remove configure + files from within /debian/rules. + * Add patch: 019_nx-x11_expat-build-against-system-libxmltok.patch, fixes + lintian error: embedded-library: expat. Build-depend on libxmltok1-dev. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 28 Dec 2011 19:06:26 +0100 diff --git a/debian/control b/debian/control index 968582d..31251e2 100644 --- a/debian/control +++ b/debian/control @@ -10,6 +10,7 @@ Build-Depends: libjpeg-dev, zlib1g-dev, quilt (>= 0.46-7~), + libxmltok1-dev, autoconf Build-Conflicts: x11proto-core-dev, diff --git a/debian/patches/019_nx-x11_expat-build-against-system-libxmltok.patch b/debian/patches/019_nx-x11_expat-build-against-system-libxmltok.patch new file mode 100644 index 0000000..227dd46 --- /dev/null +++ b/debian/patches/019_nx-x11_expat-build-against-system-libxmltok.patch @@ -0,0 +1,35 @@ +--- a/nx-X11/lib/expat/Imakefile ++++ b/nx-X11/lib/expat/Imakefile +@@ -19,7 +19,7 @@ + EXPATSRC = $(EXPATTOP)/lib + EXPATINC = $(EXPATTOP)/lib + +-INCLUDES = -I$(EXPATINC) -I$(EXPATTOP) -I. ++INCLUDES = -I/usr/include/xmltok -I$(EXPATINC) -I$(EXPATTOP) -I. + + /* + * Endianness (for short's) +@@ -31,8 +31,8 @@ + DEFINES = -DXML_BYTE_ORDER=0 -DX_BYTE_ORDER=$(X_BYTE_ORDER) + REQUIREDLIBS=$(LDPRELIBS) + +-SRCS = xmlparse.c xmltok.c xmlrole.c +-OBJS = xmlparse.o xmltok.o xmlrole.o ++#SRCS = xmlparse.c xmltok.c xmlrole.c ++#OBJS = xmlparse.o xmltok.o xmlrole.o + + HEADERS = expat.h + +@@ -45,9 +45,9 @@ + + DependTarget() + +-LinkSourceFile(xmlparse.c,$(EXPATSRC)) +-LinkSourceFile(xmltok.c,$(EXPATSRC)) +-LinkSourceFile(xmlrole.c,$(EXPATSRC)) ++#LinkSourceFile(xmlparse.c,$(EXPATSRC)) ++#LinkSourceFile(xmltok.c,$(EXPATSRC)) ++#LinkSourceFile(xmlrole.c,$(EXPATSRC)) + LinkSourceFile(expat.h,$(EXPATINC)) + + diff --git a/debian/patches/series b/debian/patches/series index c038932..57938c1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,7 +3,7 @@ 003_nxcompshad_gcc43.patch 004_nx-x11_fix-nxcompshad-build.patch 005_nxagent_add-nxagent-wrapper.patch -006_remove-configure-files.patch +#006_remove-configure-files.patch 007_nxcompshad_clean-gch-files.patch 008_nxproxy_add-nxproxy-wrapper.patch 009_nxproxy_add-man-page.patch @@ -16,6 +16,7 @@ 016_nx-x11_install-location.patch 017_nx-x11_update-autotools-helper-files.patch 018_nx-x11_update-libtool-ltmain-script.patch +019_nx-x11_expat-build-against-system-libxmltok.patch 101_nxagent_set-rgb-path.patch 102_xserver-xext_set-securitypolicy-path.patch 103_nxagent_set-X0-config-path.patch diff --git a/debian/rules b/debian/rules index b6be368..44ea971 100755 --- a/debian/rules +++ b/debian/rules @@ -16,6 +16,9 @@ override_dh_auto_clean: LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh_auto_clean override_dh_clean: + rm -f nxcomp/configure + rm -f nxcompext/configure + rm -f nxcompshad/configure rm -f nx-X11/changelog rm -f nxcomp/changelog rm -f nxcompext/changelog hooks/post-receive -- nx-libs.git (NX libraries) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nx-libs.git" (NX libraries).