[SCM] Debian packaging of texlive-bin) branch, master, updated. debian/2013.20130523.30626-1-11-gdd5814c
The following commit has been merged in the master branch:
commit 655a0d0d4c1df50b5c4e450be37254fec55e7267
Author: Norbert Preining <preining@debian.org>
Date: Wed May 29 10:02:28 2013 +0900
go back to include harfbuzz lib
diff --git a/debian/changelog b/debian/changelog
index 0e8e2e0..741cf09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,7 +11,7 @@ texlive-bin (2013.20130528.30744-1) UNRELEASED; urgency=low
- dvips does not crash on input == output (Closes: #703212)
* upstream fix to luatex libio
- -- Norbert Preining <preining@debian.org> Tue, 28 May 2013 14:45:27 +0900
+ -- Norbert Preining <preining@debian.org> Wed, 29 May 2013 10:02:20 +0900
texlive-bin (2013.20130523.30626-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index e49a279..890b0a1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: tex
Priority: optional
Maintainer: Debian TeX Maintainers <debian-tex-maint@lists.debian.org>
Uploaders: Norbert Preining <preining@debian.org>, Frank Küster <frank@kuesterei.ch>
-Build-Depends: debhelper (>= 7.0.50~), sharutils, libncurses5-dev | libncurses-dev, libxaw7-dev, libpng-dev, zlib1g-dev | libz-dev, flex, bison, libpoppler-private-dev (>= 0.12.4), libfontconfig1-dev, dh-autoreconf, time, libgraphite2-dev, libgs-dev, libcairo2-dev (>= 1.12), libpixman-1-dev (>= 0.18), libzzip-dev (>= 0.12), libicu-dev, libharfbuzz-dev (>> 0.9.17-4), recode
+Build-Depends: debhelper (>= 7.0.50~), sharutils, libncurses5-dev | libncurses-dev, libxaw7-dev, libpng-dev, zlib1g-dev | libz-dev, flex, bison, libpoppler-private-dev (>= 0.12.4), libfontconfig1-dev, dh-autoreconf, time, libgraphite2-dev, libgs-dev, libcairo2-dev (>= 1.12), libpixman-1-dev (>= 0.18), libzzip-dev (>= 0.12), libicu-dev, recode
Standards-Version: 3.9.3
Homepage: http://www.tug.org/texlive/
Vcs-Git: git://anonscm.debian.org/debian-tex/texlive-bin.git
diff --git a/debian/make-orig-tar b/debian/make-orig-tar
index 2ee43de..f42a820 100644
--- a/debian/make-orig-tar
+++ b/debian/make-orig-tar
@@ -17,8 +17,10 @@ rm -rf $verstr/inst
rm -rf $verstr/Work
rm -rf $verstr/utils/biber/bin
#
-# remove system libraries, keep only teckit
-for i in cairo freetype freetype2 gd graphite2 harfbuzz icu libpng pixman poppler t1lib xpdf zlib zziplib ; do
+# remove system libraries, keep only teckit and harfbuzz
+# harfbuzz is needed as harfbuzz is not linked against graphite2
+# so xetex building breaks with system harfbuzz libs
+for i in cairo freetype freetype2 gd graphite2 icu libpng pixman poppler t1lib xpdf zlib zziplib ; do
rm -rf $verstr/libs/$i
done
find $verstr -name \.svn -exec rm -rf '{}' \;
diff --git a/debian/rules b/debian/rules
index 2de3b6a..967da34 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,7 +53,6 @@ override_dh_auto_configure:
--with-system-pixman \
--with-system-zziplib \
--with-system-icu \
- --with-system-harfbuzz \
--with-freetype2-include=/usr/include/freetype2 \
--with-x \
--with-mf-x-toolkit \
--
Debian packaging of texlive-bin)
Reply to: