[SCM] Debian packaging of texlive-bin) branch, master, updated. debian/2012.20121124-1-9-gd43a742
The following commit has been merged in the master branch:
commit 9b85344681fe5a76ec9351ca85ef64c9febcb7c2
Author: Norbert Preining <preining@logic.at>
Date: Fri Mar 15 15:54:38 2013 +0900
update patches, remove outdated
diff --git a/debian/patches/60_unneeded_linking b/debian/patches/60_unneeded_linking
index e74c486..373b131 100644
--- a/debian/patches/60_unneeded_linking
+++ b/debian/patches/60_unneeded_linking
@@ -1,7 +1,11 @@
-diff -urN texlive-bin-2011.20120307.orig/texk/web2c/am/texmf.am texlive-bin-2011.20120307/texk/web2c/am/texmf.am
---- texlive-bin-2011.20120307.orig/texk/web2c/am/texmf.am 2011-10-04 17:41:38.000000000 +0200
-+++ texlive-bin-2011.20120307/texk/web2c/am/texmf.am 2012-03-19 23:23:22.839876903 +0100
-@@ -139,7 +139,7 @@
+---
+ texk/web2c/am/texmf.am | 2 +-
+ texk/xdvik/common.am | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+--- texlive-bin.orig/texk/web2c/am/texmf.am
++++ texlive-bin/texk/web2c/am/texmf.am
+@@ -137,7 +137,7 @@
# All the x_... and X_... variables will be empty if we aren't supporting X.
# Follow the library order used in X11R6 itself:
# -lXaw -lXmu -lXt -lSM -lICE -lXext -lX11 (some may not be present).
@@ -10,9 +14,8 @@ diff -urN texlive-bin-2011.20120307.orig/texk/web2c/am/texmf.am texlive-bin-2011
endif !WIN32
## mf and mf-nowin compile mfextra.c with different CPPFLAGS.
-diff -urN texlive-bin-2011.20120307.orig/texk/xdvik/common.am texlive-bin-2011.20120307/texk/xdvik/common.am
---- texlive-bin-2011.20120307.orig/texk/xdvik/common.am 2009-04-27 17:51:44.000000000 +0200
-+++ texlive-bin-2011.20120307/texk/xdvik/common.am 2012-03-19 23:25:26.679879578 +0100
+--- texlive-bin.orig/texk/xdvik/common.am
++++ texlive-bin/texk/xdvik/common.am
@@ -16,8 +16,8 @@
## libXmu needs to come before Xt and after the toolkit libs.
x_ldflags = $(X_LIBS) $(x_linker_options) $(iconv_libpath)
diff --git a/debian/patches/debian-no-linked-scripts b/debian/patches/debian-no-linked-scripts
index 7478287..0a0b148 100644
--- a/debian/patches/debian-no-linked-scripts
+++ b/debian/patches/debian-no-linked-scripts
@@ -1,19 +1,14 @@
---
- texk/texlive/Makefile.am | 3 ++-
- texk/texlive/Makefile.in | 2 +-
- 2 files changed, 3 insertions(+), 2 deletions(-)
+ texk/texlive/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
-Index: texlive-bin-2011.20120226/texk/texlive/Makefile.am
-===================================================================
---- texlive-bin-2011.20120226.orig/texk/texlive/Makefile.am 2010-05-30 09:01:23.000000000 +0900
-+++ texlive-bin-2011.20120226/texk/texlive/Makefile.am 2012-02-29 09:54:14.936116949 +0900
-@@ -5,7 +5,8 @@
+--- texlive-bin.orig/texk/texlive/Makefile.am
++++ texlive-bin/texk/texlive/Makefile.am
+@@ -5,6 +5,7 @@
##
ACLOCAL_AMFLAGS = -I ../../m4
--SUBDIRS = context linked_scripts
-+#SUBDIRS = context linked_scripts
-+SUBDIRS =
++#SUBDIRS = tl_scripts context linked_scripts
+ SUBDIRS = tl_scripts context linked_scripts
- ## Windows wrapper
- ##
+ ## Windows wrapper sources.
diff --git a/debian/patches/pmpost-20121106-tl12 b/debian/patches/pmpost-20121106-tl12
index bb138d8..e59e9ca 100644
--- a/debian/patches/pmpost-20121106-tl12
+++ b/debian/patches/pmpost-20121106-tl12
@@ -23,7 +23,7 @@
% interactive `e' option. %d is replaced by the line number and %s by
--- texlive-bin.orig/texk/web2c/Makefile.am
+++ texlive-bin/texk/web2c/Makefile.am
-@@ -155,6 +155,9 @@
+@@ -177,6 +177,9 @@
## MetaPost
include $(srcdir)/mplibdir/am/mplib.am
@@ -40,12 +40,12 @@
[[luatex], [yes], [], [luaTeX], [poppler libpng zziplib]],
[[mp], [yes], [], [MetaPost],[libpng]],
+[[pmp], [yes], [], [pMetaPost],[libpng]],
- [[xetex], [yes], [yes], [XeTeX], [poppler libpng freetype2 icu-xetex teckit graphite]],
+ [[xetex], [yes], [yes], [XeTeX], [poppler libpng freetype2 icu teckit graphite2 harfbuzz]],
])[]dnl
m4_foreach([Kpse_Prog], [kpse_tex_progs],
--- texlive-bin.orig/texk/web2c/configure.ac
+++ texlive-bin/texk/web2c/configure.ac
-@@ -195,6 +195,7 @@
+@@ -198,6 +198,7 @@
[KPSE_MFWIN_DEFINE(Kpse_Win)])])[]dnl
AM_CONDITIONAL([MP], [test "x$enable_mp" != xno])
diff --git a/debian/patches/series b/debian/patches/series
index f4c2cbc..6eb464c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,3 @@ 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
deleted file mode 100644
index 70c955b..0000000
--- a/debian/patches/temporary-poppler-fix
+++ /dev/null
@@ -1,16 +0,0 @@
----
- 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: