[SCM] Debian packaging of texlive-bin) branch, master, updated. debian/2012.20121120-1-8-ga0e6add
The following commit has been merged in the master branch:
commit ed0275e9475cb86bb7589c2496f7695665d6a66e
Author: Norbert Preining <preining@debian.org>
Date: Sat Nov 24 21:13:28 2012 +0900
import sources from 20121124
diff --git a/README.hacking b/README.hacking
index e89d473..bd5a90e 100644
--- a/README.hacking
+++ b/README.hacking
@@ -14,7 +14,7 @@ them with configure --prefix=/usr/local/gnu and having
autoconf (GNU Autoconf) 2.69
-automake (GNU automake) 1.12.4
+automake (GNU automake) 1.12.5
ltmain.sh (GNU libtool) 2.4.2
diff --git a/debian/changelog b/debian/changelog
index 611c600..d10f36c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-texlive-bin (2012.20121120-2) UNRELEASED; urgency=low
+texlive-bin (2012.20121124-1) UNRELEASED; urgency=low
* depend on texlive-common >= 2012.20121120 to prohibit partial
update of only texlive-binaries (Closes: #694126)
- -- Norbert Preining <preining@debian.org> Sat, 24 Nov 2012 20:48:41 +0900
+ -- Norbert Preining <preining@debian.org> Sat, 24 Nov 2012 21:14:08 +0900
texlive-bin (2012.20121120-1) experimental; urgency=low
diff --git a/m4/ChangeLog b/m4/ChangeLog
index 90a04b9..d617e2f 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * kpse-poppler-flags.m4: Require poppler-0.18 or better.
+
2012-10-19 Peter Breitenlohner <peb@mppmu.mpg.de>
* kpse-poppler-flags.m4 [WIN32]: Add '-lgdi32' to POPPLER_LIBS.
diff --git a/m4/kpse-poppler-flags.m4 b/m4/kpse-poppler-flags.m4
index 029e495..4e3823f 100644
--- a/m4/kpse-poppler-flags.m4
+++ b/m4/kpse-poppler-flags.m4
@@ -33,11 +33,10 @@ AC_DEFUN([KPSE_POPPLER_OPTIONS],
# ----------------------
AC_DEFUN([KPSE_POPPLER_SYSTEM_FLAGS],
[AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl
-if $PKG_CONFIG poppler --atleast-version=0.12; then
- POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"'
- POPPLER_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`"
+if $PKG_CONFIG poppler --atleast-version=0.18; then
+ POPPLER_INCLUDES=`$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.12 or better])
+ AC_MSG_ERROR([did not find poppler-0.18 or better])
fi
]) # KPSE_POPPLER_SYSTEM_FLAGS
diff --git a/texk/afm2pl/ChangeLog b/texk/afm2pl/ChangeLog
index f6490ed..72805e3 100644
--- a/texk/afm2pl/ChangeLog
+++ b/texk/afm2pl/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-03-12 Peter Breitenlohner <peb@mppmu.mpg.de>
* afm2pl.c (readargs): Correct the fdims array size (3 => 5).
diff --git a/texk/afm2pl/Makefile.am b/texk/afm2pl/Makefile.am
index 93e246a..426f752 100644
--- a/texk/afm2pl/Makefile.am
+++ b/texk/afm2pl/Makefile.am
@@ -1,11 +1,11 @@
## Makefile.am for the TeX Live subdirectory texk/afm2pl/
##
-## Copyright (C) 2009, 2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = $(KPATHSEA_INCLUDES)
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES)
AM_CFLAGS = $(WARNING_CFLAGS)
bin_PROGRAMS = afm2pl
diff --git a/texk/bibtex8/ChangeLog b/texk/bibtex8/ChangeLog
index c530050..cabfb1a 100644
--- a/texk/bibtex8/ChangeLog
+++ b/texk/bibtex8/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-10-11 Peter Breitenlohner <peb@mppmu.mpg.de>
* utils.c (c8read_csf): DEFAULT_BIBTEX_CSFILE is set to
diff --git a/texk/bibtex8/Makefile.am b/texk/bibtex8/Makefile.am
index fff0056..1456cf1 100644
--- a/texk/bibtex8/Makefile.am
+++ b/texk/bibtex8/Makefile.am
@@ -1,12 +1,11 @@
## Makefile.am for the TeX Live subdirectory texk/bibtex8/
##
-## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DUNIX -DKPATHSEA -DSUPPORT_8BIT
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA -DSUPPORT_8BIT
AM_CFLAGS = $(WARNING_CFLAGS)
bin_PROGRAMS = bibtex8
diff --git a/texk/bibtexu/ChangeLog b/texk/bibtexu/ChangeLog
index 6415649..1df017a 100644
--- a/texk/bibtexu/ChangeLog
+++ b/texk/bibtexu/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-10-11 Peter Breitenlohner <peb@mppmu.mpg.de>
* utils.c (c8read_csf): DEFAULT_BIBTEX_CSFILE is set to
diff --git a/texk/bibtexu/Makefile.am b/texk/bibtexu/Makefile.am
index 8c5c029..395d959 100644
--- a/texk/bibtexu/Makefile.am
+++ b/texk/bibtexu/Makefile.am
@@ -1,12 +1,11 @@
## Makefile.am for the TeX Live subdirectory texk/bibtexu/
##
-## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = $(KPATHSEA_INCLUDES) $(ICU_INCLUDES)
-AM_CPPFLAGS = -DUNIX -DKPATHSEA -DSUPPORT_8BIT
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) $(ICU_INCLUDES) -DUNIX -DKPATHSEA -DSUPPORT_8BIT
AM_CFLAGS = $(WARNING_CFLAGS)
bin_PROGRAMS = bibtexu
diff --git a/texk/cjkutils/ChangeLog b/texk/cjkutils/ChangeLog
index bcce343..5159d68 100644
--- a/texk/cjkutils/ChangeLog
+++ b/texk/cjkutils/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-05-11 Peter Breitenlohner <peb@mppmu.mpg.de>
Import cjk-4.8.3/utils as cjkutils-4.8.3.
diff --git a/texk/cjkutils/Makefile.am b/texk/cjkutils/Makefile.am
index 092205f..7b227c4 100644
--- a/texk/cjkutils/Makefile.am
+++ b/texk/cjkutils/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory texk/cjkutils/
##
-## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
@@ -26,8 +26,7 @@ config.force: $(KPATHSEA_DEPEND)
DISTCLEANFILES = config.force
-INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = $(XX_CPPFLAGS)
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) $(XX_CPPFLAGS)
AM_CFLAGS = $(XX_CFLAGS)
bin_PROGRAMS = \
@@ -43,7 +42,7 @@ hbf2gf_SOURCES = \
$(CJKUTILS_TREE)/hbf2gf/hbf.c \
$(CJKUTILS_TREE)/hbf2gf/hbf.h \
hbf2gf.c
-hbf2gf_CPPFLAGS = -I$(srcdir)/$(CJKUTILS_TREE)/hbf2gf -Dunix -DHAVE_LIBKPATHSEA $(AM_CPPFLAGS)
+hbf2gf_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/$(CJKUTILS_TREE)/hbf2gf -Dunix -DHAVE_LIBKPATHSEA
hbf2gf_DEPENDENCIES = $(KPATHSEA_DEPEND)
hbf2gf_LDADD = $(KPATHSEA_LIBS)
@@ -73,7 +72,7 @@ gbklatex_DEPENDENCIES = $(KPATHSEA_DEPEND)
gbklatex_LDADD = $(KPATHSEA_LIBS)
gbkpdflatex_SOURCES = $(gbklatex_SOURCES)
-gbkpdflatex_CPPFLAGS = -DLATEX=\"pdflatex\" $(AM_CPPFLAGS)
+gbkpdflatex_CPPFLAGS = $(AM_CPPFLAGS) -DLATEX=\"pdflatex\"
gbkpdflatex_DEPENDENCIES = $(gbklatex_DEPENDENCIES)
gbkpdflatex_LDADD = $(gbklatex_LDADD)
diff --git a/texk/detex/ChangeLog b/texk/detex/ChangeLog
index d836e48..b344a87 100644
--- a/texk/detex/ChangeLog
+++ b/texk/detex/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2010-09-24 Peter Breitenlohner <peb@mppmu.mpg.de>
* Remove detex-2.7/ and detex-2.7-PATCHES/.
diff --git a/texk/detex/Makefile.am b/texk/detex/Makefile.am
index f24df27..c4030b4 100644
--- a/texk/detex/Makefile.am
+++ b/texk/detex/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory texk/detex/
##
-## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
@@ -14,8 +14,7 @@ EXTRA_DIST += $(DETEX_TREE)-PATCHES
dist-hook:
rm -rf `find $(distdir) -name .svn`
-INCLUDES = -I$(top_srcdir)/$(DETEX_TREE) $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DNO_MALLOC_DECL -DKPATHSEA -Dlint
+AM_CPPFLAGS = -I$(top_srcdir)/$(DETEX_TREE) $(KPATHSEA_INCLUDES) -DNO_MALLOC_DECL -DKPATHSEA -Dlint
AM_CFLAGS = $(WARNING_CFLAGS)
## The Makefile.in from 2002 by Thomas Esser applied the sed script
diff --git a/texk/dvi2tty/ChangeLog b/texk/dvi2tty/ChangeLog
index ae7990f..678d52c 100644
--- a/texk/dvi2tty/ChangeLog
+++ b/texk/dvi2tty/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-04-25 Peter Breitenlohner <peb@mppmu.mpg.de>
* dvi2tty.test: Add a copyright statement.
diff --git a/texk/dvi2tty/Makefile.am b/texk/dvi2tty/Makefile.am
index d1aa8df..c630487 100644
--- a/texk/dvi2tty/Makefile.am
+++ b/texk/dvi2tty/Makefile.am
@@ -17,8 +17,7 @@ EXTRA_DIST += $(DVI2TTY_TREE)-PATCHES
dist-hook:
rm -rf `find $(distdir) -name .svn`
-INCLUDES = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DKPATHSEA
+AM_CPPFLAGS = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES) -DKPATHSEA
AM_CFLAGS = $(WARNING_CFLAGS)
LDADD = $(KPATHSEA_LIBS)
diff --git a/texk/dvidvi/ChangeLog b/texk/dvidvi/ChangeLog
index 805c942..6a0f52d 100644
--- a/texk/dvidvi/ChangeLog
+++ b/texk/dvidvi/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-05-29 Peter Breitenlohner <peb@mppmu.mpg.de>
* dvidvi.c: Drop the problematic prototype for isatty(),
diff --git a/texk/dvidvi/Makefile.am b/texk/dvidvi/Makefile.am
index 9083f8f..7388162 100644
--- a/texk/dvidvi/Makefile.am
+++ b/texk/dvidvi/Makefile.am
@@ -1,12 +1,11 @@
## Makefile.am for the TeX Live subdirectory texk/dvidvi/
##
-## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DKPATHSEA -DUNIX
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DKPATHSEA -DUNIX
AM_CFLAGS = $(WARNING_CFLAGS)
bin_PROGRAMS = dvidvi
diff --git a/texk/dviljk/ChangeLog b/texk/dviljk/ChangeLog
index a70c472..ed9cc7b 100644
--- a/texk/dviljk/ChangeLog
+++ b/texk/dviljk/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-10-03 Peter Breitenlohner <peb@mppmu.mpg.de>
* dvi2xx.c [WIN32]: Avoid segmentation fault for missing WINDIR.
diff --git a/texk/dviljk/Makefile.am b/texk/dviljk/Makefile.am
index b875ff9..0a4a67f 100644
--- a/texk/dviljk/Makefile.am
+++ b/texk/dviljk/Makefile.am
@@ -1,12 +1,11 @@
## Makefile.am for the TeX Live subdirectory texk/dviljk/
##
-## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DKPATHSEA
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DKPATHSEA
AM_CFLAGS = $(WARNING_CFLAGS)
noinst_LIBRARIES = libdvilj.a
@@ -32,19 +31,19 @@ dvi2xx_sources = \
dvi2xx.c \
dvi2xx.h
-dvilj_CPPFLAGS = -DKPATHSEA -DLJ
+dvilj_CPPFLAGS = $(AM_CPPFLAGS) -DLJ
dvilj_SOURCES = $(dvi2xx_sources)
$(dvilj_OBJECTS): libdvilj.a
-dvilj2p_CPPFLAGS = -DKPATHSEA -DLJ2P
+dvilj2p_CPPFLAGS = $(AM_CPPFLAGS) -DLJ2P
dvilj2p_SOURCES = $(dvi2xx_sources)
$(dvilj2p_OBJECTS): libdvilj.a
-dvilj4_CPPFLAGS = -DKPATHSEA -DLJ4
+dvilj4_CPPFLAGS = $(AM_CPPFLAGS) -DLJ4
dvilj4_SOURCES = $(dvi2xx_sources)
$(dvilj4_OBJECTS): libdvilj.a
-dvilj4l_CPPFLAGS = -DKPATHSEA -DLJ4 -DLJ4L
+dvilj4l_CPPFLAGS = $(AM_CPPFLAGS) -DLJ4 -DLJ4L
dvilj4l_SOURCES = $(dvi2xx_sources)
$(dvilj4l_OBJECTS): libdvilj.a
diff --git a/texk/dvipos/ChangeLog b/texk/dvipos/ChangeLog
index b6caa0e..bb015e2 100644
--- a/texk/dvipos/ChangeLog
+++ b/texk/dvipos/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-07-15 Peter Breitenlohner <peb@mppmu.mpg.de>
* dvipos.c: Pass program name string to kpse_set_program_name.
diff --git a/texk/dvipos/Makefile.am b/texk/dvipos/Makefile.am
index bda8a83..669740c 100644
--- a/texk/dvipos/Makefile.am
+++ b/texk/dvipos/Makefile.am
@@ -1,12 +1,11 @@
## Makefile.am for the TeX Live subdirectory texk/dvipos/
##
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DKPATHSEA
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DKPATHSEA
AM_CFLAGS = $(WARNING_CFLAGS)
bin_PROGRAMS = dvipos
diff --git a/texk/dvipsk/ChangeLog b/texk/dvipsk/ChangeLog
index eaca6c7..7f98191 100644
--- a/texk/dvipsk/ChangeLog
+++ b/texk/dvipsk/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-08-10 Peter Breitenlohner <peb@mppmu.mpg.de>
* ptexmac.h: Drop unused definition of M_PI & Co.
diff --git a/texk/dvipsk/Makefile.am b/texk/dvipsk/Makefile.am
index ce603d6..06814e0 100644
--- a/texk/dvipsk/Makefile.am
+++ b/texk/dvipsk/Makefile.am
@@ -7,8 +7,7 @@ ACLOCAL_AMFLAGS = -I ../../m4
SUBDIRS = squeeze
-INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DUNIX -DKPATHSEA -DSHIFTLOWCHARS
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA -DSHIFTLOWCHARS
AM_CFLAGS = $(WARNING_CFLAGS)
bin_PROGRAMS = afm2tfm dvips
diff --git a/texk/dvisvgm/ChangeLog b/texk/dvisvgm/ChangeLog
index 871fa5c..0bf85b0 100644
--- a/texk/dvisvgm/ChangeLog
+++ b/texk/dvisvgm/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-09-28 Peter Breitenlohner <peb@mppmu.mpg.de>
* Imported release 1.0.12.
diff --git a/texk/dvisvgm/Makefile.am b/texk/dvisvgm/Makefile.am
index 84fdede..31639ed 100644
--- a/texk/dvisvgm/Makefile.am
+++ b/texk/dvisvgm/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory texk/dvisvgm/
##
-## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
#************************************************************************
@@ -24,12 +24,12 @@ EXTRA_DIST += $(DVISVGM_TREE)-PATCHES
dist-hook:
rm -rf `find $(distdir) -name .svn`
-INCLUDES = -I$(top_srcdir)/$(DVISVGM_TREE)/src
-INCLUDES += -I$(top_srcdir)/$(DVISVGM_TREE)/potracelib
-INCLUDES += $(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES)
-INCLUDES += $(ZLIB_INCLUDES) $(LIBGS_INCLUDES)
+AM_CPPFLAGS = -I$(top_srcdir)/$(DVISVGM_TREE)/src
+AM_CPPFLAGS += -I$(top_srcdir)/$(DVISVGM_TREE)/potracelib
+AM_CPPFLAGS += $(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES)
+AM_CPPFLAGS += $(ZLIB_INCLUDES) $(LIBGS_INCLUDES)
if WIN32
-AM_CPPFLAGS = -DTEXLIVEWIN32
+AM_CPPFLAGS += -DTEXLIVEWIN32
endif WIN32
AM_CFLAGS = $(WARNING_CFLAGS)
AM_CXXFLAGS = $(WARNING_CXXFLAGS)
diff --git a/texk/gsftopk/ChangeLog b/texk/gsftopk/ChangeLog
index ba2bed9..9d55718 100644
--- a/texk/gsftopk/ChangeLog
+++ b/texk/gsftopk/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-10-17 Peter Breitenlohner <peb@mppmu.mpg.de>
* gsftopk.c: Avoid MSVC warning.
diff --git a/texk/gsftopk/Makefile.am b/texk/gsftopk/Makefile.am
index db3d151..dd79410 100644
--- a/texk/gsftopk/Makefile.am
+++ b/texk/gsftopk/Makefile.am
@@ -1,12 +1,11 @@
## Makefile.am for the TeX Live subdirectory texk/gsftopk/
##
-## Copyright (C) 2009, 2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DKPATHSEA -Dlint
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DKPATHSEA -Dlint
AM_CFLAGS = $(WARNING_CFLAGS)
bin_PROGRAMS = gsftopk
diff --git a/texk/kpathsea/ChangeLog b/texk/kpathsea/ChangeLog
index 8207f8d..ca38c16 100644
--- a/texk/kpathsea/ChangeLog
+++ b/texk/kpathsea/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-10-03 Peter Breitenlohner <peb@mppmu.mpg.de>
* mingw32.c: use stat in static int is_dir ().
diff --git a/texk/kpathsea/Makefile.am b/texk/kpathsea/Makefile.am
index abef1d7..ded6f6a 100644
--- a/texk/kpathsea/Makefile.am
+++ b/texk/kpathsea/Makefile.am
@@ -14,12 +14,12 @@ SUBDIRS = . doc man
EXTRA_DIST = BUGS PROJECTS
-INCLUDES = -I$(top_builddir)/.. -I$(top_srcdir)/..
+AM_CPPFLAGS = -I$(top_builddir)/.. -I$(top_srcdir)/..
AM_CFLAGS = $(WARNING_CFLAGS)
lib_LTLIBRARIES = libkpathsea.la
-libkpathsea_la_CPPFLAGS = -DMAKE_KPSE_DLL
+libkpathsea_la_CPPFLAGS = $(AM_CPPFLAGS) -DMAKE_KPSE_DLL
libkpathsea_la_LDFLAGS = -no-undefined -version-info $(KPSE_LT_VERSINFO)
@@ -229,7 +229,7 @@ kpsewhich_LDADD = libkpathsea.la
EXTRA_PROGRAMS = progname-test xdirtest
-progname_test_CPPFLAGS = -DMAKE_KPSE_DLL -DTEST
+progname_test_CPPFLAGS = $(AM_CPPFLAGS) -DMAKE_KPSE_DLL -DTEST
progname_test_SOURCES = progname.c
progname_test_LDADD = libkpathsea.la
diff --git a/texk/makeindexk/ChangeLog b/texk/makeindexk/ChangeLog
index cf38559..21cf05f 100644
--- a/texk/makeindexk/ChangeLog
+++ b/texk/makeindexk/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-10-16 Peter Breitenlohner <peb@mppmu.mpg.de>
* mkind.h: Drop duplicate '#include "c-auto.h"'.
diff --git a/texk/makeindexk/Makefile.am b/texk/makeindexk/Makefile.am
index a621eb2..4580372 100644
--- a/texk/makeindexk/Makefile.am
+++ b/texk/makeindexk/Makefile.am
@@ -5,8 +5,7 @@
##
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DUNIX -DKPATHSEA
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA
AM_CFLAGS = $(WARNING_CFLAGS)
if !WIN32
diff --git a/texk/makejvf/ChangeLog b/texk/makejvf/ChangeLog
index 815a88f..063cd54 100644
--- a/texk/makejvf/ChangeLog
+++ b/texk/makejvf/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-09-21 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
* main.c (main): add break;.
diff --git a/texk/makejvf/Makefile.am b/texk/makejvf/Makefile.am
index 8249827..db13189 100644
--- a/texk/makejvf/Makefile.am
+++ b/texk/makejvf/Makefile.am
@@ -5,7 +5,7 @@
##
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES)
+AM_CPPFLAGS = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES)
AM_CFLAGS = $(WARNING_CFLAGS)
bin_PROGRAMS = makejvf
diff --git a/texk/mendexk/ChangeLog b/texk/mendexk/ChangeLog
index adb4c07..fe87113 100644
--- a/texk/mendexk/ChangeLog
+++ b/texk/mendexk/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-10-16 Peter Breitenlohner <peb@mppmu.mpg.de>
* convert.c: Move common #include's from here ...
diff --git a/texk/mendexk/Makefile.am b/texk/mendexk/Makefile.am
index 68e25da..7514dce 100644
--- a/texk/mendexk/Makefile.am
+++ b/texk/mendexk/Makefile.am
@@ -5,7 +5,7 @@
##
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES)
+AM_CPPFLAGS = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES)
AM_CFLAGS = $(WARNING_CFLAGS)
bin_PROGRAMS = mendex
diff --git a/texk/ps2pkm/ChangeLog b/texk/ps2pkm/ChangeLog
index fe6259c..35de344 100644
--- a/texk/ps2pkm/ChangeLog
+++ b/texk/ps2pkm/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-10-15 Peter Breitenlohner <peb@mppmu.mpg.de>
Remove TL vs W32TeX diffs (from Akira).
diff --git a/texk/ps2pkm/Makefile.am b/texk/ps2pkm/Makefile.am
index 61e4549..d912b2f 100644
--- a/texk/ps2pkm/Makefile.am
+++ b/texk/ps2pkm/Makefile.am
@@ -7,8 +7,7 @@ ACLOCAL_AMFLAGS = -I ../../m4
bin_PROGRAMS = mag pfb2pfa pk2bm ps2pk
-INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DUNIX -DKPATHSEA
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA
AM_CFLAGS = #$(WARNING_CFLAGS)
LDADD = $(KPATHSEA_LIBS)
diff --git a/texk/ptexenc/ChangeLog b/texk/ptexenc/ChangeLog
index 9e209cb..d377de7 100644
--- a/texk/ptexenc/ChangeLog
+++ b/texk/ptexenc/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-09-04 Peter Breitenlohner <peb@mppmu.mpg.de>
* ptexenc.c: Define ptexenc_version_string as PTEXENCVERSION.
diff --git a/texk/ptexenc/Makefile.am b/texk/ptexenc/Makefile.am
index 299711b..3c0adc3 100644
--- a/texk/ptexenc/Makefile.am
+++ b/texk/ptexenc/Makefile.am
@@ -9,12 +9,12 @@ ACLOCAL_AMFLAGS = -I ../../m4
.PHONY: rebuild
rebuild: all
-INCLUDES = $(KPATHSEA_INCLUDES)
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES)
AM_CFLAGS = $(WARNING_CFLAGS)
lib_LTLIBRARIES = libptexenc.la
-libptexenc_la_CPPFLAGS = -DMAKE_PTENC_DLL
+libptexenc_la_CPPFLAGS = $(AM_CPPFLAGS) -DMAKE_PTENC_DLL
libptexenc_la_LDFLAGS = -no-undefined -version-info $(PTEXENC_LT_VERSINFO)
diff --git a/texk/seetexk/ChangeLog b/texk/seetexk/ChangeLog
index d73886d..c057add 100644
--- a/texk/seetexk/ChangeLog
+++ b/texk/seetexk/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-07-25 Ken Brown <kbrow1i@gmail.com>
* seek.c (CopyFile): No special file mode handling for Cygwin.
diff --git a/texk/seetexk/Makefile.am b/texk/seetexk/Makefile.am
index 01a2b4e..b8f0dba 100644
--- a/texk/seetexk/Makefile.am
+++ b/texk/seetexk/Makefile.am
@@ -5,8 +5,7 @@
##
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DUNIX -DKPATHSEA
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA
AM_CFLAGS = $(WARNING_CFLAGS)
noinst_LIBRARIES = libtex.a
diff --git a/texk/tex4htk/ChangeLog b/texk/tex4htk/ChangeLog
index bdbb119..aecd7ed 100644
--- a/texk/tex4htk/ChangeLog
+++ b/texk/tex4htk/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-07-25 Peter Breitenlohner <peb@mppmu.mpg.de>
* t4ht.c, tex4ht.c [WIN32]: More changes from W32TeX.
diff --git a/texk/tex4htk/Makefile.am b/texk/tex4htk/Makefile.am
index 6d0295e..e6d2285 100644
--- a/texk/tex4htk/Makefile.am
+++ b/texk/tex4htk/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory texk/tex4htk/
##
-## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
@@ -12,8 +12,7 @@ EXTRA_DIST = java
dist-hook:
rm -rf `find $(distdir) -name .svn`
-INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DANSI -DKPATHSEA
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DANSI -DKPATHSEA
AM_CFLAGS = $(WARNING_CFLAGS)
bin_PROGRAMS = t4ht tex4ht
diff --git a/texk/texlive/linked_scripts/Makefile.am b/texk/texlive/linked_scripts/Makefile.am
index 86a3f9d..f2df727 100644
--- a/texk/texlive/linked_scripts/Makefile.am
+++ b/texk/texlive/linked_scripts/Makefile.am
@@ -139,6 +139,7 @@ texmf_dist_other_scripts = \
latexmk/latexmk.pl \
latexpand/latexpand \
luaotfload/mkluatexfontdb.lua \
+ m-tx/m-tx.lua \
match_parens/match_parens \
mathspic/mathspic.pl \
mf2pt1/mf2pt1.pl \
diff --git a/texk/texlive/linked_scripts/adhocfilelist/adhocfilelist.sh b/texk/texlive/linked_scripts/adhocfilelist/adhocfilelist.sh
index d8b28bd..07d0388 100755
--- a/texk/texlive/linked_scripts/adhocfilelist/adhocfilelist.sh
+++ b/texk/texlive/linked_scripts/adhocfilelist/adhocfilelist.sh
@@ -1,7 +1,7 @@
#!/bin/sh
##
## \ProvidesFile{adhocfilelist.sh}
-## [2012/10/17 v0.7 command line -> \string\listfiles
+## [2012/11/19 v0.71 command line -> \string\listfiles
## \space(UL)]
##
## (C) 2012 Uwe Lück LaTeX Project Public License
@@ -17,7 +17,7 @@ add_type () {
}
add_type sty; add_type cfg; add_type cls;
add_type dtx; add_type def; add_type fd;
-adhoc_find_std="-follow -maxdepth 1 ( $adhoc_find_std )"
+adhoc_find_std="-L -maxdepth 1 ( $adhoc_find_std )" ## -L 2012-11-19
#echo adhoc_find_std = $adhoc_find_std
## standard action (v0.7):
adhoc_fmt_std=',%f'
diff --git a/texk/texlive/linked_scripts/findhyph/findhyph b/texk/texlive/linked_scripts/findhyph/findhyph
index e66f55a..c4a7089 100755
--- a/texk/texlive/linked_scripts/findhyph/findhyph
+++ b/texk/texlive/linked_scripts/findhyph/findhyph
@@ -6,7 +6,7 @@ $opt_l = 'kKsSvVzZoOuUiIA'; # defaults for Slovak and Czech
$opt_c = $opt_f = $opt_h = $opt_v = 0;
getopts('cfphvl:');
-$version_msg = "findhyph version 3.1\n";
+$version_msg = "findhyph version 3.2\n";
$help_msg = "\nUsage: findhyph [options] <yourtexfile.log>\n" .
"\n" .
"Options: -c display hyphenated words in context\n" .
@@ -236,7 +236,7 @@ B<findhyph [options]> F<foo.log>
If you are setting C<\looseness=E<lt>NE<gt>> to optimize paragraphs,
you need to pass that information to the file F<foo.log> in a form
C<@looseness=E<lt>NE<gt>> (on a separate line). You can use a macro like
-C<\def\setlooseness#1{\immediate\write-1{@looseness=#1}\looseness=#1}>
+C<\def\setlooseness#1{\looseness=#1 \immediate\write-1{@looseness=#1}}>
for this purpose. If the paragraph contains material in display math mode,
you need to use the macro in all split parts of the paragraph.
@@ -362,6 +362,17 @@ fixed displaying of hyphenated ligatures (bug reported by Karel Horak)
=back
+=head4 3.2 (2012-11-21)
+
+=over 4
+
+=item *
+
+improved example definition of the C<\setlooseness> macro
+(thanks to Karl Berry)
+
+=back
+
=head1 LICENSE
This program is free software; you can redistribute it and/or modify
diff --git a/texk/texlive/linked_scripts/glossaries/makeglossaries b/texk/texlive/linked_scripts/glossaries/makeglossaries
index 19a61c9..3d053fc 100755
--- a/texk/texlive/linked_scripts/glossaries/makeglossaries
+++ b/texk/texlive/linked_scripts/glossaries/makeglossaries
@@ -27,9 +27,11 @@
# glossary-super.sty, glossaries.perl.
# Also makeglossaries and makeglossaries.
-my $version="2.04 (2012-05-19)";
+my $version="2.05 (2012-11-12)";
# History:
+# v2.05 (2012-11-12):
+# * added -d option
# v2.04 (2012-04-19):
# * fixed bug in &scan_aux
# v2.03 (2011-04-12):
@@ -76,8 +78,9 @@ use Getopt::Std;
use strict;
# v2.01 added the following line
use warnings;
+# v2.05 added $opt_d
use vars qw($opt_q $opt_t $opt_o $opt_s $opt_p $opt_g $opt_c $opt_r
- $opt_l $opt_i $opt_L $opt_n $opt_C);
+ $opt_l $opt_i $opt_L $opt_n $opt_C $opt_d);
$Getopt::Std::STANDARD_HELP_VERSION = 1;
@@ -86,7 +89,7 @@ $Getopt::Std::STANDARD_HELP_VERSION = 1;
# .tex file)
# v1.5 added -n (print the command that would be issued but
# don't actually run the command)
-getopts('s:o:t:p:L:C:ilqrcgn');
+getopts('s:o:t:p:L:C:ilqrcgnd:');
unless ($#ARGV == 0)
{
@@ -97,6 +100,9 @@ unless ($#ARGV == 0)
# v2.02: added:
print "makeglossaries version $version\n" unless ($opt_q);
+# v2.05 added:
+chdir $opt_d if ($opt_d);
+
# v2.02: added:
my $xdynotist = 1;
my $needcompatibilitymode=2;
@@ -941,8 +947,9 @@ sub HELP_MESSAGE{
print "-q\t\tQuiet mode\n";
print "-s <sty>\tEmploy <sty> as the style file\n";
print "-t <log>\tEmploy <log> as the transcript file\n";
- print "-n\tPrint the command that would normally be executed,\n",
- "\tbut don't execute it\n";
+ print "-d <directory>\tRun xindy/makeindex in <directory>\n";
+ print "-n\t\tPrint the command that would normally be executed,\n",
+ "\t\tbut don't execute it\n";
print "\n Xindy Options:\n";
print "-L <language>\tUse <language>.\n";
diff --git a/utils/m-tx/m-tx.lua b/texk/texlive/linked_scripts/m-tx/m-tx.lua
similarity index 95%
rename from utils/m-tx/m-tx.lua
rename to texk/texlive/linked_scripts/m-tx/m-tx.lua
index 3ed5785..495777b 100755
--- a/utils/m-tx/m-tx.lua
+++ b/texk/texlive/linked_scripts/m-tx/m-tx.lua
@@ -1,6 +1,6 @@
#!/usr/bin/env texlua
-VERSION = "0.3"
+VERSION = "0.4"
--[[
m-tx.lua: processes MusiXTeX files using prepmx and pmxab as pre-processors (and deletes intermediate files)
@@ -26,6 +26,7 @@ VERSION = "0.3"
--[[
ChangeLog:
+
version 0.3 2012-04-09 RDT
Change name to m-tx to avoid clash with another program.
@@ -134,9 +135,9 @@ repeat
end
os.remove( filename .. ".mx2" )
if ( OK ) and
- ((tex == "") or os.execute(tex .. " " .. filename) == 0) and
- ((tex == "") or os.execute(musixflx .. " " .. filename) == 0) and
- ((tex == "") or os.execute(tex .. " " .. filename) == 0) and
+ (tex == "" or os.execute(tex .. " " .. filename) == 0) and
+ (tex == "" or os.execute(musixflx .. " " .. filename) == 0) and
+ (tex == "" or os.execute(tex .. " " .. filename) == 0) and
((tex ~= "latex" and tex ~= "pdflatex")
or (os.execute(tex .. " " .. filename) == 0)) and
(dvi == "" or (os.execute(dvi .. " " .. filename) == 0)) and
diff --git a/texk/texlive/linked_scripts/scripts.lst b/texk/texlive/linked_scripts/scripts.lst
index ef44740..7409c72 100644
--- a/texk/texlive/linked_scripts/scripts.lst
+++ b/texk/texlive/linked_scripts/scripts.lst
@@ -78,6 +78,7 @@ latexdiff/latexrevise.pl
latexmk/latexmk.pl
latexpand/latexpand
luaotfload/mkluatexfontdb.lua
+m-tx/m-tx.lua
match_parens/match_parens
mathspic/mathspic.pl
mf2pt1/mf2pt1.pl
@@ -92,6 +93,7 @@ pedigree-perl/pedigree.pl
perltex/perltex.pl
pkfix/pkfix.pl
pkfix-helper/pkfix-helper
+pmx/pmx2pdf.lua
pst2pdf/pst2pdf
purifyeps/purifyeps
splitindex/perl/splitindex.pl
diff --git a/texk/texlive/linked_scripts/tetex/updmap.cfg.5 b/texk/texlive/linked_scripts/tetex/updmap.cfg.5
index 0d8c90b..43a7cc2 100644
--- a/texk/texlive/linked_scripts/tetex/updmap.cfg.5
+++ b/texk/texlive/linked_scripts/tetex/updmap.cfg.5
@@ -1,6 +1,7 @@
.\" Hey, Emacs! This is an -*- nroff -*- source file.
-.\"
+.\"
.\" Copyright (C) 2004, 2012 Hilmar Preusse <hille42@web.de>
+.\" Copyright (C) 2012 Norbert Preining <preining@logic.at>
.\"
.\" This is free software; you can redistribute it and/or modify it under
.\" the terms of the GNU General Public License as published by the Free
@@ -15,7 +16,7 @@
.\" You should have received a copy of the GNU General Public License
.\" along with this program. if not, see <http://www.gnu.org/licenses/>.
.\"
-.TH "UPDMAP.CFG" "12" "March 2012" "TeX Live" "TeX Live"
+.TH "UPDMAP.CFG" "20" "November 2012" "TeX Live" "TeX Live"
.SH "NAME"
\fBupdmap.cfg\fR \- configuration of font mapping/inclusion for dvips and
friends.
@@ -28,16 +29,19 @@ Type3) mostly coming from MetaFont.
.PP
\fBupdmap\fP is a utility that creates font configuration files for
\fBdvips\fP(1), \fBpdftex\fP(1), \fBxdvi\fP(1), \fBps2pk\fP(1),
-\fBgsftopk\fP(1), \fBdvipdfm\fP(1) and (soon) \fBdvipdfmx\fP(1)\&. In
+\fBgsftopk\fP(1), and \fBdvipdfmx\fP(1)\&. In
an ideal world, updmap would be unnecessary -- each of these programs
would read the same configuration file to learn what fonts are
available and how they should be treated\&. As things stand, however,
each of these tools has subtly different requirements and thereby
needs its own font configuration file\&. \fBupdmap\fP creates font
-configuration files for all of these programs from a single source,
-\fBupdmap.cfg\fR, allowing you to easily keep all the different
+configuration files for all of these programs from several sources,
+namely all \fBupdmap.cfg\fR, allowing you to easily keep all the different
configuration files in sync\&.
.P
+Running "updmap --help" will output the main documentation for using
+\fBupdmap\fR.
+.P
\fBdvipsPreferOutline\fR
.br
Configures if \fBdvips\fR (by default) should prefer bitmap fonts or outline fonts
@@ -62,11 +66,11 @@ ADOBE: Adobe fonts with "vendor" filenames (e.g. hvnbo___.pfb)
.br
ADOBEkb: Adobe fonts with "berry" filenames (e.g. phvbo8an.pfb)
.P
-\fBdvipsDownloadBase\fR
+\fBdvipsDownloadBase35\fR
.br
-Configures if \fBdvips\fR (by default) should download the standard 35 LaserWriter
-fonts into the document (set \fItrue\fR) or should these fonts be used from the ps
-interpreter / printer (set \fIfalse\fR).
+Configures if \fBdvips\fR (by default) should download the 35 base
+PostScript fonts into the document (set \fItrue\fR) or should these
+fonts be used from the ps interpreter / printer (set \fIfalse\fR).
.br
The user can override the default by specifying \fBdvips\fR \fI-Pdownload35\fR
(resp. \fBdvips\fR \fI-Pbuiltin35\fR) to download the LW35 fonts
@@ -76,21 +80,31 @@ Valid settings are \fItrue\fR / \fIfalse\fR.
.P
\fBpdftexDownloadBase14\fR
.br
-Should \fBpdftex\fR download the base 14 pdf fonts? Since some configurations
+Should \fBpdftex\fR download the 14 base PDF fonts? Since some configurations
(ps / pdf tools / printers) use bad default fonts, it is safer to download
-the fonts. The pdf files will get bigger, though.
+the fonts. The pdf files get bigger, but that is the cost.
.br
Valid settings are \fItrue\fR (download the fonts) or \fIfalse\fR (don't
-download the fonts). Adobe recommends to embed all fonts.
+download the fonts). Adobe recommends embedding all fonts.
.P
-\fBdvipdfmDownloadBase14\fR
+\fBpxdviUse\fR
.br
-Should \fBdvipdfm\fR download the base 14 pdf fonts? Since some configurations
-(ps / pdf tools / printers) use bad default fonts, it is safer to download
-the fonts. The pdf files will get bigger, though.
+Should special map files for pxdvi be created? pxdvi is an adaption of xdvi
+with support for reading and displaying files generated by the ptex family
+of engines.
.br
-Valid settings are \fItrue\fR (download the fonts) or \fIfalse\fR (don't
-download the fonts).
+Valid settings are \fItrue\fR (generate configuration) or \fIfalse\fR. See
+http://www.tug.org/texlive/updmap-kanji.html for detailed discussion.
+.P
+\fBkanjiEmbed\fR
+.br
+\fBkanjiVariant\fR
+.br
+The options \fBkanjiEmbed\fR and \fBkanjiVariant\fR specify special
+replacements in the map lines. In a map, the string "@kanjiEmbed@"
+will be replaced by the value of that option; similarly for
+\fBkanjiVariant\fR. In this way, users of Japanese TeX can select
+different fonts to be included in the final output.
.P
\fBMap\fR
.br
@@ -99,9 +113,8 @@ document) to the pfb file containing the Postscript code.
.br
Usage: \fBMap\fR filename.map
.P
-The syntax of map files is the same as \fBdvips\fP(1) uses, see
-section 6.4, "'psfonts.map': PostScript font catalog" in the manual of
-\fBdvips\fP(1), available as info and pdf file.
+The syntax of map files is the same as \fBdvips\fP(1) uses, see the
+section "psfonts.map" in the manual of \fBdvips\fP(1).
.P
\fBMixedMap\fR
.br
@@ -112,24 +125,31 @@ entries will not be used in the default map of \fBdvips\fR if
.br
Usage: \fBMixedMap\fR filename.map
.P
+\fBKanjiMap\fR
+.br
+Similar to \fBMap\fR. This should be used for kanji fonts.
+.br
+Usage: \fBKanjiMap\fR filename.map
+.P
The sign \fB#\fR precedes a comment.
.P
-Not used Map files should be commented out using the string \fB#!\fR at the
-beginning of the line. These entries can be (de-)activated using \fBupdmap\fR
-with the options \fI--enable\fR and \fI--disable\fR.
-.SH "SPECIAL TO DEBIAN"
-In Debian the file \fBupdmap.cfg\fR is a generated file sitting in /var. It is
-generated by concatenating the *.cfg files from /etc/texmf/updmap.d/. These
-files follow the syntax of updmap.cfg, but contain only parts of it.
+Map files not to be used should be commented out using the string
+\fB#!\fR at the beginning of the line. Such entries can be
+(de-)activated using \fBupdmap\fR with the options \fI--enable\fR and
+\fI--disable\fR, respectively.
+
.SH "AUTHOR"
-This manual page was written by Hilmar Preusse <hille42@web.de>, for
+This manual page was written by Hilmar Preusse <hille42@web.de> and
+extended by Norbert Preining <preining@logic.at>, for
the Debian GNU/Linux system by simply copying the comments from
\fBupdmap.cfg\fR and rewriting some of them. It may be used by other
distributions without contacting the author. Any mistakes or omissions in
-the manual page are my fault; inquiries about or corrections to this manual
-page should be directed to me (and not to the primary author).
+the manual page are our fault; inquiries about or corrections to this manual
+page should be directed to tex-live@tug.org.
+
.SH "SEE ALSO"
-updmap(1), info page of dvips(1)
+updmap(1), dvips(1)
+
.SH "THANKS TO"
Frank Kuester,
Thomas Esser.
diff --git a/texk/ttf2pk/ChangeLog b/texk/ttf2pk/ChangeLog
index c90d49d..8c89949 100644
--- a/texk/ttf2pk/ChangeLog
+++ b/texk/ttf2pk/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-09-16 Peter Breitenlohner <peb@mppmu.mpg.de>
* tests/ttf2pk.cfg, tests/ttf2pk.test: Extend the test to cover
diff --git a/texk/ttf2pk/Makefile.am b/texk/ttf2pk/Makefile.am
index fbac54d..e75b158 100644
--- a/texk/ttf2pk/Makefile.am
+++ b/texk/ttf2pk/Makefile.am
@@ -5,8 +5,8 @@
##
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = -I$(top_srcdir)/include $(KPATHSEA_INCLUDES) $(FREETYPE_INCLUDES)
-AM_CPPFLAGS = -DHAVE_LIBKPATHSEA
+AM_CPPFLAGS = -I$(top_srcdir)/include $(KPATHSEA_INCLUDES) $(FREETYPE_INCLUDES)
+AM_CPPFLAGS += -DHAVE_LIBKPATHSEA
AM_CFLAGS = $(WARNING_CFLAGS)
bin_PROGRAMS = ttf2pk ttf2tfm
diff --git a/texk/ttf2pk2/ChangeLog b/texk/ttf2pk2/ChangeLog
index f0dfe1b..120cc64 100644
--- a/texk/ttf2pk2/ChangeLog
+++ b/texk/ttf2pk2/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-09-16 Peter Breitenlohner <peb@mppmu.mpg.de>
* tests/ttf2pk.cfg, tests/ttf2pk.test: Extend the test to cover
diff --git a/texk/ttf2pk2/Makefile.am b/texk/ttf2pk2/Makefile.am
index fe7a373..dd496bb 100644
--- a/texk/ttf2pk2/Makefile.am
+++ b/texk/ttf2pk2/Makefile.am
@@ -5,8 +5,8 @@
##
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = -I$(top_srcdir)/include $(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES)
-AM_CPPFLAGS = -DHAVE_LIBKPATHSEA
+AM_CPPFLAGS = -I$(top_srcdir)/include $(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES)
+AM_CPPFLAGS += -DHAVE_LIBKPATHSEA
AM_CFLAGS = $(WARNING_CFLAGS)
bin_PROGRAMS = ttf2pk ttf2tfm
diff --git a/texk/ttfdump/ChangeLog b/texk/ttfdump/ChangeLog
index 8d4362e..953055a 100644
--- a/texk/ttfdump/ChangeLog
+++ b/texk/ttfdump/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-09-09 Peter Breitenlohner <peb@mppmu.mpg.de>
* include/tables.h, libttf/os2.c: Handle fields present only in
diff --git a/texk/ttfdump/Makefile.am b/texk/ttfdump/Makefile.am
index 20c82e3..5c05099 100644
--- a/texk/ttfdump/Makefile.am
+++ b/texk/ttfdump/Makefile.am
@@ -5,8 +5,7 @@
##
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = -I$(top_srcdir)/include $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -DUNIX -DKPATHSEA
+AM_CPPFLAGS = -I$(top_srcdir)/include $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA
AM_CFLAGS = $(WARNING_CFLAGS)
noinst_LIBRARIES = libttf.a
diff --git a/texk/web2c/ChangeLog b/texk/web2c/ChangeLog
index 1f7c95d..5a4918a 100644
--- a/texk/web2c/ChangeLog
+++ b/texk/web2c/ChangeLog
@@ -1,3 +1,14 @@
+2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac: No need to check for Annot::decRefCnt with
+ poppler 0.18 or better.
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/bootstrap.am: Add dependency of (c)tangleboot_OBJECTS on
+ (c)tangleboot_DEPENDENCIES.
+
2012-11-13 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am: Also drop the unused otangle.
diff --git a/texk/web2c/Makefile.am b/texk/web2c/Makefile.am
index a366139..5da453d 100644
--- a/texk/web2c/Makefile.am
+++ b/texk/web2c/Makefile.am
@@ -5,12 +5,10 @@
##
ACLOCAL_AMFLAGS = -I ../../m4 -I m4
-INCLUDES =
AM_CPPFLAGS = $(KPATHSEA_INCLUDES)
## Not yet for C, C++, and ObjC++ (too many warnings or not yet implemented)
AM_CFLAGS = $(WARNING_CFLAGS)
AM_CXXFLAGS = ## $(WARNING_CXXFLAGS)
-## Not yet for ObjC++ (not yet implemented)
AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS)
version = $(WEB2CVERSION)
diff --git a/texk/web2c/am/bootstrap.am b/texk/web2c/am/bootstrap.am
index bf16652..c9cc6db 100644
--- a/texk/web2c/am/bootstrap.am
+++ b/texk/web2c/am/bootstrap.am
@@ -40,6 +40,7 @@ tangleboot-web2c: tangleboot.p $(web2c_depend)
# tangleboot.pin is in the distribution
.pin.p:
cp -f $< $@
+$(tangleboot_OBJECTS): $(tangleboot_DEPENDENCIES)
tangleboot_DEPENDENCIES = $(default_dependencies)
EXTRA_DIST += tangleboot.pin
DISTCLEANFILES += tangleboot.c tangleboot.h tangleboot.p tangleboot-web2c
@@ -67,7 +68,7 @@ DISTCLEANFILES += ctangle.c cweb.c cweb.h ctangle-ctangle common-ctangle
noinst_PROGRAMS += ctangleboot
nodist_ctangleboot_SOURCES = ctangleboot.c cwebboot.c
-$(ctangleboot_OBJECTS): cwebboot.h
+$(ctangleboot_OBJECTS): cwebboot.h $(ctangleboot_DEPENDENCIES)
# ctangleboot.cin and cwebboot.[ch]in are in the distribution
.cin.c:
cp -f $< $@
diff --git a/texk/web2c/c-auto.in b/texk/web2c/c-auto.in
index 24e5047..d8ee4e1 100644
--- a/texk/web2c/c-auto.in
+++ b/texk/web2c/c-auto.in
@@ -46,9 +46,6 @@
/* Define to 1 if you have the `access' function. */
#undef HAVE_ACCESS
-/* Define to 1 if class `Annot' has the `decRefCnt' member. */
-#undef HAVE_ANNOTDECREFCNT
-
/* Define to 1 if you have the <assert.h> header file. */
#undef HAVE_ASSERT_H
diff --git a/texk/web2c/configure.ac b/texk/web2c/configure.ac
index c9e62a8..7e90097 100644
--- a/texk/web2c/configure.ac
+++ b/texk/web2c/configure.ac
@@ -278,22 +278,6 @@ KPSE_ADD_FLAGS([kpathsea])
AC_CHECK_SIZEOF([off_t], , AC_INCLUDES_DEFAULT
[#include <kpathsea/config.h>])
-# Checks for xpdf poppler features.
-KPSE_ADD_FLAGS([poppler])
-AC_LANG_PUSH([C++])
-AC_CACHE_CHECK([for Annot::decRefCnt],
- [kpse_cv_have_Annot_decRefCnt],
- [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <goo/GooString.h>
-#include <Object.h>
-#include <Array.h>
-#include <Annot.h>]],
- [[Annot *an; an->decRefCnt();]])],
- [kpse_cv_have_Annot_decRefCnt=yes],
- [kpse_cv_have_Annot_decRefCnt=no])])
-AS_IF([test "x$kpse_cv_have_Annot_decRefCnt" = xyes],
- [AC_DEFINE([HAVE_ANNOTDECREFCNT], 1,
- [Define to 1 if class `Annot' has the `decRefCnt' member.])])
-AC_LANG_POP([C++])
KPSE_RESTORE_FLAGS
dnl Write output here, instead of putting a zillion -D's on the command line.
diff --git a/texk/web2c/lib/ChangeLog b/texk/web2c/lib/ChangeLog
index ee2ec93..37359bb 100644
--- a/texk/web2c/lib/ChangeLog
+++ b/texk/web2c/lib/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-10-14 Akira Kakuto <kakuto@fuk.kinidai.ac.jp>
* texmfmp.c: Use _IONBF for unbuffered stream.
diff --git a/texk/web2c/lib/Makefile.am b/texk/web2c/lib/Makefile.am
index 2368f7b..927a2d7 100644
--- a/texk/web2c/lib/Makefile.am
+++ b/texk/web2c/lib/Makefile.am
@@ -1,10 +1,9 @@
## Makefile.am for the TeX Live subdirectory texk/web2c/lib/
##
-## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
-INCLUDES = -I$(top_srcdir)
-AM_CPPFLAGS = $(KPATHSEA_INCLUDES)
+AM_CPPFLAGS = -I$(top_srcdir) $(KPATHSEA_INCLUDES)
AM_CFLAGS = $(WARNING_CFLAGS)
## Rebuild libkpathsea
diff --git a/texk/web2c/luatexdir/ChangeLog b/texk/web2c/luatexdir/ChangeLog
index 328adb8..979392e 100644
--- a/texk/web2c/luatexdir/ChangeLog
+++ b/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * lua/lepdflib.cc: No need to test for Annot::decRefCnt with
+ poppler 0.18 or better.
+
2012-11-06 Akira Kakuto <kakuto@fuk.kinidai.ac.jp>
* pdf/pdflistout.w: sync with r4471 (a bug fix by H. Henkel).
diff --git a/texk/web2c/luatexdir/lua/lepdflib.cc b/texk/web2c/luatexdir/lua/lepdflib.cc
index 358931e..b003b6b 100644
--- a/texk/web2c/luatexdir/lua/lepdflib.cc
+++ b/texk/web2c/luatexdir/lua/lepdflib.cc
@@ -350,11 +350,7 @@ static int m_Annot__gc(lua_State * L)
printf("\n===== Annot GC ===== uin=<%p>\n", uin);
#endif
if (uin->atype == ALLOC_LEPDF)
-#ifdef HAVE_ANNOTDECREFCNT
((Annot *) uin->d)->decRefCnt();
-#else
- delete(Annot *) uin->d;
-#endif
return 0;
}
diff --git a/texk/web2c/otps/ChangeLog b/texk/web2c/otps/ChangeLog
index 6ca4996..eec93db 100644
--- a/texk/web2c/otps/ChangeLog
+++ b/texk/web2c/otps/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-07-09 Peter Breitenlohner <peb@mppmu.mpg.de>
* otp-parser.[ch]: Regenerate with bison 2.5.1.
diff --git a/texk/web2c/otps/Makefile.am b/texk/web2c/otps/Makefile.am
index cd7e89b..194e942 100644
--- a/texk/web2c/otps/Makefile.am
+++ b/texk/web2c/otps/Makefile.am
@@ -1,9 +1,9 @@
## Makefile.am for the TeX Live subdirectory texk/web2c/otps/
##
-## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
-INCLUDES = -I$(top_builddir)/.. -I$(top_srcdir) $(KPATHSEA_INCLUDES)
+AM_CPPFLAGS = -I$(top_builddir)/.. -I$(top_srcdir) $(KPATHSEA_INCLUDES)
AM_CFLAGS = $(WARNING_CFLAGS)
AM_YFLAGS = -d -v
diff --git a/texk/web2c/web2c/ChangeLog b/texk/web2c/web2c/ChangeLog
index d34d286..88786d2 100644
--- a/texk/web2c/web2c/ChangeLog
+++ b/texk/web2c/web2c/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-08-22 Peter Breitenlohner <peb@mppmu.mpg.de>
* fixwrites.c, main.c, makecpool.c, splitup.c:
diff --git a/texk/web2c/web2c/Makefile.am b/texk/web2c/web2c/Makefile.am
index c0874c4..1060ce3 100644
--- a/texk/web2c/web2c/Makefile.am
+++ b/texk/web2c/web2c/Makefile.am
@@ -1,11 +1,11 @@
## Makefile.am for the TeX Live subdirectory texk/web2c/web2c/
##
-## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../../m4
-INCLUDES = -I$(srcdir)/../..
+AM_CPPFLAGS = -I$(srcdir)/../..
AM_YFLAGS = -d -v
AM_CFLAGS = $(WARNING_CFLAGS)
diff --git a/texk/web2c/window/ChangeLog b/texk/web2c/window/ChangeLog
index 57fba18..d1e4176 100644
--- a/texk/web2c/window/ChangeLog
+++ b/texk/web2c/window/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-07-01 Peter Breitenlohner <peb@mppmu.mpg.de>
* win32.c: Avoid TL W32TeX differences.
diff --git a/texk/web2c/window/Makefile.am b/texk/web2c/window/Makefile.am
index 605e300..39f45df 100644
--- a/texk/web2c/window/Makefile.am
+++ b/texk/web2c/window/Makefile.am
@@ -3,9 +3,7 @@
## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
-INCLUDES = -I$(top_srcdir) $(KPATHSEA_INCLUDES)
-
-AM_CPPFLAGS = $(X_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir) $(KPATHSEA_INCLUDES) $(X_CFLAGS)
AM_CFLAGS = $(WARNING_CFLAGS)
## Rebuild libkpathsea
diff --git a/texk/xdv2pdf/ChangeLog b/texk/xdv2pdf/ChangeLog
index dea2242..7ac8433 100644
--- a/texk/xdv2pdf/ChangeLog
+++ b/texk/xdv2pdf/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2010-05-09 Peter Breitenlohner <peb@mppmu.mpg.de>
* xdv2pdf_main.c, xdv_kpse_formats.h (XDV2PDF_OLD_FORMATS):
diff --git a/texk/xdv2pdf/Makefile.am b/texk/xdv2pdf/Makefile.am
index 8c2520a..57811bf 100644
--- a/texk/xdv2pdf/Makefile.am
+++ b/texk/xdv2pdf/Makefile.am
@@ -1,12 +1,11 @@
## Makefile.am for the TeX Live subdirectory texk/xdv2pdf/
##
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009, 2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
-INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS =
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES)
AM_CFLAGS = $(WARNING_CFLAGS)
## Not yet for C++ (too many warnings)
AM_CXXFLAGS = ## $(WARNING_CXXFLAGS)
diff --git a/texk/xdvik/ChangeLog.TL b/texk/xdvik/ChangeLog.TL
index 63f5944..23bfe53 100644
--- a/texk/xdvik/ChangeLog.TL
+++ b/texk/xdvik/ChangeLog.TL
@@ -1,6 +1,10 @@
ChangeLog.TL: Changes for xdvik (TeX Live)
==================================================
+2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am, tests/Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-04-18 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.ac: Remove some obsolete comments.
diff --git a/texk/xdvik/Makefile.am b/texk/xdvik/Makefile.am
index fbb694e..1fdcf6d 100644
--- a/texk/xdvik/Makefile.am
+++ b/texk/xdvik/Makefile.am
@@ -11,7 +11,7 @@ SUBDIRS = squeeze . tests
include common.am
-INCLUDES = -I$(srcdir)/gui $(common_includes)
+AM_CPPFLAGS = -I$(srcdir)/gui $(common_includes)
## The object files created from ./*.c and gui/*.c are used for both
## ./xdvi-bin and tests/run_tests.
diff --git a/texk/xdvik/tests/Makefile.am b/texk/xdvik/tests/Makefile.am
index 20db3c0..9c89699 100644
--- a/texk/xdvik/tests/Makefile.am
+++ b/texk/xdvik/tests/Makefile.am
@@ -1,11 +1,11 @@
## Makefile.am for the TeX Live subdirectory texk/xdvik/tests/
##
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
include ../common.am
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gui $(common_includes)
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/gui $(common_includes)
AM_CFLAGS = $(WARNING_CFLAGS)
check_PROGRAMS = run_tests
diff --git a/texk/xdvipdfmx/ChangeLog b/texk/xdvipdfmx/ChangeLog
index 361e35c..2e5da29 100644
--- a/texk/xdvipdfmx/ChangeLog
+++ b/texk/xdvipdfmx/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * src/Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-09-21 Karl Berry <karl@tug.org>
* many files: remove useless $Header$ from old repo,
diff --git a/texk/xdvipdfmx/src/Makefile.am b/texk/xdvipdfmx/src/Makefile.am
index 159844a..1ffc564 100644
--- a/texk/xdvipdfmx/src/Makefile.am
+++ b/texk/xdvipdfmx/src/Makefile.am
@@ -1,10 +1,9 @@
## Makefile.am for the TeX Live subdirectory texk/xdvipdfmx/src/
##
-## Copyright (C) 2009, 2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
-INCLUDES = $(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES)
-AM_CPPFLAGS =
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES)
AM_CFLAGS = $(WARNING_CFLAGS)
bin_PROGRAMS = xdvipdfmx
diff --git a/utils/m-tx/ChangeLog b/utils/m-tx/ChangeLog
index c80769c..a7403da 100644
--- a/utils/m-tx/ChangeLog
+++ b/utils/m-tx/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Drop m-tx.lua,
+ now in ../../texk/texlive/linked_scripts/m-tx.
+
2012-10-04 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am: Drop libp2c.a (multiple definitions).
diff --git a/utils/m-tx/Makefile.am b/utils/m-tx/Makefile.am
index 4f1f2e4..452ef47 100644
--- a/utils/m-tx/Makefile.am
+++ b/utils/m-tx/Makefile.am
@@ -54,20 +54,6 @@ prepmx_SOURCES = \
## We can not use $(MTX_TREE)/libp2c/p2clib.c (multiple definitions).
-lua_scripts = m-tx
-
-scriptsdir = texmf-dist/scripts/m-tx
-nodist_bin_SCRIPTS =
-
-include $(srcdir)/../../texk/am/script_links.am
-
-texmfdir = $(datarootdir)/$(scriptsdir)
-dist_texmf_SCRIPTS = $(lua_scripts:=.lua)
-
-install-data-hook: install-lua-links
-
-uninstall-hook: uninstall-links
-
dist_man1_MANS = m-tx.1 prepmx.1
## Tests
diff --git a/utils/pmx/ChangeLog b/utils/pmx/ChangeLog
index 0d6dab8..4bb75ec 100644
--- a/utils/pmx/ChangeLog
+++ b/utils/pmx/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am, configure.ac: Avoid use of deprecated INCLUDES.
+ * Makefile.am: Drop pmx2pdf.lua,
+ now in ../../texk/texlive/linked_scripts/pmx.
+
2012-07-12 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.ac: Fixed a typo (AM_CPPPFLAGS => AM_CPPFLAGS).
diff --git a/utils/pmx/Makefile.am b/utils/pmx/Makefile.am
index fb5a6ef..ac77e0e 100644
--- a/utils/pmx/Makefile.am
+++ b/utils/pmx/Makefile.am
@@ -14,7 +14,7 @@ EXTRA_DIST += $(PMX_TREE)-PATCHES
dist-hook:
rm -rf `find $(distdir) -name .svn`
-INCLUDES = -I$(srcdir)/$(PMX_TREE)/libf2c
+AM_CPPFLAGS = -I$(srcdir)/$(PMX_TREE)/libf2c $(PMX_DEFINES)
AM_CFLAGS = #$(WARNING_CFLAGS)
bin_PROGRAMS = pmxab scor2prt
@@ -235,20 +235,6 @@ EXTRA_libf2c_a_SOURCES += \
EXTRA_libf2c_a_SOURCES += \
$(PMX_TREE)/libf2c/signbit.c
-lua_scripts = pmx2pdf
-
-scriptsdir = texmf-dist/scripts/pmx
-nodist_bin_SCRIPTS =
-
-include $(srcdir)/../../texk/am/script_links.am
-
-texmfdir = $(datarootdir)/$(scriptsdir)
-dist_texmf_SCRIPTS = $(lua_scripts:=.lua)
-
-install-data-hook: install-lua-links
-
-uninstall-hook: uninstall-links
-
dist_man1_MANS = pmx2pdf.1 pmxab.1 scor2prt.1
## Tests
diff --git a/utils/pmx/configure.ac b/utils/pmx/configure.ac
index d1b5d70..2ebccb4 100644
--- a/utils/pmx/configure.ac
+++ b/utils/pmx/configure.ac
@@ -26,14 +26,14 @@ AM_CONDITIONAL([WIN32], [test "x$kpse_cv_have_win32" != xno])
AM_CONDITIONAL([WIN32_WRAP],
[test -r $srcdir/../../texk/texlive/w32_wrapper/runscript.exe])
-dnl initial value for AM_CPPFLAGS
-AC_SUBST([AM_CPPFLAGS], ['-DNON_UNIX_STDIO'])
+dnl initial value for PMX_DEFINES
+AC_SUBST([PMX_DEFINES], ['-DNON_UNIX_STDIO'])
dnl WIN32 has no <sys/times.h>, native WIN32 is as MSDOS
KPSE_CHECK_WIN32
AS_CASE([$kpse_cv_have_win32],
- [native], [AM_CPPFLAGS="$AM_CPPFLAGS -DMSDOS"],
- [mingw32], [AM_CPPFLAGS="$AM_CPPFLAGS -DUSE_CLOCK"])
+ [native], [PMX_DEFINES="$PMX_DEFINES -DMSDOS"],
+ [mingw32], [PMX_DEFINES="$PMX_DEFINES -DUSE_CLOCK"])
dnl Checks for programs.
AC_PROG_INSTALL
@@ -45,7 +45,7 @@ AC_SEARCH_LIBS([sqrt], [m])
AC_CHECK_SIZEOF([long long])
if test $ac_cv_sizeof_long_long -lt 8; then
- AM_CPPFLAGS="$AM_CPPFLAGS -DNO_LONG_LONG"
+ PMX_DEFINES="$PMX_DEFINES -DNO_LONG_LONG"
fi
AC_SUBST([PMX_TREE], [pmx-]pmx_version)
diff --git a/utils/pmx/pmx2pdf.lua b/utils/pmx/pmx2pdf.lua
deleted file mode 100755
index 3779084..0000000
--- a/utils/pmx/pmx2pdf.lua
+++ /dev/null
@@ -1,158 +0,0 @@
-#!/usr/bin/env texlua
-
-VERSION = "0.2.1"
-
---[[
- pmx2pdf: processes MusiXTeX files using pmxab as a pre-processor
- (and deletes intermediate files)
-
- (c) Copyright 2011-12 Bob Tennent rdt@cs.queensu.ca
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2 of the License, or (at your
- option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
---]]
-
---[[
-
- ChangeLog:
- version 0.2.1 2012-05-15 RDT
- renamed to avoid possible name clashes
-
- version 0.2 2011-11-28 RDT
- added -i (retain intermediate files) option
-
- version 0.1 2011-07-12 RDT
-
---]]
-
-function usage()
- print("Usage: [texlua] pmx2pdf { option | basename[.pmx] } ... ")
- print("options: -v version")
- print(" -h help")
- print(" -l latex (or pdflatex)")
- print(" -p pdfetex (or pdflatex)")
- print(" -d dvipdfm")
- print(" -s stop at dvi")
- print(" -t stop at tex/mid")
- print(" -i retain intermediate files")
- print(" -f restore default processing")
-end
-
-function whoami ()
- print("This is pmx2pdf version ".. VERSION .. ".")
-end
-
-whoami()
-if #arg == 0 then
- usage()
- os.exit(0)
-end
-
--- defaults:
-tex = "etex"
-musixflx = "musixflx"
-dvi = "dvips"
-ps2pdf = "ps2pdf"
-intermediate = 1
-
-exit_code = 0
-narg = 1
-repeat
- this_arg = arg[narg]
- if this_arg == "-v" then
- os.exit(0)
- elseif this_arg == "-h" then
- usage()
- os.exit(0)
- elseif this_arg == "-l" then
- if tex == "pdfetex" then
- tex = "pdflatex"
- else
- tex = "latex"
- end
- elseif this_arg == "-p" then
- if tex == "latex" then
- tex = "pdflatex"
- else
- tex = "pdfetex"
- end
- dvi = ""; ps2pdf = ""
- elseif this_arg == "-d" then
- dvi = "dvipdfm"; ps2pdf = ""
- elseif this_arg == "-s" then
- dvi = ""; ps2pdf = ""
- elseif this_arg == "-f" then
- tex = "etex"; dvi = "dvips"; ps2pdf = "ps2pdf"; intermediate = 1
- elseif this_arg == "-t" then
- tex = ""; dvi = ""; ps2pdf = ""
- elseif this_arg == "-i" then
- intermediate = 0
- else
- filename = this_arg
- if filename ~= "" and string.sub(filename, -4, -1) == ".pmx" then
- filename = string.sub(filename, 1, -5)
- end
- if not io.open(filename .. ".pmx", "r") then
- print("Non-existent file: ", filename .. ".pmx")
- else
- print("Processing ".. filename .. ".pmx.")
- os.remove( filename .. ".mx2" )
- os.execute("pmxab" .. " " .. filename )
- pmxaerr = io.open("pmxaerr.dat", "r")
- if (not pmxaerr) then
- print("No log file.")
- os.exit(1)
- end
- linebuf = pmxaerr:read()
- err = tonumber(linebuf)
- pmxaerr:close()
- if ( err == 0 ) and
- ((tex == "") or os.execute(tex .. " " .. filename) == 0) and
- ((tex == "") or os.execute(musixflx .. " " .. filename) == 0) and
- ((tex == "") or os.execute(tex .. " " .. filename) == 0) and
- ((tex ~= "latex" and tex ~= "pdflatex")
- or (os.execute(tex .. " " .. filename) == 0)) and
- (dvi == "" or (os.execute(dvi .. " " .. filename) == 0)) and
- (ps2pdf == "" or (os.execute(ps2pdf .. " " .. filename .. ".ps") == 0) )
- then
- if ps2pdf ~= "" then
- print(filename .. ".pdf generated by " .. ps2pdf .. ".")
- end
- if intermediate == 1 then -- clean-up:
- os.remove( "pmxaerr.dat" )
- os.remove( filename .. ".mx1" )
- os.remove( filename .. ".mx2" )
- if dvi ~= "" then
- os.remove( filename .. ".dvi" )
- end
- if ps2pdf ~= "" then
- os.remove( filename .. ".ps" )
- end
- end
- else
- print("PMX/MusiXTeX processing of " .. filename .. ".pmx fails.\n")
- exit_code = 2
- --[[ uncomment for debugging
- print("tex = ", tex)
- print("dvi = ", dvi)
- print("ps2pdf = ", ps2pdf)
- --]]
- end
-
- end --if not io.open ...
- end --if this_arg == ...
- narg = narg+1
-until narg > #arg
-os.exit( exit_code )
diff --git a/utils/t1utils/ChangeLog b/utils/t1utils/ChangeLog
index d1f6d78..7a0f8b9 100644
--- a/utils/t1utils/ChangeLog
+++ b/utils/t1utils/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2011-11-04 Peter Breitenlohner <peb@mppmu.mpg.de>
* t1utils.test: Perform all sub-tests and report failed ones.
diff --git a/utils/t1utils/Makefile.am b/utils/t1utils/Makefile.am
index 772fef0..e8f6355 100644
--- a/utils/t1utils/Makefile.am
+++ b/utils/t1utils/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory utils/t1utils/
##
-## Copyright (C) 2008-2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2008-2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
#************************************************************************
@@ -26,7 +26,7 @@ EXTRA_DIST += $(T1UTILS_TREE)-PATCHES
dist-hook:
rm -rf `find $(distdir) -name .svn`
-INCLUDES = -I$(top_srcdir)/$(T1UTILS_TREE)/include
+AM_CPPFLAGS = -I$(top_srcdir)/$(T1UTILS_TREE)/include
AM_CFLAGS = $(WARNING_CFLAGS)
bin_PROGRAMS = t1ascii t1binary t1asm t1disasm t1unmac t1mac
diff --git a/utils/xpdfopen/ChangeLog b/utils/xpdfopen/ChangeLog
index f0ec83b..a68ea7b 100644
--- a/utils/xpdfopen/ChangeLog
+++ b/utils/xpdfopen/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Avoid use of deprecated INCLUDES.
+
2012-03-29 Peter Breitenlohner <peb@mppmu.mpg.de>
* utils.c: Move extern decl from here ...
diff --git a/utils/xpdfopen/Makefile.am b/utils/xpdfopen/Makefile.am
index 96289a5..9c25938 100644
--- a/utils/xpdfopen/Makefile.am
+++ b/utils/xpdfopen/Makefile.am
@@ -5,8 +5,8 @@
##
ACLOCAL_AMFLAGS = -I ../../m4
+AM_CPPFLAGS = $(X_CFLAGS)
AM_CFLAGS = $(WARNING_CFLAGS)
-INCLUDES = $(X_CFLAGS)
LDADD = $(X_LIBS) -lX11 -lXmu $(X_EXTRA_LIBS)
--
Debian packaging of texlive-bin)
Reply to: