[texlive-bin] 12/13: simplify sfconv patch, keep teckit-compile, prepare release changelog
This is an automated email from the git hooks/post-receive script.
preining pushed a commit to branch master
in repository texlive-bin.
commit eeacdea6f091067057a78860a07571923e9c19f8
Author: Norbert Preining <preining@debian.org>
Date: Wed Jan 11 13:29:32 2017 +0900
simplify sfconv patch, keep teckit-compile, prepare release changelog
---
debian/changelog | 4 +-
debian/patches/teckit-dont-build-sfconv | 65 +++++----------------------------
2 files changed, 11 insertions(+), 58 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1c0a8e8..d2a2dcc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-texlive-bin (2016.20160513.41080.dfsg-1~1) UNRELEASED; urgency=medium
+texlive-bin (2016.20160513.41080.dfsg-1) unstable; urgency=medium
* drop SFConv from upstream tarball as it contains non-free files
* cherrypick several upstream fixes:
@@ -10,7 +10,7 @@ texlive-bin (2016.20160513.41080.dfsg-1~1) UNRELEASED; urgency=medium
- drop old SDE support, replaced by luatex internal mode
* fix five man-page lintian warnings
- -- Norbert Preining <preining@debian.org> Mon, 09 Jan 2017 23:09:51 +0900
+ -- Norbert Preining <preining@debian.org> Wed, 11 Jan 2017 13:29:14 +0900
texlive-bin (2016.20160513.41080-8) unstable; urgency=medium
diff --git a/debian/patches/teckit-dont-build-sfconv b/debian/patches/teckit-dont-build-sfconv
index 4e54879..88ac123 100644
--- a/debian/patches/teckit-dont-build-sfconv
+++ b/debian/patches/teckit-dont-build-sfconv
@@ -1,61 +1,14 @@
-SFConv has been removed due to unclear license status,
-make sure that we do not try to build sfconv.
-Patch by Julian Gilbey
---
- libs/teckit/Makefile.am | 22 +++++++++++-----------
- libs/teckit/TECkit-src/Makefile.am | 2 +-
- 2 files changed, 12 insertions(+), 12 deletions(-)
+ libs/teckit/TECkit-src/bin/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
---- texlive-bin.orig/libs/teckit/Makefile.am
-+++ texlive-bin/libs/teckit/Makefile.am
-@@ -22,18 +22,18 @@
- AM_CFLAGS = $(WARNING_CFLAGS)
- AM_CXXFLAGS = $(WARNING_CXXFLAGS)
-
--bin_PROGRAMS = teckit_compile
-+# bin_PROGRAMS = teckit_compile
-
- noinst_LIBRARIES = libTECkit_Compiler.a libTECkit.a
-
- # teckit_compile
- #
--nodist_teckit_compile_SOURCES = \
-- @TECKIT_TREE@/source/Sample-tools/TECkit_Compile.cpp
--
--teckit_compile_LDADD = libTECkit_Compiler.a $(ZLIB_LIBS)
--
--$(teckit_compile_OBJECTS): libTECkit_Compiler.a
-+# nodist_teckit_compile_SOURCES = \
-+# @TECKIT_TREE@/source/Sample-tools/TECkit_Compile.cpp
-+#
-+# teckit_compile_LDADD = libTECkit_Compiler.a $(ZLIB_LIBS)
-+#
-+# $(teckit_compile_OBJECTS): libTECkit_Compiler.a
-
- # libTECkit_Compiler.a and libTECkit.a
- #
-@@ -50,10 +50,10 @@
-
- ## Tests
- ##
--if build
--TESTS = teckit.test
--endif build
--teckit.log: teckit_compile$(EXEEXT)
-+# if build
-+# TESTS = teckit.test
-+# endif build
-+# teckit.log: teckit_compile$(EXEEXT)
-
- EXTRA_DIST += \
- teckit.test \
---- texlive-bin.orig/libs/teckit/TECkit-src/Makefile.am
-+++ texlive-bin/libs/teckit/TECkit-src/Makefile.am
+--- texlive-bin.orig/libs/teckit/TECkit-src/bin/Makefile.am
++++ texlive-bin/libs/teckit/TECkit-src/bin/Makefile.am
@@ -1,6 +1,6 @@
- ACLOCAL_AMFLAGS = -I m4
+ AUTOMAKE_OPTIONS = -Wno-portability
+
+-bin_PROGRAMS = teckit_compile txtconv sfconv
++bin_PROGRAMS = teckit_compile txtconv
--SUBDIRS = lib bin docs test
-+SUBDIRS = lib
+ AM_CPPFLAGS = -I$(top_srcdir)/source/Public-headers
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = teckit.pc
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texlive-bin.git
Reply to: