aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rw-r--r--debian/control1
-rw-r--r--debian/patches/019_nx-x11_expat-build-against-system-libxmltok.patch35
-rw-r--r--debian/patches/series1
4 files changed, 39 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 244147e39..86ccbdb01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -51,6 +51,8 @@ nx-libs (2:3.5.0-0~x2go2) UNRELEASED; urgency=low
* 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 968582d1e..31251e28f 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 000000000..227dd4695
--- /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 0bc35555b..57938c157 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -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