[SCM] Debian packaging of texlive-bin) branch, master, updated. debian/2013.20130722.31261-1-6-g6e1e1b3
The following commit has been merged in the master branch:
commit 3972a5756e80bccb4d0951847b3ff6a44307e591
Author: Norbert Preining <preining@debian.org>
Date: Mon Jul 29 11:15:17 2013 +0900
harfbuzz system lib
* update make-orig-tar to use last-changed-rev svn number for
the last number in the version string
* switch to system harfbuzz library (Closes: #717962)
- remove halfbuzz library from source
- add build dependency on libharfbuzz-dev >= 0.9.18-3
- adjust debian/rules to build with system-harfbuzz
diff --git a/debian/changelog b/debian/changelog
index 40daf5d..1445bcc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+texlive-bin (2013.20130729.30973-1) unstable; urgency=low
+
+ * update make-orig-tar to use last-changed-rev svn number for
+ the last number in the version string
+ * switch to system harfbuzz library (Closes: #717962)
+ - remove halfbuzz library from source
+ - add build dependency on libharfbuzz-dev >= 0.9.18-3
+ - adjust debian/rules to build with system-harfbuzz
+
+ -- Norbert Preining <preining@debian.org> Mon, 29 Jul 2013 11:29:57 +0900
+
texlive-bin (2013.20130722.31261-1) unstable; urgency=low
* allow for different origin in make-orig-tar
diff --git a/debian/control b/debian/control
index 40a2271..935607e 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, 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), libharfbuzz-dev (>= 0.9.18-3), libicu-dev, recode
Standards-Version: 3.9.4
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 6edd663..7a86e55 100644
--- a/debian/make-orig-tar
+++ b/debian/make-orig-tar
@@ -6,7 +6,7 @@ else
fi
baseyear=2013
-svni=$(cd $svnroot ; svn info | grep ^Revision | awk '{print$2}')
+svni=$(cd $svnroot ; svn info | grep "^Last Changed Rev" | awk '{print$4}')
verstr=texlive-bin-$baseyear.`date +%Y%m%d`.$svni
pkgstr=texlive-bin_$baseyear.`date +%Y%m%d`.$svni
@@ -20,10 +20,8 @@ rm -rf $verstr/inst
rm -rf $verstr/Work
rm -rf $verstr/utils/biber/bin
#
-# 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
+# remove system libraries, keep only teckit
+for i in harfbuzz 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 967da34..41ffe74 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,6 +48,7 @@ override_dh_auto_configure:
--with-system-xpdf \
--with-system-poppler \
--with-system-graphite2 \
+ --with-system-harfbuzz \
--with-system-libgs \
--with-system-cairo \
--with-system-pixman \
--
Debian packaging of texlive-bin)
Reply to: