[texlive-bin] 01/01: move c-auto.h back to /usr/include/kpathsea, fix pkgconfig file
This is an automated email from the git hooks/post-receive script.
preining pushed a commit to branch master
in repository texlive-bin.
commit 375adc07f7efd8a55b7a86a77c265978903e6afa
Author: Norbert Preining <preining@debian.org>
Date: Thu Jul 2 08:46:40 2015 +0900
move c-auto.h back to /usr/include/kpathsea, fix pkgconfig file
---
debian/changelog | 8 ++++++++
debian/libkpathsea-dev.install | 1 -
debian/patches/remove-libdir-from-kpathsea-pkgconfig | 15 +++++++++++++++
debian/patches/series | 1 +
debian/rules | 4 ++++
5 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index f60b46f..3424f92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+texlive-bin (2015.20150524.37493-5) unstable; urgency=medium
+
+ * mv c-auto.h back into /usr/include/kpathsea, we need a different
+ approach for multi-arch than upstream TeX Live, thanks Jakub Wilk.
+ * also remove the /usr/lib entry from the pkgconfig file for kpathsea
+
+ -- Norbert Preining <preining@debian.org> Thu, 02 Jul 2015 08:46:11 +0900
+
texlive-bin (2015.20150524.37493-4) unstable; urgency=medium
* fix missing c-auto.h install (Closes: #790294)
diff --git a/debian/libkpathsea-dev.install b/debian/libkpathsea-dev.install
index 7172e6e..5a0eef6 100644
--- a/debian/libkpathsea-dev.install
+++ b/debian/libkpathsea-dev.install
@@ -1,5 +1,4 @@
usr/lib/libkpathsea.a
usr/lib/libkpathsea.so
-usr/lib/kpathsea/*
usr/lib/pkgconfig/kpathsea.pc
usr/include/kpathsea/*
diff --git a/debian/patches/remove-libdir-from-kpathsea-pkgconfig b/debian/patches/remove-libdir-from-kpathsea-pkgconfig
new file mode 100644
index 0000000..e3e49b6
--- /dev/null
+++ b/debian/patches/remove-libdir-from-kpathsea-pkgconfig
@@ -0,0 +1,15 @@
+We move c-auto.h from /usr/lib/kpathsea back to /usr/include/kpathsea,
+so there is no need tp have -I/usr/lib included in the cflags
+---
+ texk/kpathsea/kpathsea.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- texlive-bin.orig/texk/kpathsea/kpathsea.pc.in
++++ texlive-bin/texk/kpathsea/kpathsea.pc.in
+@@ -7,5 +7,5 @@
+ Description: Kpathsea filename lookup library
+ Version: @KPSEVERSION@
+ Libs: -L${libdir} -lkpathsea
+-Cflags: -I${libdir} -I${includedir}
++Cflags: -I${includedir}
+
diff --git a/debian/patches/series b/debian/patches/series
index a3b940c..9d1d52b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ ac-ctie
libpng-arm64-neon-fix
mktexlsr-use-mktemp
dvihp-use-mktemp
+remove-libdir-from-kpathsea-pkgconfig
diff --git a/debian/rules b/debian/rules
index e24492c..220be0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -165,6 +165,10 @@ override_dh_install:
# remove .la files which we do not install, so that dh_install
# can work with --fail-missing
rm -f debian/tmp/usr/lib/*.la
+ # mv c-auto.h back into /usr/include/kpathsea
+ # we don't support this kind of arch-separation by now
+ mv debian/tmp/usr/lib/kpathsea/c-auto.h debian/tmp/usr/include/kpathsea/
+ rmdir debian/tmp/usr/lib/kpathsea
dh_install --fail-missing --sourcedir=$(CURDIR)/debian/tmp
# replace xdvi wrapper shell script with perl variant to
# allow for opening of gz etc files
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texlive-bin.git
Reply to: