[SCM] Debian packaging of texlive-bin) branch, master, updated. debian/2012.20121120-1-8-ga0e6add
The following commit has been merged in the master branch:
commit a0e6add9d8f55941a8f1ea6953fa3157c6045fe9
Author: Norbert Preining <preining@debian.org>
Date: Sun Nov 25 14:22:33 2012 +0900
compile fixes
diff --git a/debian/changelog b/debian/changelog
index d10f36c..f4692b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-texlive-bin (2012.20121124-1) UNRELEASED; urgency=low
+texlive-bin (2012.20121124-1) experimental; urgency=low
* depend on texlive-common >= 2012.20121120 to prohibit partial
update of only texlive-binaries (Closes: #694126)
- -- Norbert Preining <preining@debian.org> Sat, 24 Nov 2012 21:14:08 +0900
+ -- Norbert Preining <preining@debian.org> Sun, 25 Nov 2012 14:22:09 +0900
texlive-bin (2012.20121120-1) experimental; urgency=low
diff --git a/debian/patches/series b/debian/patches/series
index 6eb464c..f4c2cbc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ debian-no-linked-scripts
pmpost-20121106-tl12
pmpost-svg-20120119-tl11.diff
xdvi-upupstream-fixes
+temporary-poppler-fix
diff --git a/debian/patches/temporary-poppler-fix b/debian/patches/temporary-poppler-fix
new file mode 100644
index 0000000..70c955b
--- /dev/null
+++ b/debian/patches/temporary-poppler-fix
@@ -0,0 +1,16 @@
+---
+ m4/kpse-poppler-flags.m4 | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- texlive-bin.orig/m4/kpse-poppler-flags.m4
++++ texlive-bin/m4/kpse-poppler-flags.m4
+@@ -34,7 +34,8 @@
+ AC_DEFUN([KPSE_POPPLER_SYSTEM_FLAGS],
+ [AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl
+ if $PKG_CONFIG poppler --atleast-version=0.18; then
+- POPPLER_INCLUDES=`$PKG_CONFIG poppler --cflags`
++ POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"'
++ POPPLER_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`"
+ POPPLER_LIBS=`$PKG_CONFIG poppler --libs`
+ elif test "x$need_poppler:$with_system_poppler" = xyes:yes; then
+ AC_MSG_ERROR([did not find poppler-0.18 or better])
--
Debian packaging of texlive-bin)
Reply to: