[SCM] Debian packaging of texlive-bin) branch, master, updated. upstream/2012.20120628-18-g8823373
The following commit has been merged in the master branch:
commit 427176c133b887758cd7ba197b75cd466c24f490
Author: Norbert Preining <preining@debian.org>
Date: Tue Nov 20 07:36:24 2012 +0900
remove quilt from build deps
add libgs-dev for dvisvgm support, add config entry
merge new unstable changelog
remove icu-build-fix, included in upstream source
diff --git a/debian/changelog b/debian/changelog
index 74d467d..0d01e2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+texlive-bin (2012.20121112-1) UNRELEASED; urgency=low
+
+ * new upstream build for testing
+
+ -- Norbert Preining <preining@debian.org> Mon, 12 Nov 2012 07:48:24 +0900
+
+texlive-bin (2012.20120628-4) unstable; urgency=low
+
+ * add build-dependency on libgs-dev to support PostScript in dvisvgm
+
+ -- Norbert Preining <preining@debian.org> Tue, 20 Nov 2012 07:44:11 +0900
+
texlive-bin (2012.20120628-3) unstable; urgency=low
* fix too short name space for cweave (original file has this fix
diff --git a/debian/control b/debian/control
index 11c2654..2db5057 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, ed, libncurses5-dev | libncurses-dev, libxaw7-dev, libpng-dev, zlib1g-dev | libz-dev, libgd2-xpm-dev | libgd2-noxpm-dev, flex, bison, libpoppler-private-dev (>= 0.12.4), libfontconfig1-dev, dh-autoreconf, time, libgraphite-dev (>= 1:2.3.1), quilt
+Build-Depends: debhelper (>= 7.0.50~), sharutils, ed, libncurses5-dev | libncurses-dev, libxaw7-dev, libpng-dev, zlib1g-dev | libz-dev, libgd2-xpm-dev | libgd2-noxpm-dev, flex, bison, libpoppler-private-dev (>= 0.12.4), libfontconfig1-dev, dh-autoreconf, time, libgraphite-dev (>= 1:2.3.1), libgs-dev
Standards-Version: 3.9.3
Homepage: http://www.tug.org/texlive/
diff --git a/debian/patches/icu-build-fix b/debian/patches/icu-build-fix
deleted file mode 100644
index dca14be..0000000
--- a/debian/patches/icu-build-fix
+++ /dev/null
@@ -1,77 +0,0 @@
----
- libs/icu/icu-50.1/common/unicode/platform.h | 4 ++--
- libs/icu/icu-50.1/common/unicode/umachine.h | 10 +++++-----
- libs/icu/icu-50.1/common/unicode/ustring.h | 2 +-
- libs/icu/icu-50.1/test/intltest/strtest.cpp | 4 ++--
- 4 files changed, 10 insertions(+), 10 deletions(-)
-
---- libs/icu/icu-50.1/test/intltest/strtest.cpp.orig
-+++ libs/icu/icu-50.1/test/intltest/strtest.cpp
-@@ -1,6 +1,6 @@
- /********************************************************************
- * COPYRIGHT:
-- * Copyright (c) 1997-2011, International Business Machines Corporation and
-+ * Copyright (c) 1997-2012, International Business Machines Corporation and
- * others. All Rights Reserved.
- ********************************************************************/
- /* file name: strtest.cpp
-@@ -94,7 +94,7 @@
- void
- StringTest::Test_U_STRING() {
- U_STRING_INIT(ustringVar, "aZ0 -", 5);
-- if( sizeof(ustringVar)/sizeof(*ustringVar)!=6 ||
-+ if( u_strlen(ustringVar)!=5 ||
- ustringVar[0]!=0x61 ||
- ustringVar[1]!=0x5a ||
- ustringVar[2]!=0x30 ||
---- libs/icu/icu-50.1/common/unicode/platform.h.orig
-+++ libs/icu/icu-50.1/common/unicode/platform.h
-@@ -664,9 +664,9 @@
- * does not support u"abc" string literals.
- * gcc 4.4 defines the __CHAR16_TYPE__ macro to a usable type but
- * does not support u"abc" string literals.
-- * C++11 requires support for UTF-16 literals
-+ * C++11 and C11 require support for UTF-16 literals
- */
--# if (defined(__cplusplus) && __cplusplus >= 201103L)
-+# if (defined(__cplusplus) && __cplusplus >= 201103L) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L)
- # define U_HAVE_CHAR16_T 1
- # else
- # define U_HAVE_CHAR16_T 0
---- libs/icu/icu-50.1/common/unicode/ustring.h.orig
-+++ libs/icu/icu-50.1/common/unicode/ustring.h
-@@ -939,7 +939,7 @@
- * @stable ICU 2.0
- */
- #if defined(U_DECLARE_UTF16)
--# define U_STRING_DECL(var, cs, length) static const UChar var[(length)+1]=U_DECLARE_UTF16(cs)
-+# define U_STRING_DECL(var, cs, length) static const UChar *var=(const UChar *)U_DECLARE_UTF16(cs)
- /**@stable ICU 2.0 */
- # define U_STRING_INIT(var, cs, length)
- #elif U_SIZEOF_WCHAR_T==U_SIZEOF_UCHAR && (U_CHARSET_FAMILY==U_ASCII_FAMILY || (U_SIZEOF_UCHAR == 2 && defined(U_WCHAR_IS_UTF16)))
---- libs/icu/icu-50.1/common/unicode/umachine.h.orig
-+++ libs/icu/icu-50.1/common/unicode/umachine.h
-@@ -256,7 +256,7 @@
-
- /**
- * \var UChar
-- * Define UChar to be char16_t, if available,
-+ * Define UChar to be UCHAR_TYPE, if that is #defined (for example, to char16_t),
- * or wchar_t if that is 16 bits wide; always assumed to be unsigned.
- * If neither is available, then define UChar to be uint16_t.
- *
-@@ -266,10 +266,10 @@
- *
- * @stable ICU 4.4
- */
--
--/* Define UChar to be compatible with char16_t or wchar_t if possible. */
--#if U_HAVE_CHAR16_T
-- typedef char16_t UChar;
-+#if defined(UCHAR_TYPE)
-+ typedef UCHAR_TYPE UChar;
-+/* Not #elif U_HAVE_CHAR16_T -- because that is type-incompatible with pre-C++11 callers
-+ typedef char16_t UChar; */
- #elif U_SIZEOF_WCHAR_T==2
- typedef wchar_t UChar;
- #elif defined(__CHAR16_TYPE__)
diff --git a/debian/patches/series b/debian/patches/series
index 44afa4a..e8966ea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,4 +14,3 @@ pmpost-20121106-tl12
pmpost-svg-20120119-tl11.diff
debian-updmap-man
xdvi-upupstream-fixes
-icu-build-fix -p0
diff --git a/debian/rules b/debian/rules
index 794f696..7db817b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,6 +45,7 @@ override_dh_auto_configure:
--with-system-xpdf \
--with-system-poppler \
--with-system-graphite \
+ --with-system-libgs \
--with-freetype2-include=/usr/include/freetype2 \
--with-x \
--with-mf-x-toolkit \
--
Debian packaging of texlive-bin)
Reply to: