summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorAron Xu <aron@debian.org>2012-06-03 20:50:41 +0800
committerAron Xu <aron@debian.org>2012-06-03 20:50:41 +0800
commit19bc5fcde2c3ac316776cfd0ffe5d813101643e2 (patch)
tree8c302f7bf619262c3da7116913f6be9af705651f /debian
parent0b9f0939fc73d49fa7e56e95090cf30020feff4e (diff)
downloadlibxml2-19bc5fcde2c3ac316776cfd0ffe5d813101643e2.tar.gz
Fix libxml-2.0-uninstalled.pc as well.
Diffstat (limited to 'debian')
-rw-r--r--debian/patches/0002-modify-xml2-config-and-pkgconfig-behaviour.patch (renamed from debian/patches/0002-modify-xml2-config-behaviour.patch)23
-rw-r--r--debian/patches/series2
2 files changed, 19 insertions, 6 deletions
diff --git a/debian/patches/0002-modify-xml2-config-behaviour.patch b/debian/patches/0002-modify-xml2-config-and-pkgconfig-behaviour.patch
index 339b5b3..cd89222 100644
--- a/debian/patches/0002-modify-xml2-config-behaviour.patch
+++ b/debian/patches/0002-modify-xml2-config-and-pkgconfig-behaviour.patch
@@ -1,12 +1,13 @@
From: Aron Xu <aron@debian.org>
Date: Sun, 3 Jun 2012 17:54:56 +0800
-Subject: [PATCH] modify xml2-config behaviour
+Subject: [PATCH] modify xml2-config and pkgconfig behaviour
---
- configure.in | 2 +-
- xml2-config.1 | 3 ++-
- xml2-config.in | 14 +++++++++++---
- 3 files changed, 14 insertions(+), 5 deletions(-)
+ configure.in | 2 +-
+ libxml-2.0-uninstalled.pc.in | 3 ++-
+ xml2-config.1 | 3 ++-
+ xml2-config.in | 14 +++++++++++---
+ 4 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/configure.in b/configure.in
index 0fb4983..e0fec4c 100644
@@ -21,6 +22,18 @@ index 0fb4983..e0fec4c 100644
XML_LIBTOOLLIBS="libxml2.la"
AC_SUBST(WITH_ICONV)
+diff --git a/libxml-2.0-uninstalled.pc.in b/libxml-2.0-uninstalled.pc.in
+index 0a4c833..af16ebc 100644
+--- a/libxml-2.0-uninstalled.pc.in
++++ b/libxml-2.0-uninstalled.pc.in
+@@ -8,5 +8,6 @@ Name: libXML
+ Version: @VERSION@
+ Description: libXML library version2.
+ Requires:
+-Libs: -L${libdir} -lxml2 @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@
++Libs: -L${libdir} -lxml2
++Libs.private: @BASE_THREAD_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@
+ Cflags: -I${includedir} @XML_INCLUDEDIR@ @XML_CFLAGS@
diff --git a/xml2-config.1 b/xml2-config.1
index 8a25962..bfda630 100644
--- a/xml2-config.1
diff --git a/debian/patches/series b/debian/patches/series
index 31310df..6a746af 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
0001-restore-generated-html.patch
-0002-modify-xml2-config-behaviour.patch
+0002-modify-xml2-config-and-pkgconfig-behaviour.patch