[subversion-commit] SVN tetex-bin commit + diffs: r1107 - in
tetex-bin/trunk/debian: . patches
Frank Küster
frank at costa.debian.org
Fri Mar 24 09:18:02 UTC 2006
Author: frank
Date: 2006-03-24 09:18:01 +0000 (Fri, 24 Mar 2006)
New Revision: 1107
Modified:
tetex-bin/trunk/debian/changelog
tetex-bin/trunk/debian/common.functions.in
tetex-bin/trunk/debian/patches/patch-poppler
tetex-bin/trunk/debian/rules
Log:
* Change pdftex's version string to indicate that it uses libpoppler,
thanks to Julian for help with the code [frank]
(and propagate changes from tex-common)
Modified: tetex-bin/trunk/debian/changelog
===================================================================
--- tetex-bin/trunk/debian/changelog 2006-03-23 17:40:23 UTC (rev 1106)
+++ tetex-bin/trunk/debian/changelog 2006-03-24 09:18:01 UTC (rev 1107)
@@ -1,4 +1,4 @@
-tetex-bin (3.0-16) unstable; urgency=low
+tetex-bin (3.0-15.1) unreleased; urgency=low
* This package now again creates a libkpathsea-dev binary package.
Since the API has not changed, we can safely do that - the old
@@ -8,11 +8,13 @@
* Edit the changelog of the last version and remove the "to be
implemented" comment about applying xpdf patches again for sarge - in
fact this had been properly done before the upload. [frank]
+ * Change pdftex's version string to indicate that it uses libpoppler,
+ thanks to Julian for help with the code [frank]
* Translations:
- Update Dutch debconf translation, thanks to Vincent Zweije
<zweije at xs4all.nl> (closes: #358461) [frank]
- -- Frank Küster <frank at debian.org> Thu, 23 Mar 2006 09:07:27 +0100
+ -- Frank Küster <frank at debian.org> Fri, 24 Mar 2006 10:19:02 +0100
tetex-bin (3.0-15) unstable; urgency=medium
Modified: tetex-bin/trunk/debian/common.functions.in
===================================================================
--- tetex-bin/trunk/debian/common.functions.in 2006-03-23 17:40:23 UTC (rev 1106)
+++ tetex-bin/trunk/debian/common.functions.in 2006-03-24 09:18:01 UTC (rev 1107)
@@ -570,6 +570,8 @@
/etc/texmf/dvips/omega.cfg 20f3291d20f52a0af681cea63d491f22
/etc/texmf/dvips/config.omega 20f3291d20f52a0af681cea63d491f22
/etc/texmf/context/texexec.rme aca8d2729ceb83bc24852c0876cf884b
+
+ /etc/texmf/language.d/00tetex.cnf e057f645b860c3b4ac92a9b5a127c43e
"
get_sarge_md5sum_from_list(){
Modified: tetex-bin/trunk/debian/patches/patch-poppler
===================================================================
--- tetex-bin/trunk/debian/patches/patch-poppler 2006-03-23 17:40:23 UTC (rev 1106)
+++ tetex-bin/trunk/debian/patches/patch-poppler 2006-03-24 09:18:01 UTC (rev 1107)
@@ -1,18 +1,19 @@
- configure | 6 +--
- configure.in | 6 +--
- texk/web2c/pdfetexdir/pdfetex.mk | 5 ++-
- texk/web2c/pdftexdir/Makefile.in | 2 -
- texk/web2c/pdftexdir/depend.mk | 58 ++------------------------------------
- texk/web2c/pdftexdir/pdftex.mk | 7 +++-
- texk/web2c/pdftexdir/pdftoepdf.cc | 41 +++++++++++++-------------
- texk/web2c/pdftexdir/pdftosrc.cc | 36 +++++++++++------------
- texk/web2c/pdfxtexdir/pdfxtex.mk | 5 ++-
- 9 files changed, 63 insertions(+), 103 deletions(-)
+ configure | 6 +--
+ configure.in | 6 +--
+ texk/web2c/pdfetexdir/pdfetex.mk | 5 ++
+ texk/web2c/pdfetexdir/pdfetexextra.in | 2 -
+ texk/web2c/pdftexdir/Makefile.in | 2 -
+ texk/web2c/pdftexdir/depend.mk | 58 ++--------------------------------
+ texk/web2c/pdftexdir/pdftex.mk | 7 ++--
+ texk/web2c/pdftexdir/pdftoepdf.cc | 41 ++++++++++++------------
+ texk/web2c/pdftexdir/pdftosrc.cc | 36 ++++++++++-----------
+ texk/web2c/pdfxtexdir/pdfxtex.mk | 5 ++
+ 10 files changed, 64 insertions(+), 104 deletions(-)
Index: tetex-bin-3.0/texk/web2c/pdftexdir/depend.mk
===================================================================
---- tetex-bin-3.0.orig/texk/web2c/pdftexdir/depend.mk 2006-03-02 14:46:38.000000000 +0100
-+++ tetex-bin-3.0/texk/web2c/pdftexdir/depend.mk 2006-03-02 16:10:19.000000000 +0100
+--- tetex-bin-3.0.orig/texk/web2c/pdftexdir/depend.mk 2006-03-03 16:44:22.000000000 +0100
++++ tetex-bin-3.0/texk/web2c/pdftexdir/depend.mk 2006-03-24 10:16:26.000000000 +0100
@@ -1,54 +1,4 @@
-epdf.o: epdf.c ptexlib.h ../pdftexd.h ../texmfmp.h ../cpascal.h \
- ../config.h ../help.h ../texmfmem.h ../pdftexcoerce.h ptexmac.h
@@ -74,8 +75,8 @@
+pdftosrc.o: pdftosrc.cc
Index: tetex-bin-3.0/texk/web2c/pdftexdir/pdftoepdf.cc
===================================================================
---- tetex-bin-3.0.orig/texk/web2c/pdftexdir/pdftoepdf.cc 2006-03-02 14:46:38.000000000 +0100
-+++ tetex-bin-3.0/texk/web2c/pdftexdir/pdftoepdf.cc 2006-03-02 16:10:19.000000000 +0100
+--- tetex-bin-3.0.orig/texk/web2c/pdftexdir/pdftoepdf.cc 2006-03-03 16:44:22.000000000 +0100
++++ tetex-bin-3.0/texk/web2c/pdftexdir/pdftoepdf.cc 2006-03-24 10:16:27.000000000 +0100
@@ -26,22 +26,23 @@
#include <stdio.h>
#include <string.h>
@@ -154,8 +155,8 @@
pdftex_fail("pdf inclusion: invalid destination <%s>",
Index: tetex-bin-3.0/texk/web2c/pdftexdir/pdftosrc.cc
===================================================================
---- tetex-bin-3.0.orig/texk/web2c/pdftexdir/pdftosrc.cc 2006-03-02 14:46:38.000000000 +0100
-+++ tetex-bin-3.0/texk/web2c/pdftexdir/pdftosrc.cc 2006-03-02 16:10:19.000000000 +0100
+--- tetex-bin-3.0.orig/texk/web2c/pdftexdir/pdftosrc.cc 2006-03-03 16:44:22.000000000 +0100
++++ tetex-bin-3.0/texk/web2c/pdftexdir/pdftosrc.cc 2006-03-24 10:16:27.000000000 +0100
@@ -25,21 +25,21 @@
#include <stdio.h>
#include <string.h>
@@ -215,8 +216,8 @@
fprintf(stderr, "Invalid PDF file\n");
Index: tetex-bin-3.0/configure
===================================================================
---- tetex-bin-3.0.orig/configure 2006-03-02 16:10:18.000000000 +0100
-+++ tetex-bin-3.0/configure 2006-03-02 16:10:19.000000000 +0100
+--- tetex-bin-3.0.orig/configure 2006-03-24 10:16:26.000000000 +0100
++++ tetex-bin-3.0/configure 2006-03-24 10:16:27.000000000 +0100
@@ -3292,9 +3292,9 @@
# we need libxpdf for pdf[ex]tex
@@ -232,8 +233,8 @@
Index: tetex-bin-3.0/configure.in
===================================================================
---- tetex-bin-3.0.orig/configure.in 2006-03-02 14:46:38.000000000 +0100
-+++ tetex-bin-3.0/configure.in 2006-03-02 16:10:19.000000000 +0100
+--- tetex-bin-3.0.orig/configure.in 2006-03-03 16:44:22.000000000 +0100
++++ tetex-bin-3.0/configure.in 2006-03-24 10:16:27.000000000 +0100
@@ -145,9 +145,9 @@
# we need libxpdf for pdf[ex]tex
@@ -249,8 +250,8 @@
Index: tetex-bin-3.0/texk/web2c/pdftexdir/Makefile.in
===================================================================
---- tetex-bin-3.0.orig/texk/web2c/pdftexdir/Makefile.in 2006-03-02 14:46:38.000000000 +0100
-+++ tetex-bin-3.0/texk/web2c/pdftexdir/Makefile.in 2006-03-02 16:10:19.000000000 +0100
+--- tetex-bin-3.0.orig/texk/web2c/pdftexdir/Makefile.in 2006-03-03 16:44:22.000000000 +0100
++++ tetex-bin-3.0/texk/web2c/pdftexdir/Makefile.in 2006-03-24 10:16:27.000000000 +0100
@@ -8,7 +8,7 @@
kpathsea_srcdir_parent = $(srcdir)/../..
kpathsea_dir_parent = ../..
@@ -262,8 +263,8 @@
.SUFFIXES: .cc .o
Index: tetex-bin-3.0/texk/web2c/pdftexdir/pdftex.mk
===================================================================
---- tetex-bin-3.0.orig/texk/web2c/pdftexdir/pdftex.mk 2006-03-02 14:46:38.000000000 +0100
-+++ tetex-bin-3.0/texk/web2c/pdftexdir/pdftex.mk 2006-03-02 16:10:19.000000000 +0100
+--- tetex-bin-3.0.orig/texk/web2c/pdftexdir/pdftex.mk 2006-03-03 16:44:22.000000000 +0100
++++ tetex-bin-3.0/texk/web2c/pdftexdir/pdftex.mk 2006-03-24 10:16:27.000000000 +0100
@@ -13,6 +13,9 @@
pdftex_bin = pdftex pdfetex pdfxtex ttf2afm pdftosrc
linux_build_dir = $(HOME)/pdftex/build/linux/texk/web2c
@@ -294,8 +295,8 @@
check: pdftosrc-check
Index: tetex-bin-3.0/texk/web2c/pdfetexdir/pdfetex.mk
===================================================================
---- tetex-bin-3.0.orig/texk/web2c/pdfetexdir/pdfetex.mk 2006-03-02 14:46:38.000000000 +0100
-+++ tetex-bin-3.0/texk/web2c/pdfetexdir/pdfetex.mk 2006-03-02 16:10:19.000000000 +0100
+--- tetex-bin-3.0.orig/texk/web2c/pdfetexdir/pdfetex.mk 2006-03-03 16:44:22.000000000 +0100
++++ tetex-bin-3.0/texk/web2c/pdfetexdir/pdfetex.mk 2006-03-24 10:16:27.000000000 +0100
@@ -8,13 +8,16 @@
pdfetex = @PETEX@ pdfetex
pdfetexdir = pdfetexdir
@@ -316,8 +317,8 @@
$(pdfetex_c) pdfetexcoerce.h pdfetexd.h: pdfetex.p $(web2c_texmf)
Index: tetex-bin-3.0/texk/web2c/pdfxtexdir/pdfxtex.mk
===================================================================
---- tetex-bin-3.0.orig/texk/web2c/pdfxtexdir/pdfxtex.mk 2006-03-02 14:46:38.000000000 +0100
-+++ tetex-bin-3.0/texk/web2c/pdfxtexdir/pdfxtex.mk 2006-03-02 16:10:19.000000000 +0100
+--- tetex-bin-3.0.orig/texk/web2c/pdfxtexdir/pdfxtex.mk 2006-03-03 16:44:22.000000000 +0100
++++ tetex-bin-3.0/texk/web2c/pdfxtexdir/pdfxtex.mk 2006-03-24 10:16:27.000000000 +0100
@@ -8,13 +8,16 @@
pdfxtex = @PXTEX@ pdfxtex
pdfxtexdir = pdfxtexdir
@@ -336,3 +337,16 @@
# C file dependencies.
$(pdfxtex_c) pdfxtexcoerce.h pdfxtexd.h: pdfxtex.p $(web2c_texmf) pdfxtexdir/pdfxtex.defines
+Index: tetex-bin-3.0/texk/web2c/pdfetexdir/pdfetexextra.in
+===================================================================
+--- tetex-bin-3.0.orig/texk/web2c/pdfetexdir/pdfetexextra.in 2005-07-20 12:28:21.000000000 +0200
++++ tetex-bin-3.0/texk/web2c/pdfetexdir/pdfetexextra.in 2006-03-24 10:17:29.000000000 +0100
+@@ -26,7 +26,7 @@
+ (generated from ../lib/texmfmp.c).
+ */
+
+-#define BANNER "This is pdfeTeX, Version 3.141592-PDFTEX-VERSION-ETEX-VERSION"
++#define BANNER "This is pdfeTeX using libpoppler, Version 3.141592-PDFTEX-VERSION-ETEX-VERSION"
+ #define COPYRIGHT_HOLDER "Peter Breitenlohner (eTeX)/Han The Thanh (pdfTeX)"
+ #define AUTHOR NULL
+ #define PROGRAM_HELP PDFETEXHELP
Modified: tetex-bin/trunk/debian/rules
===================================================================
--- tetex-bin/trunk/debian/rules 2006-03-23 17:40:23 UTC (rev 1106)
+++ tetex-bin/trunk/debian/rules 2006-03-24 09:18:01 UTC (rev 1107)
@@ -52,7 +52,7 @@
package=tetex-bin
sublib=libkpathsea4
-subdev=libkpathsea4-dev
+subdev=libkpathsea-dev
sharedir=debian/$(package)/usr/share
txmfdir=$(sharedir)/texmf
@@ -260,7 +260,7 @@
install-lib: build-stamp
# libkpathsea4 and most of the dev-package is installed by dh_movefiles
-# libkpathsea4-dev installer
+# libkpathsea-dev installer
mkdir -p debian/$(subdev)/usr/share/doc
(cd debian/$(subdev)/usr/share/doc; ln -s $(sublib) $(subdev))
More information about the Pkg-tetex-commits
mailing list