[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Please unblock tetex-bin, texlive-bin



Dear release team,

(writing in the name of Frank Küster, the debian-tex Team and myself)

please

unblock tetex-bin/3.0-29
unblock texlive-bin/2005.dfsg.2-10


First we describe the changes to tetex, and below the changes to
texlive:

tetex-bin only fixes one important bug; people in India might consider
it grave:

tetex-bin (3.0-29) unstable; urgency=low

  * Apply a patch from upstream (Mark A. Wicks) to prevent dvipdfm from
    crashing when called in a time zone having an offset from GMT, which is
    not an integer number. (Closes: #291438) [hilmar]

 -- Frank KÃŒster <frank@debian.org>  Wed, 10 Jan 2007 01:49:56 +0530

(Calcutta is one of these timezones, and dvipdfm would always segfault
there no matter what you do with it).

Of course the timezone patch is tested locally with my own files, both
"in" Zurich and "in" Calcutta, and by building advi (which uses
dvipdfm). The complete debdiff contains only svn version number changes,
changelog entries and the following patch

--- tetex-bin-3.0/texk/dvipdfm/pdfdoc.c.orig	2003-01-28 00:18:05.000000000 +0100
+++ tetex-bin-3.0/texk/dvipdfm/pdfdoc.c	2007-01-05 16:29:14.000000000 +0100
@@ -232,13 +232,7 @@
 
 static char *asn_date (void)
 {
-#ifndef HAVE_TIMEZONE
-  #ifdef TM_GM_TOFF
-     #define timezone (bdtime->gm_toff)
-  #else
-     #define timezone 0l
-#endif /* TM_GM_TOFF */
-#endif /* HAVE_TIMEZONE */
+  long tz_offset;
   static char date_string[24];
   time_t current_time;
   struct tm *bd_time;
@@ -247,10 +241,28 @@
   }
   time(&current_time);
   bd_time = localtime(&current_time);
-  sprintf (date_string, "D:%04d%02d%02d%02d%02d%02d%+03ld'%02ld'",
-	   bd_time -> tm_year+1900, bd_time -> tm_mon+1, bd_time -> tm_mday,
-	   bd_time -> tm_hour, bd_time -> tm_min, bd_time -> tm_sec,
-	   -timezone/3600, timezone%3600);
+
+#ifdef HAVE_TM_GMTOFF  /* Preferred way to get time zone offset */
+  tz_offset = bd_time->tm_gmtoff;
+#else
+#ifdef HAVE_TIMEZONE   /* Plan B --- use external variable 'timezone'
+                       /* (may not provide correct offset for daylight savings time) */
+  tz_offset = - timezone;
+#else                  /* Last resort --- without more information, set offset to zero */
+  tz_offset = 0l;
+#endif /* HAVE_TIMEZONE */
+#endif /* HAVE_TM_GMTOFF */
+
+  if (tz_offset == 0l) {
+    sprintf (date_string, "D:%04d%02d%02d%02d%02d%02dZ00'00'",
+	     bd_time -> tm_year+1900, bd_time -> tm_mon+1, bd_time -> tm_mday,
+	     bd_time -> tm_hour, bd_time -> tm_min, bd_time -> tm_sec);
+  } else {
+    sprintf (date_string, "D:%04d%02d%02d%02d%02d%02d%c%02ld'%02ld'",
+             bd_time -> tm_year+1900, bd_time -> tm_mon+1, bd_time -> tm_mday,
+             bd_time -> tm_hour, bd_time -> tm_min, bd_time -> tm_sec,
+	     (tz_offset>0)? '+':'-', abs(tz_offset)/3600, (abs(tz_offset)/60)%60);
+  }
   return date_string;
 }
 
***********************************************************

texlive-bin_2005.dfsg.2-10 fixes the same problem, furthermore it adds
some functionality that is present in teTeX but was missing in TeXlive,
or fixes bugs already fixed in teTeX:

texlive-bin (2005.dfsg.2-10) unstable; urgency=low

  * rebuild from old packaging machinery

 -- Norbert Preining <preining@debian.org>  Wed, 10 Jan 2007 14:12:09 +0100

texlive-bin (2005.dfsg.2-9) unstable; urgency=low

  * Apply patch by Julian Gilbey <jdg@debian.org> to prevent mktexlsr from
    creating ls-R in root's home directory (closes: #402925)
  * Apply a patch by "Mark A. Wicks" <mwicks@kettering.edu> to fix a crash
    of dvipdfm in half-hour timezones (Closes: #403267)

 -- Norbert Preining <preining@debian.org>  Thu,  4 Jan 2007 00:47:50 +0100

texlive-bin (2005.dfsg.2-8) unstable; urgency=low

  * move bin-ttfutils to tl-font-utils, blacklist everything but ttf2afm,
    add bin-ttfutils.tpm and ttf2afm.1 to the source package
    (Closes: #402983) (Closes also ubuntu #75545)
  * reinclude pslatex script and its manpage into texlive-base-bin.

 -- Norbert Preining <preining@debian.org>  Thu, 28 Dec 2006 16:15:05 +0100


Among these,

- the change from -9 to -10 reverts an undocumented change in -9, a
  rewrite of the infrastructure that creates the source packages from
  our repository.  Binary packages are the same in -9 and -10, but the
  source debdiff is much smaller between -7 and -10 compared to between
  -7 and -9.

- The first item in -9 is a fix that, in tetex-bin, has already been
  approved during the freeze, the tetex-bin changelog items that close
  bugs #402763 and #294197.

- The second one in -9 is the same dvipdfm timezone fix as in the newest
  tetex-bin package.

- The first item in -8 means essentially "add /usr/bin/ttf2afm and its
  manpage", see also the explanation in the comment in tpm2deb.cfg in
  the debdiff below.  The utility is also in tetex-bin, the source is a
  bit newer in TeXlive.  It is never used in the internal TeX
  infrastructure, just a utility for users who want to extract Adobe
  Font Metrics from TTF fonts.

- The second item adds a script that is identical (no diff) to the one
  already present in tetex-bin.

Attached is a diff between the unpacked source trees (note that
CHANGES.packaging documents changes in the SVN repository, also for
other source packages, so there are more in there than in the actual
source package), and the debdiffs for the two binary packages where the
changes are more than the version number in the control file.  The
others have been posted at
http://lists.debian.org/debian-tex-maint/2007/01/msg00186.html

Thanks for considering

Norbert and Frank


-------------------------------------------------------------------------------
Dr. Norbert Preining <preining@logic.at>                    Università di Siena
Debian Developer <preining@debian.org>                         Debian TeX Group
gpg DSA: 0x09C5B094      fp: 14DF 2E6C 0307 BE6D AD76  A9C0 D2BF 4AA3 09C5 B094
-------------------------------------------------------------------------------
SKELLOW (adj.)
Descriptive of the satisfaction experienced when looking at a really
good dry-stone wall.
			--- Douglas Adams, The Meaning of Liff
diff -urN /data/TeX/debian/tug/Debian/src/texlive-bin-2005.dfsg.2-7/debian/changelog texlive-bin-2005.dfsg.2/debian/changelog
--- /data/TeX/debian/tug/Debian/src/texlive-bin-2005.dfsg.2-7/debian/changelog	2007-01-10 14:26:26.000000000 +0100
+++ texlive-bin-2005.dfsg.2/debian/changelog	2007-01-10 15:41:24.000000000 +0100
@@ -1,3 +1,27 @@
+texlive-bin (2005.dfsg.2-10) unstable; urgency=low
+
+  * rebuild from old packaging machinery
+
+ -- Norbert Preining <preining@debian.org>  Wed, 10 Jan 2007 14:12:09 +0100
+
+texlive-bin (2005.dfsg.2-9) unstable; urgency=low
+
+  * Apply patch by Julian Gilbey <jdg@debian.org> to prevent mktexlsr from
+    creating ls-R in root's home directory (closes: #402925)
+  * Apply a patch by "Mark A. Wicks" <mwicks@kettering.edu> to fix a crash
+    of dvipdfm in half-hour timezones (Closes: #403267)
+
+ -- Norbert Preining <preining@debian.org>  Thu,  4 Jan 2007 00:47:50 +0100
+
+texlive-bin (2005.dfsg.2-8) unstable; urgency=low
+
+  * move bin-ttfutils to tl-font-utils, blacklist everything but ttf2afm,
+    add bin-ttfutils.tpm and ttf2afm.1 to the source package
+    (Closes: #402983) (Closes also ubuntu #75545)
+  * reinclude pslatex script and its manpage into texlive-base-bin.
+
+ -- Norbert Preining <preining@debian.org>  Thu, 28 Dec 2006 16:15:05 +0100
+
 texlive-bin (2005.dfsg.2-7) unstable; urgency=low
 
   * change shebang for getnonfreefonts to /bin/bash (Closes: #398112)
diff -urN /data/TeX/debian/tug/Debian/src/texlive-bin-2005.dfsg.2-7/debian/CHANGES.packaging texlive-bin-2005.dfsg.2/debian/CHANGES.packaging
--- /data/TeX/debian/tug/Debian/src/texlive-bin-2005.dfsg.2-7/debian/CHANGES.packaging	2007-01-10 14:26:26.000000000 +0100
+++ texlive-bin-2005.dfsg.2/debian/CHANGES.packaging	2007-01-10 15:41:24.000000000 +0100
@@ -1,8 +1,45 @@
 #
 # ChangeLog for tpm2deb.pl and relatives
 #
-# $Id: CHANGES.packaging 2058 2006-12-12 07:06:40Z preining $
+# $Id: CHANGES.packaging 2267 2007-01-10 14:08:58Z preining $
 #
+#
+
+release texlive-bin 2005.dfsg.2-10
+
+2007-01-10
+  * rebuild texlive-bin from old svn layout to make debdiffs small
+
+release texlive-bin 2005.dfsg.2-9
+
+2007-01-04
+  * texlive-bin: Apply a patch by "Mark A. Wicks" <mwicks@kettering.edu> to 
+    fix a crash of dvipdfm in half-hour timezones (Closes: #403267)
+
+2007-01-02
+  * texlive-bin: Apply patch by Julian Gilbey <jdg@debian.org> to prevent 
+    mktexlsr from creating ls-R in root's home directory (closes: #402925)
+
+release texlive-bin 2005.dfsg.2-8
+release texlive-base 2005.dfsg.2-5
+release texlive-extra 2005.dfsg.2-4
+
+2006-12-18
+  * texlive-bin: reinclude pslatex script and its manpage into
+    texlive-base-bin.
+
+2006-12-14
+  * texlive-extra: remap infix-RPN.tex and .sty from the doc hieracy to 
+    texmf-texlive (Closes: #402987) (closes Ubuntu bug #69690)
+  * texlive-bin: move bin-ttfutils to tl-font-utils, blacklist everything
+    but ttf2afm, add bin-ttfutils.tpm and ttf2afm.1 to the source
+    package (Closes: #402983) (Closes ubuntu #75545)
+  * all: tpm2deb.pl allows adding files virtually to the orig.tar.gz by
+    putting them into addons-per-source/$srcpackage/. This was necessary
+    to fix the above as bin-ttfutils.tpm was missing.
+    Note that binary files are NOT dealt with ATM, so do NOT install
+    binary files into addons-per-source/ !!
+  * redo a bit of documentation in the README file
 
 release texlive-bin 2005.dfsg.2-7
 
diff -urN /data/TeX/debian/tug/Debian/src/texlive-bin-2005.dfsg.2-7/debian/control texlive-bin-2005.dfsg.2/debian/control
--- /data/TeX/debian/tug/Debian/src/texlive-bin-2005.dfsg.2-7/debian/control	2007-01-10 14:26:26.000000000 +0100
+++ texlive-bin-2005.dfsg.2/debian/control	2007-01-10 15:41:24.000000000 +0100
@@ -78,6 +78,7 @@
   bin-afm2pl -- Macro package for TeX (the most popular).
   bin-fontware -- Fontware binaries.
   bin-ps2pkm -- Type1 to PK converter.
+  bin-ttfutils -- TTF support tools.
 
 Package: texlive-metapost
 Architecture: any
diff -urN /data/TeX/debian/tug/Debian/src/texlive-bin-2005.dfsg.2-7/debian/patches/00list texlive-bin-2005.dfsg.2/debian/patches/00list
--- /data/TeX/debian/tug/Debian/src/texlive-bin-2005.dfsg.2-7/debian/patches/00list	2007-01-10 14:26:26.000000000 +0100
+++ texlive-bin-2005.dfsg.2/debian/patches/00list	2007-01-10 15:41:24.000000000 +0100
@@ -1,4 +1,5 @@
 10_mktexlsr_tmp_and_lsr_fix.dpatch
+10a_mktexlsr_sudo_fix.dpatch
 11_fix_pkfix_invocation.dpatch
 12_fix_epstopdf_invocation.dpatch
 12a_fix_thumbpdf_invocation.dpatch
@@ -26,3 +27,4 @@
 54_checklib_fixes.dpatch
 55_texconfig_stuff.dpatch
 60_getnonfreefonts_bash.dpatch
+61_dvipdfm_timezone.dpatch
diff -urN /data/TeX/debian/tug/Debian/src/texlive-bin-2005.dfsg.2-7/debian/patches/10a_mktexlsr_sudo_fix.dpatch texlive-bin-2005.dfsg.2/debian/patches/10a_mktexlsr_sudo_fix.dpatch
--- /data/TeX/debian/tug/Debian/src/texlive-bin-2005.dfsg.2-7/debian/patches/10a_mktexlsr_sudo_fix.dpatch	1970-01-01 01:00:00.000000000 +0100
+++ texlive-bin-2005.dfsg.2/debian/patches/10a_mktexlsr_sudo_fix.dpatch	2007-01-10 15:41:24.000000000 +0100
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_mktexlsr_sudo_fix.dpatch by Julian Gilbey <jdg@debian.org>
+##
+## DP: Prevent mktexlsr from creating ls-R in root's home directory
+
+@DPATCH@
+--- /data/TeX/debian/tug/Debian/src/texlive-bin-2005.dfsg.2-7/build/TeX/texk/kpathsea/mktexlsr	2007-01-10 15:33:44.000000000 +0100
++++ ./build/TeX/texk/kpathsea/mktexlsr	2007-01-10 15:34:34.000000000 +0100
+@@ -75,6 +75,9 @@
+ '
+   set x `kpsewhich --show-path=ls-R | tr : '
+ ' | sort | uniq`; shift
++  if test "`id -u`" -eq 0; then
++    NOROOTHOME=true
++  fi
+   IFS=$OIFS
+ }
+ 
+@@ -82,6 +85,10 @@
+   # Prepend cwd if the directory was relative.
+   case "$TEXMFLS_R" in
+   "") continue ;;  # Strictly speaking, it is an error if this case is taken.
++  $HOME/*) if test -n "$NOROOTHOME"; then
++  		tty -s && echo "$progname: Skipping $TEXMFLS_R" >&2
++		continue
++	   fi ;;
+   /* | [A-z]:/*) ;;
+   *)  TEXMFLS_R="`pwd`/$TEXMFLS_R"
+   esac
diff -urN /data/TeX/debian/tug/Debian/src/texlive-bin-2005.dfsg.2-7/debian/patches/61_dvipdfm_timezone.dpatch texlive-bin-2005.dfsg.2/debian/patches/61_dvipdfm_timezone.dpatch
--- /data/TeX/debian/tug/Debian/src/texlive-bin-2005.dfsg.2-7/debian/patches/61_dvipdfm_timezone.dpatch	1970-01-01 01:00:00.000000000 +0100
+++ texlive-bin-2005.dfsg.2/debian/patches/61_dvipdfm_timezone.dpatch	2007-01-10 15:41:24.000000000 +0100
@@ -0,0 +1,56 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 61_dvipdfm_timezone.dpatch by "Mark A. Wicks" <mwicks@kettering.edu>
+##
+## DP: fix crash of dvipdfm with 0.5 timezones
+
+@DPATCH@
+--- ./build/TeX/texk/dvipdfm/pdfdoc.c.orig	2003-01-28 00:18:05.000000000 +0100
++++ ./build/TeX/texk/dvipdfm/pdfdoc.c	2007-01-04 00:43:19.000000000 +0100
+@@ -232,13 +232,7 @@
+ 
+ static char *asn_date (void)
+ {
+-#ifndef HAVE_TIMEZONE
+-  #ifdef TM_GM_TOFF
+-     #define timezone (bdtime->gm_toff)
+-  #else
+-     #define timezone 0l
+-#endif /* TM_GM_TOFF */
+-#endif /* HAVE_TIMEZONE */
++  long tz_offset;
+   static char date_string[24];
+   time_t current_time;
+   struct tm *bd_time;
+@@ -247,10 +241,28 @@
+   }
+   time(&current_time);
+   bd_time = localtime(&current_time);
+-  sprintf (date_string, "D:%04d%02d%02d%02d%02d%02d%+03ld'%02ld'",
+-	   bd_time -> tm_year+1900, bd_time -> tm_mon+1, bd_time -> tm_mday,
+-	   bd_time -> tm_hour, bd_time -> tm_min, bd_time -> tm_sec,
+-	   -timezone/3600, timezone%3600);
++
++#ifdef HAVE_TM_GMTOFF  /* Preferred way to get time zone offset */
++  tz_offset = bd_time->tm_gmtoff;
++#else
++#ifdef HAVE_TIMEZONE   /* Plan B --- use external variable 'timezone'
++                       /* (may not provide correct offset for daylight savings time) */
++  tz_offset = - timezone;
++#else                  /* Last resort --- without more information, set offset to zero */
++  tz_offset = 0l;
++#endif /* HAVE_TIMEZONE */
++#endif /* HAVE_TM_GMTOFF */
++
++  if (tz_offset == 0l) {
++    sprintf (date_string, "D:%04d%02d%02d%02d%02d%02dZ00'00'",
++	     bd_time -> tm_year+1900, bd_time -> tm_mon+1, bd_time -> tm_mday,
++	     bd_time -> tm_hour, bd_time -> tm_min, bd_time -> tm_sec);
++  } else {
++    sprintf (date_string, "D:%04d%02d%02d%02d%02d%02d%c%02ld'%02ld'",
++             bd_time -> tm_year+1900, bd_time -> tm_mon+1, bd_time -> tm_mday,
++             bd_time -> tm_hour, bd_time -> tm_min, bd_time -> tm_sec,
++	     (tz_offset>0)? '+':'-', abs(tz_offset)/3600, (abs(tz_offset)/60)%60);
++  }
+   return date_string;
+ }
+ 
diff -urN /data/TeX/debian/tug/Debian/src/texlive-bin-2005.dfsg.2-7/debian/texlive-base-bin.root/usr/bin/pslatex texlive-bin-2005.dfsg.2/debian/texlive-base-bin.root/usr/bin/pslatex
--- /data/TeX/debian/tug/Debian/src/texlive-bin-2005.dfsg.2-7/debian/texlive-base-bin.root/usr/bin/pslatex	1970-01-01 01:00:00.000000000 +0100
+++ texlive-bin-2005.dfsg.2/debian/texlive-base-bin.root/usr/bin/pslatex	2007-01-10 15:41:24.000000000 +0100
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+# Copyright 1994 David Carlisle
+# This file may be redistributed and/or modified under the terms of the
+# LaTeX Project Public License distributed from CTAN archives in directory
+# macros/latex/base/lppl.txt; either version 1 of the License, or (at
+# your option) any later version.
+
+test -f /bin/sh5 && test -z "$RUNNING_SH5" \
+  && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \
+  && { RUNNING_SH5=true; export RUNNING_SH5; exec /bin/sh5 $0 ${1+"$@"}; }
+unset RUNNING_SH5
+
+test -f /bin/bsh && test -z "$RUNNING_BSH" \
+  && { UNAMES=`uname -s`; test "x$UNAMES" = xAIX; } 2>/dev/null \
+  && { RUNNING_BSH=true; export RUNNING_BSH; exec /bin/bsh $0 ${1+"$@"}; }
+unset RUNNING_BSH
+
+# hack around a bug in zsh:
+test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
+
+# we want to be able to use options to latex:
+while :; do
+  case $1 in
+    -*)
+      latexoptions="$latexoptions \"$1\""
+      shift;;
+    *)
+      break;;
+  esac
+done
+
+echo
+echo "*************************************"
+echo "* Using LaTeX, with pslatex package *"
+echo "*************************************"
+echo
+
+# messing around with \PSLATEXTMP is for AUCTeX which calls
+# documents via latex \nonstopmode \input{file}
+
+latex $latexoptions \
+    "\AtBeginDocument{\RequirePackage{pslatex}}"\
+    "\def\PSLATEXTMP{\futurelet\PSLATEXTMP\PSLATEXTMPB}"\
+    "\def\PSLATEXTMPB{\ifx\PSLATEXTMP\nonstopmode\else\input\fi}"\
+    "\PSLATEXTMP" ${1+"$@"}
diff -urN /data/TeX/debian/tug/Debian/src/texlive-bin-2005.dfsg.2-7/debian/texlive-base-bin.root/usr/share/man/man1/pslatex.1 texlive-bin-2005.dfsg.2/debian/texlive-base-bin.root/usr/share/man/man1/pslatex.1
--- /data/TeX/debian/tug/Debian/src/texlive-bin-2005.dfsg.2-7/debian/texlive-base-bin.root/usr/share/man/man1/pslatex.1	1970-01-01 01:00:00.000000000 +0100
+++ texlive-bin-2005.dfsg.2/debian/texlive-base-bin.root/usr/share/man/man1/pslatex.1	2007-01-10 15:41:24.000000000 +0100
@@ -0,0 +1,44 @@
+.TH "pslatex" "1" "September 2000" "teTeX" "teTeX" 
+.PP 
+.SH "NAME" 
+pslatex \- utility to typeset LaTeX files using PostScript fonts
+.PP 
+.SH "SYNOPSIS" 
+.PP 
+\fBpslatex\fP [\fILATEXARGS\fP] \fILATEXFILE\fP[\&.tex]
+.PP 
+.SH "DESCRIPTION" 
+.PP 
+\fBpslatex\fP allows you to typeset a LaTeX source file using basic
+Adobe Type 1 PostScript fonts (Times, Helvetica, and Courier)
+\fIwithout\fP editing the file to load the necessary packages\&.
+.PP 
+It takes any arguments that \fBlatex\fP(1) can take\&.
+.PP 
+.SH "OPTIONS" 
+.PP 
+None\&.
+.PP 
+.SH "FILES" 
+.PP 
+Many\&.  See the readme file for \fIpslatex\&.sty\fP\&.
+.PP 
+.SH "SEE ALSO" 
+.PP 
+\fBlatex\fP(1), \fI\fITEXMF\fP/latex/pslatex/00readme\&.txt\fP
+.PP 
+.SH "BUGS" 
+.PP 
+None known\&.  Report any found to the author\&.
+.PP 
+.SH "AUTHOR" 
+.PP 
+\fBpslatex\fP was written by David Carlisle
+<david@dcarlisle\&.demon\&.co\&.uk>\&.
+.PP 
+This manual page was written by C\&.M\&. Connelly
+<c@eskimo\&.com>, for
+the Debian GNU/Linux system\&.  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)\&.
diff -urN /data/TeX/debian/tug/Debian/src/texlive-bin-2005.dfsg.2-7/debian/tpm2deb.cfg texlive-bin-2005.dfsg.2/debian/tpm2deb.cfg
--- /data/TeX/debian/tug/Debian/src/texlive-bin-2005.dfsg.2-7/debian/tpm2deb.cfg	2007-01-10 14:26:26.000000000 +0100
+++ texlive-bin-2005.dfsg.2/debian/tpm2deb.cfg	2007-01-10 15:41:24.000000000 +0100
@@ -2,7 +2,7 @@
 # tpm2deb.cfg
 # (c) 2005-2006 Norbert Preining
 #
-# $Id: tpm2deb.cfg 2029 2006-12-09 15:18:01Z preining $
+# $Id: tpm2deb.cfg 2070 2006-12-14 11:22:37Z preining $
 #
 # describe relations between texlive and other debian packages, but als
 # which packages and files should be blacklisted
@@ -70,11 +70,30 @@
 name;collection-metapost;texlive-metapost;texlive-bin
 name;collection-omega;texlive-omega;texlive-bin
 name;collection-pdfetex;texlive-pdfetex;texlive-bin
-# collection psutils and ttfutils die, should be proper debian packages
+# collection psutils dies, should be proper debian packages
 # same for graphicstools
 #name;collection-psutils;texlive-ps-utils;texlive-bin
 depends;texlive-full;psutils
+#
+# collection-ttfutils contains one binary which should be included: ttf2afm
+# so we cannot blacklist it, but we do NOT want to create a new binary
+# package, so we move the bin-ttfutils to the texlive-font-utils collection
+# and blacklist all the files not belonging to ttf2afm
+# lets hope it works!
 #name;collection-ttfutils;texlive-ttf-utils;texlive-bin
+move;bin-ttfutils;texlive-font-utils
+blacklist;file;texmf/fonts/enc/ttf2pk/base/T1-WGL4.enc
+blacklist;file;texmf/fonts/map/ttf2pk/config/ttfonts.map
+blacklist;file;texmf/fonts/sfd/*
+blacklist;file;texmf/ttf2pk/*
+blacklist;file;texmf/doc/man/man1/ttf2pk.1
+blacklist;file;texmf/doc/man/man1/ttf2tfm.1
+blacklist;file;texmf/doc/man/man1/ttfdump.1
+blacklist;file;texmf/doc/ttf2pk/ttf2pk.doc
+blacklist;file;texmf/doc/ttf2pk/ttf2pk.txt
+blacklist;file;texmf/doc/ttf2pk/ttf2tfm.txt
+blacklist;file;bin/*/ttf2pk
+blacklist;file;bin/*/ttf2tfm
 #name;collection-graphicstools;texlive-graphics-tools;texlive-bin
 name;collection-music;texlive-music;texlive-bin
 name;collection-langindic;texlive-lang-indic;texlive-bin
@@ -463,6 +482,9 @@
 mapping;texmf[^/]*/tex/latex/subfig/ltxdoc.cfg;;
 # pst-3d.tex is wrongly installed
 mapping;texmf-dist/doc/latex/pst-3d/pst-3d.tex;remap;$rundest/$texmfdist/tex/generic/pst-3d/pst-3d.tex
+# infix-RPN.tex is wrongly put into the doc hierachy
+mapping;texmf-dist/doc/generic/pst-infixplot/infix-RPN.tex;remap;$rundest/$texmfdist/tex/generic/pst-infixplot/infix-RPN.tex
+mapping;texmf-dist/doc/generic/pst-infixplot/infix-RPN.sty;remap;$rundest/$texmfdist/tex/latex/pst-infixplot/infix-RPN.sty
 # ibycus4.map is a mf input file and(!) and TeX input file. One copy is 
 # installed in tex/generic, but this copy should go into the mf input path
 mapping;texmf-dist/fonts/map/dvips/ibygrk/ibycus4.map;remap;$rundest/$texmfdist/fonts/source/public/ibygrk/ibycus4.map
diff -urN /data/TeX/debian/tug/Debian/src/texlive-bin-2005.dfsg.2-7/debian/tpm2deb.pl texlive-bin-2005.dfsg.2/debian/tpm2deb.pl
--- /data/TeX/debian/tug/Debian/src/texlive-bin-2005.dfsg.2-7/debian/tpm2deb.pl	2007-01-10 14:26:26.000000000 +0100
+++ texlive-bin-2005.dfsg.2/debian/tpm2deb.pl	2007-01-10 15:41:24.000000000 +0100
@@ -4,7 +4,7 @@
 # machinery to create debian packages from TeX Live depot
 # (c) 2005, 2006 Norbert Preining
 #
-# $Id: tpm2deb.pl 2026 2006-12-09 14:49:08Z preining $
+# $Id: tpm2deb.pl 2266 2007-01-10 14:07:22Z preining $
 #
 # configuration is done via the file tpm2deb.cfg
 #
@@ -761,6 +761,11 @@
 			$nn =~ s/^all\.//;
 			mycopy("$f", "$debdest/$nn");
 		}
+		# add additional files
+		if (-d "$mydir/addons-per-source/$package") {
+			`cp -a "$mydir/addons-per-source/$package"/* $tmpdir/`;
+			`find $tmpdir/ -name .svn -type d -print0 | xargs -0 rm -rf` ;
+		}
 	}
 	#
 	# Things from addons-per-bin
diff -urN /data/TeX/debian/tug/Debian/src/texlive-bin-2005.dfsg.2-7/texmf/doc/man/man1/ttf2afm.1 texlive-bin-2005.dfsg.2/texmf/doc/man/man1/ttf2afm.1
--- /data/TeX/debian/tug/Debian/src/texlive-bin-2005.dfsg.2-7/texmf/doc/man/man1/ttf2afm.1	1970-01-01 01:00:00.000000000 +0100
+++ texlive-bin-2005.dfsg.2/texmf/doc/man/man1/ttf2afm.1	2007-01-10 15:41:24.000000000 +0100
@@ -0,0 +1,74 @@
+.TH "ttf2afm" "1" "September 2000" "pdfTeX" "pdfTeX" 
+.PP 
+.SH "NAME" 
+ttf2afm \- utility to generate AFM files for TrueType fonts
+.PP 
+.SH "SYNOPSIS" 
+.PP 
+\fBttf2afm\fP [ \fIOPTION\fP\&.\&.\&. ]  \fIFONTFILE\fP
+.PP 
+.SH "DESCRIPTION" 
+.PP 
+\fBttf2afm\fP is used to generate Adobe Font Metrics (AFM) files for
+TrueType (TTF) fonts to allow them to be used with TeX\&.
+.PP 
+\fBttf2afm\fP takes the name of a TrueType font file as a required
+argument\&.  It may also take one or more options from the list below
+(note that \fB-d\fP and \fB-h\fP are mutually exclusive)\&.
+.PP 
+.SH "OPTIONS" 
+.PP 
+.IP "\fB-a\fP" 
+print all glyphs
+.IP "\fB-i\fP" 
+read names in encoding vector in form
+`index\fInum\fP\&'
+.IP "\fB-d\fP" 
+print glyph names in the form
+`index\fIdecimal_num\fP\&'
+.IP "\fB-h\fP" 
+print glyph names in the form
+`index\fIhex_num\fP\&'
+.IP "\fB-c\fP \fIname\fP" 
+print encoding tables to file
+\fIname\&.eMN\fP, where \fIM\fP is the platform
+number and \fIN\fP is the encoding
+.IP "\fB-e\fP \fIenc\fP" 
+use encoding from file \fIenc\fP
+.IP "\fB-o\fP \fIoutput\fP" 
+output to file \fIoutput\fP instead
+of stdout
+.PP 
+Platform numbers can be one of
+.IP "0" 
+Apple Unicode
+.IP "1" 
+Macintosh
+.IP "2" 
+ISO
+.IP "3" 
+Microsoft
+.PP 
+Encodings can be
+.IP "0" 
+Roman (if platform is Macintosh)
+.IP "0" 
+Symbol (if platform is Microsoft)
+.IP "1" 
+Unicode (if platform is Microsoft)
+.PP 
+.SH "BUGS" 
+.PP 
+None known, but submit bug reports to <pdftex@tug\&.org> (mailing list)\&.
+.PP 
+.SH "AUTHOR" 
+.PP 
+\fBttf2afm\fP is part of pdfTeX and was written by Han The Thanh
+<thanh@informatics\&.muni\&.cz>\&.
+.PP 
+This manual page was written by C\&.M\&. Connelly
+<cmc@debian\&.org>, for
+the Debian GNU/Linux system\&.  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)\&.
diff -urN /data/TeX/debian/tug/Debian/src/texlive-bin-2005.dfsg.2-7/texmf/tpm/bin-ttfutils.tpm texlive-bin-2005.dfsg.2/texmf/tpm/bin-ttfutils.tpm
--- /data/TeX/debian/tug/Debian/src/texlive-bin-2005.dfsg.2-7/texmf/tpm/bin-ttfutils.tpm	1970-01-01 01:00:00.000000000 +0100
+++ texlive-bin-2005.dfsg.2/texmf/tpm/bin-ttfutils.tpm	2007-01-10 15:41:24.000000000 +0100
@@ -0,0 +1,128 @@
+<!DOCTYPE rdf:RDF SYSTEM "../../Tools/tpm.dtd">
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; xmlns:TPM="http://texlive.dante.de/";>
+  <rdf:Description about="http://texlive.dante.de/texlive/TLCore/bin-ttfutils.zip";>
+    <TPM:Name>bin-ttfutils</TPM:Name>
+    <TPM:Type>TLCore</TPM:Type>
+    <TPM:Date>2005/10/27 13:09:14</TPM:Date>
+    <TPM:Version>1.3</TPM:Version>
+    <TPM:Creator>popineau</TPM:Creator>
+    <TPM:Title>TTF support tools.</TPM:Title>
+    <TPM:Description>
+A set of tools to support TeX typesetting with TTF fonts: ttf2afm, ttf2pk, ttf2tfm.	
+    </TPM:Description>
+    <TPM:Author></TPM:Author>
+    <TPM:Size>7615867</TPM:Size>
+    <TPM:Build>
+      <TPM:BinPatterns>
+bin/${ARCH}/ttf2afm
+bin/${ARCH}/ttf2pk
+bin/${ARCH}/ttf2tfm
+bin/win32/ttf2afm.exe
+bin/win32/ttf2pk.exe
+bin/win32/ttf2tfm.exe
+bin/win32/ttfdump.exe
+      </TPM:BinPatterns>
+      <TPM:RunPatterns>
+texmf/fonts/enc/ttf2pk/base/*
+texmf/fonts/map/ttf2pk/config/*
+texmf/fonts/sfd/*
+texmf/tpm/bin-ttfutils.tpm
+texmf/ttf2pk/*
+      </TPM:RunPatterns>
+      <TPM:DocPatterns>
+texmf/doc/man/man1/ttf2afm.*
+texmf/doc/man/man1/ttf2pk.*
+texmf/doc/man/man1/ttf2tfm.*
+texmf/doc/man/man1/ttfdump.*
+texmf/doc/ttf2pk/*
+      </TPM:DocPatterns>
+    </TPM:Build>
+    <TPM:BinFiles arch="alpha-linux" size="958312">
+bin/alpha-linux/ttf2afm
+bin/alpha-linux/ttf2pk
+bin/alpha-linux/ttf2tfm
+    </TPM:BinFiles>
+    <TPM:BinFiles arch="i386-darwin" size="566540">
+bin/i386-darwin/ttf2afm
+bin/i386-darwin/ttf2pk
+bin/i386-darwin/ttf2tfm
+    </TPM:BinFiles>
+    <TPM:BinFiles arch="i386-freebsd" size="519268">
+bin/i386-freebsd/ttf2afm
+bin/i386-freebsd/ttf2pk
+bin/i386-freebsd/ttf2tfm
+    </TPM:BinFiles>
+    <TPM:BinFiles arch="i386-linux" size="490116">
+bin/i386-linux/ttf2afm
+bin/i386-linux/ttf2pk
+bin/i386-linux/ttf2tfm
+    </TPM:BinFiles>
+    <TPM:BinFiles arch="mips-irix" size="933592">
+bin/mips-irix/ttf2afm
+bin/mips-irix/ttf2pk
+bin/mips-irix/ttf2tfm
+    </TPM:BinFiles>
+    <TPM:BinFiles arch="powerpc-aix" size="698310">
+bin/powerpc-aix/ttf2afm
+bin/powerpc-aix/ttf2pk
+bin/powerpc-aix/ttf2tfm
+    </TPM:BinFiles>
+    <TPM:BinFiles arch="powerpc-darwin" size="551424">
+bin/powerpc-darwin/ttf2afm
+bin/powerpc-darwin/ttf2pk
+bin/powerpc-darwin/ttf2tfm
+    </TPM:BinFiles>
+    <TPM:BinFiles arch="sparc-linux" size="559716">
+bin/sparc-linux/ttf2afm
+bin/sparc-linux/ttf2pk
+bin/sparc-linux/ttf2tfm
+    </TPM:BinFiles>
+    <TPM:BinFiles arch="sparc-solaris" size="608044">
+bin/sparc-solaris/ttf2afm
+bin/sparc-solaris/ttf2pk
+bin/sparc-solaris/ttf2tfm
+    </TPM:BinFiles>
+    <TPM:BinFiles arch="win32" size="221184">
+bin/win32/ttf2afm.exe
+bin/win32/ttf2pk.exe
+bin/win32/ttf2tfm.exe
+bin/win32/ttfdump.exe
+    </TPM:BinFiles>
+    <TPM:BinFiles arch="x86_64-linux" size="624856">
+bin/x86_64-linux/ttf2afm
+bin/x86_64-linux/ttf2pk
+bin/x86_64-linux/ttf2tfm
+    </TPM:BinFiles>
+    <TPM:RunFiles size="779776">
+texmf/fonts/enc/ttf2pk/base/T1-WGL4.enc
+texmf/fonts/map/ttf2pk/config/ttfonts.map
+texmf/fonts/sfd/Big5.sfd
+texmf/fonts/sfd/DNP.sfd
+texmf/fonts/sfd/EUC.sfd
+texmf/fonts/sfd/KS-HLaTeX.sfd
+texmf/fonts/sfd/SJIS.sfd
+texmf/fonts/sfd/UBg5plus.sfd
+texmf/fonts/sfd/UBig5.sfd
+texmf/fonts/sfd/UGB.sfd
+texmf/fonts/sfd/UGBK.sfd
+texmf/fonts/sfd/UJIS.sfd
+texmf/fonts/sfd/UKS-HLaTeX.sfd
+texmf/fonts/sfd/UKS.sfd
+texmf/fonts/sfd/Unicode.sfd
+texmf/tpm/bin-ttfutils.tpm
+texmf/ttf2pk/VPS.rpl
+texmf/ttf2pk/ttf2pk.cfg
+    </TPM:RunFiles>
+    <TPM:DocFiles size="104729">
+texmf/doc/man/man1/ttf2afm.1
+texmf/doc/man/man1/ttf2pk.1
+texmf/doc/man/man1/ttf2tfm.1
+texmf/doc/man/man1/ttfdump.1
+texmf/doc/ttf2pk/ttf2pk.doc
+texmf/doc/ttf2pk/ttf2pk.txt
+texmf/doc/ttf2pk/ttf2tfm.txt
+    </TPM:DocFiles>
+    <TPM:Provides>TLCore/bin-ttfutils</TPM:Provides>
+  </rdf:Description>
+</rdf:RDF>
+
[The following lists of changes regard files as different if they have
different names, permissions or owners.]

Files in second .deb but not in first
-------------------------------------
-rw-r--r--  root/root   /usr/share/man/man1/pslatex.1.gz
-rwxr-xr-x  root/root   /usr/bin/pslatex

Control files: lines which differ (wdiff format)
------------------------------------------------
Version: [-2005.dfsg.2-7-] {+2005.dfsg.2-10+}
Depends: ed, mime-support, libc6 (>= 2.3.6-6), libncurses5 (>= 5.4-5), libpng12-0 (>= [-1.2.15~beta5),-] {+1.2.13-4),+} libpoppler0c2 (>= 0.4.2), libx11-6, libxaw7, libxmu6, libxpm4, libxt6, zlib1g (>= 1:1.2.1), texlive-common (>= 2005.dfsg.2-1)
Installed-Size: [-19408-] {+19416+}
[The following lists of changes regard files as different if they have
different names, permissions or owners.]

Files in second .deb but not in first
-------------------------------------
-rw-r--r--  root/root   /usr/share/man/man1/ttf2afm.1.gz
-rwxr-xr-x  root/root   /usr/bin/ttf2afm

Control files: lines which differ (wdiff format)
------------------------------------------------
Version: [-2005.dfsg.2-7-] {+2005.dfsg.2-10+}
Installed-Size: [-3492-] {+3580+}
  {+bin-ttfutils -- TTF support tools.+}

Attachment: pgpzLWu49HtbJ.pgp
Description: PGP signature


Reply to: