summaryrefslogtreecommitdiffstats
path: root/source/l/t1lib
diff options
context:
space:
mode:
Diffstat (limited to 'source/l/t1lib')
-rwxr-xr-xsource/l/t1lib/t1lib.SlackBuild10
-rw-r--r--source/l/t1lib/t1lib_5.1.2-3.5.diff (renamed from source/l/t1lib/t1lib_5.1.2-3.diff)2027
2 files changed, 1160 insertions, 877 deletions
diff --git a/source/l/t1lib/t1lib.SlackBuild b/source/l/t1lib/t1lib.SlackBuild
index 86002a21f..dc6c69b01 100755
--- a/source/l/t1lib/t1lib.SlackBuild
+++ b/source/l/t1lib/t1lib.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2008, 2009, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2011, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
PKGNAM=t1lib
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -60,7 +60,7 @@ tar xvf $CWD/t1lib-$VERSION.tar.?z* || exit 1
cd t1lib-$VERSION
# Apply Debian's patch since upstream seems inactive:
-zcat $CWD/t1lib_5.1.2-3.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/t1lib_5.1.2-3.5.diff.gz | patch -p1 --verbose || exit 1
# I don't think anyone is applying this first one:
#cat debian/patches/segfault.diff -b -z .segf | patch -p1 --verbose || exit 1
@@ -68,6 +68,10 @@ zcat $CWD/t1lib_5.1.2-3.diff.gz | patch -p1 --verbose || exit 1
cat debian/patches/no-config.diff | patch -p1 --verbose || exit 1
cat debian/patches/no-docs.diff | patch -p1 --verbose || exit 1
cat debian/patches/lib-cleanup.diff | patch -p1 --verbose || exit 1
+cat debian/patches/format-security.diff | patch -p1 --verbose || exit 1
+cat debian/patches/CVE-2011-0764.diff | patch -p1 --verbose || exit 1
+cat debian/patches/CVE-2011-1552_1553_1554.patch | patch -p1 --verbose || exit 1
+cat debian/patches/CVE-2010-2642.patch | patch -p1 --verbose || exit 1
chown -R root:root .
find . \
diff --git a/source/l/t1lib/t1lib_5.1.2-3.diff b/source/l/t1lib/t1lib_5.1.2-3.5.diff
index 8ae0b3adf..bd1374664 100644
--- a/source/l/t1lib/t1lib_5.1.2-3.diff
+++ b/source/l/t1lib/t1lib_5.1.2-3.5.diff
@@ -1,3 +1,494 @@
+--- t1lib-5.1.2.orig/debian/libt1-doc.docs
++++ t1lib-5.1.2/debian/libt1-doc.docs
+@@ -0,0 +1 @@
++doc/*.pdf
+--- t1lib-5.1.2.orig/debian/orig-tar.sh
++++ t1lib-5.1.2/debian/orig-tar.sh
+@@ -0,0 +1,11 @@
++#!/bin/sh -e
++
++# called by uscan with '--upstream-version' <version> <file>
++
++# move to directory 'tarballs'
++if [ -r .svn/deb-layout ]; then
++ . .svn/deb-layout
++ mv $3 $origDir
++ echo "moved $3 to $origDir"
++fi
++
+--- t1lib-5.1.2.orig/debian/libt1-5.install
++++ t1lib-5.1.2/debian/libt1-5.install
+@@ -0,0 +1 @@
++debian/tmp/usr/lib/libt1*.so.*
+--- t1lib-5.1.2.orig/debian/changelog
++++ t1lib-5.1.2/debian/changelog
+@@ -0,0 +1,456 @@
++t1lib (5.1.2-3.5) unstable; urgency=high
++
++ * Non-maintainer upload by the Security Team.
++ * Thanks Jamie Strandboge from Ubuntu for the patch.
++ * debian/patches:
++ - series: make sure CVE-2010-2642.patch is really applied so CVE-2010-2642
++ (denial of service via oversized fonts) is really fixed.
++ - CVE-2011-1552_1553_1554 added, few more fixes for CVE-2011-1552,
++ CVE-2011-1553 and CVE-2011-1554 (heap-based buffer overflow via AFM font
++ parser)
++
++ -- Yves-Alexis Perez <corsac@debian.org> Wed, 18 Jan 2012 10:43:23 +0100
++
++t1lib (5.1.2-3.4) unstable; urgency=high
++
++ * Non-maintainer upload by the Security Team.
++ * debian/patches:
++ - CVE-2010-2642 added, fix heap-based buffer overflow first found in
++ evince but applicable to the embedded afmparse library found in t1lib
++ too. Fixes CVE-2011-0433 too on the same patch.
++
++ -- Yves-Alexis Perez <corsac@debian.org> Sun, 15 Jan 2012 13:47:26 +0100
++
++t1lib (5.1.2-3.3) unstable; urgency=low
++
++ * Non-maintainer upload.
++ * Fix arbitrary code execution CVE-2011-0764 by only using ppoints when
++ it is a valid pointer (Closes: #652996).
++ * Don't ship .la file anymore (Closes: #633247).
++
++ -- Luk Claes <luk@debian.org> Thu, 29 Dec 2011 23:21:33 +0100
++
++t1lib (5.1.2-3.2) unstable; urgency=low
++
++ * Non-maintainer upload. (version 5.1.2-3.2 triggered a problem with dak)
++ * format-security.diff: use relevant "%s" format when passing a
++ variable string to a printf() function and replace printf()
++ with puts() for the model-only IfTrace0 macro. Thanks to Colin Watson
++ and Loïc Minier! (Closes: #646470)
++
++ -- Mònica Ramírez Arceda <monica@probeta.net> Sat, 03 Dec 2011 21:28:31 +0100
++
++t1lib (5.1.2-3) unstable; urgency=low
++
++ * New Maintainer (Closes: #430611)
++ * Solved some hyphen-used-as-minus-sign in FontDatabase.5
++ * Reformated debian/copyrigth
++ * Added symbols control file
++
++ -- Ruben Molina <rmolina@udea.edu.co> Wed, 23 Jul 2008 20:24:22 -0500
++
++t1lib (5.1.2-2) unstable; urgency=low
++
++ * Add a package with debugging information.
++
++ -- Torsten Werner <twerner@debian.org> Sat, 08 Mar 2008 10:21:43 +0100
++
++t1lib (5.1.2-1) unstable; urgency=low
++
++ * new upstream release
++ * Correct debian/watch.
++ * Remove patch cve-2007-4033.diff because it has been integrated upstream.
++ * Remove parts of patch segfault.diff that have been integrated upstream.
++ * Do not apply the remaining segfault.diff because it does not look safe but
++ keep the patch as a reminder that something was broken in the past.
++
++ -- Torsten Werner <twerner@debian.org> Sat, 08 Mar 2008 10:07:54 +0100
++
++t1lib (5.1.1-5) unstable; urgency=low
++
++ * Replace Build-Depends-Indep by Build-Depends again.
++
++ -- Torsten Werner <twerner@debian.org> Tue, 08 Jan 2008 21:34:25 +0100
++
++t1lib (5.1.1-4) unstable; urgency=low
++
++ * Add Build-Depends-Indep: libxt-dev. (Closes: #459754)
++
++ -- Torsten Werner <twerner@debian.org> Tue, 08 Jan 2008 20:29:01 +0100
++
++t1lib (5.1.1-3) unstable; urgency=low
++
++ * Replace static changes of upstream files by quilt patches as requested by
++ Fedora developers.
++ * Remove postinst that removed the old /usr/doc symlink.
++ * Remove preinst that removed the old /usr/share/doc/t1lib-bin symlink.
++ * Rename menu.t1lib-bin to t1lib-bin.menu to make sure the menu file gets
++ installed.
++ * Update menu file to conform to current menu policy.
++ * Install documentation with dh_installdocs instead of dh_install and some
++ other minor cleanups.
++ * Switch to cdbs.
++ * Fix versioned Build-Depends: debhelper (>= 5).
++ * Move some Build-Depends to Build-Depends-Indep.
++ * Apply two patches provided by Patrice Dumas:
++ - Update t1libconfig's font search.
++ - Fixes a segfault.
++ * Integrate another patch that fixes a segfault. (Closes: #313236)
++
++ -- Torsten Werner <twerner@debian.org> Sun, 06 Jan 2008 20:50:19 +0100
++
++t1lib (5.1.1-2) unstable; urgency=low
++
++ * Add Depends: libxaw7-dev to -dev package.
++ * Switch to DH_COMPAT = 5.
++ * Update Vcs headers in debian/control.
++ * Change Standards-Version: 3.7.3.
++ * Do not link with unneeded libraries.
++ * Add LDFLAGS=-Wl,--as-needed.
++
++ -- Torsten Werner <twerner@debian.org> Fri, 21 Dec 2007 22:54:43 +0100
++
++t1lib (5.1.1-1) unstable; urgency=low
++
++ * new upstream version (Closes: #418664)
++ * Add XS-Vcs-* header to debian/control.
++ * Update Standards-Version to 3.7.2 (no changes).
++ * Remove Depends: libc6-dev. (Closes: #446375).
++ * Change Maintainer to myself.
++ * Replace ${Source-Version} by ${binary:Version}.
++ * Do not ignore errors of 'make distclean'.
++
++ -- Torsten Werner <twerner@debian.org> Sat, 13 Oct 2007 14:46:23 +0200
++
++t1lib (5.1.0-3) unstable; urgency=low
++
++ * Apply patch from Artur R. Czechowski to fix CVE-2007-4033.
++ (Closes: #439927)
++
++ -- Torsten Werner <twerner@debian.org> Mon, 17 Sep 2007 23:25:45 +0200
++
++t1lib (5.1.0-2) unstable; urgency=low
++
++ * Upload to unstable
++ * Bump-up Standards-Version to 3.6.2 (no changes required)
++ * Torsten Werner <twerner@debian.org> is sponsoring the package
++
++ -- Artur R. Czechowski <arturcz@hell.pl> Sat, 6 Aug 2005 20:11:51 +0200
++
++t1lib (5.1.0-1) experimental; urgency=low
++
++ * New upstream release
++ * README.t1lib-5.0.2 replaced with README.t1lib-5.1.0
++ * README.win32 is no longer installed
++ * Removed misleading information from README.Debian
++ * Replace -V with -V 'libt1-5 (>= 5.0.2)' for dh_makeshlibs in debian/rules
++ * Remove some commented stuff from debian/rules
++ * Torsten Werner <twerner@debian.org> is sponsoring the package
++
++ -- Artur R. Czechowski <arturcz@hell.pl> Sat, 4 Jun 2005 22:12:43 +0200
++
++t1lib (5.0.2-3) unstable; urgency=low
++
++ * Update libtool (Closes: #246753)
++ * Build-Depends on individual library instead dummy xlibs-dev
++ * Added dependencies to -dev package (Closes: #249973)
++ * Thanks to Christopher L Cheney for above patches
++ * Add -V to dh_makeshlibs to make a versioned dependencies on this library
++ * Torsten Werner <twerner@debian.org> is sponsoring the package
++
++ -- Artur R. Czechowski <arturcz@hell.pl> Sun, 23 May 2004 01:02:02 +0200
++
++t1lib (5.0.2-2) unstable; urgency=low
++
++ * change distribution to unstable
++ * Torsten Werner <twerner@debian.org> is sponsoring the package
++
++ -- Artur R. Czechowski <arturcz@hell.pl> Sun, 18 Apr 2004 13:07:23 +0200
++
++t1lib (5.0.2-1) experimental; urgency=low
++
++ * New upstream release (Closes: #243916)
++ - fixed some crashes (Closes: #242570, #243378)
++ * Reference to README.t1lib-5.0.2 instead -5.0.0 in some debian/ files
++ * Torsten Werner <twerner@debian.org> is sponsoring the package
++
++ -- Artur R. Czechowski <arturcz@hell.pl> Sat, 17 Apr 2004 19:22:09 +0200
++
++t1lib (5.0.0-5) unstable; urgency=low
++
++ * debian/rules: documentation is build from binary-indep (Closes: #230386)
++ * debian/watch has been added
++ * Torsten Werner <twerner@debian.org> is sponsoring the package
++
++ -- Artur R. Czechowski <arturcz@hell.pl> Sat, 21 Feb 2004 20:19:38 +0100
++
++t1lib (5.0.0-4) unstable; urgency=low
++
++ * Added missing files in NEWS.Debian
++
++ -- Artur R. Czechowski <arturcz@hell.pl> Wed, 21 Jan 2004 00:27:24 +0100
++
++t1lib (5.0.0-3) unstable; urgency=low
++
++ * New release uploaded to unstable (finaly closes: #185097, #216501)
++ * Unleash it to allow to migrate to testing (Closes: #221198)
++ * libt1-dev and t1lib-dev conflict with each other,
++ * libt1-dev conflicts with t1lib1-dev to smooth upgrade from t1lib 1.3.1-6
++ * t1lib-bin provides/conflicts/replaces t1lib1-bin to smooth upgrade from
++ t1lib 1.3.1-6
++ * Some README.* files in libt1-dev
++ * Applied patch which fixes memory access bug (see #224314 for details)
++ * Torsten Werner <twerner@debian.org> is sponsoring the package
++
++ -- Artur R. Czechowski <arturcz@hell.pl> Sun, 18 Jan 2004 03:00:05 +0100
++
++t1lib (5.0.0-2) experimental; urgency=low
++
++ * rename source package to t1lib
++ * rename binary packages:
++ + libt1-5 -> libt1-dev
++ + t1lib5-bin -> t1lib-bin
++ + libt1-5-doc -> libt1-doc
++ * rationale for all above:
++ http://lists.debian.org/debian-devel/2003/debian-devel-200311/msg01083.html
++ and rest of this thread
++ * linking libt1x with X libraries to avoid undefined symbols (see #220111)
++ * clearing independency of X11 in README.Debian
++ * removed all tracks of t1lib0 (Conflict, Replaces, etc)
++ * Torsten Werner <twerner@debian.org> is sponsoring the package
++
++ -- Artur R. Czechowski <arturcz@hell.pl> Wed, 24 Dec 2003 01:50:37 +0100
++
++t1lib5 (5.0.0-1) experimental; urgency=low
++
++ * New upstream release (Closes: #185097, #216501)
++ * This release is binary incompatible with the previous one.
++ * t1lib-bin and t1lib-dev are virtual packages now
++ * removed weird ``dbl'' from configure - typo in upstream configure.in
++ * there is no necessity to conflict current -doc with the other ones
++ * library, devel and documentation package is libt1-5{,-dev,-doc} to be
++ consistent with Debian Policy 8.1
++ * do not anymore copy config.{sub,guess} automagically
++ * update ac-tools/config.{sub,guess} to 20031007
++ * Torsten Werner <twerner@debian.org> is sponsoring the package
++
++ -- Artur R. Czechowski <arturcz@hell.pl> Sun, 9 Nov 2003 15:16:51 +0100
++
++t1lib (1.3.1-4) unstable; urgency=low
++
++ * New Maintainer, Adopted Package (Closes: #189694)
++ * Prepare for migration to t1lib 5.x:
++ - all packages renamed to t1lib1{,-foo}
++ - empty packages t1lib-bin and t1lib-dev depending on t1lib1-bin
++ and t1lib1-dev
++ * Packaging from scratch using debhelper, Standards-Version is 3.6.1.0 now
++ * Remove non-existent xlib6g-dev from Build-Depends
++ * Updated README.Debian
++ * Remove symlinks from /usr/doc/t1lib*
++ * Only t1lib1-bin contains /etc/t1lib directory
++ * t1lib-dev has been split into two packages: t1lib1-dev and t1lib1-doc
++ * t1lib1-bin: change manual section for type1afm from 8 to 1
++ * t1lib1-bin: create files in /etc/t1lib if don't exist (Closes: #58275)
++ * t1lib1-bin: remove symlink /usr/share/doc/t1lib-bin -> t1lib1 if exists
++ * Torsten Werner <twerner@debian.org> is sponsoring the package
++
++ -- Artur R. Czechowski <arturcz@hell.pl> Sun, 2 Nov 2003 03:47:51 +0100
++
++t1lib (1.3.1-3) unstable; urgency=low
++
++ * Change t1lib-dev's section from "devel" to "libdevel" (thanks, Katie!)
++
++ -- Adam Conrad <adconrad@0c3.net> Mon, 18 Aug 2003 22:42:17 -0600
++
++t1lib (1.3.1-2) unstable; urgency=low
++
++ * Set maintainer to QA, as this package was orphaned months ago (see #189694)
++ * Change "make" to "make without_doc" and remove build-dep on
++ tetex-bin (closes: #192291, #192290)
++ * Change libxaw-dev build-dep to libxaw7-dev, so we are asking for a real
++ package, rather than a virtual (closes: #170012)
++ * lib/Makefile.in changes (closes: #193757)
++ - add "-lm" to libt1.la target
++ - add "-L@top_srcdir@/lib/.libs/ -lt1" to libt1x.la target
++
++ -- Adam Conrad <adconrad@0c3.net> Mon, 18 Aug 2003 21:50:22 -0600
++
++t1lib (1.3.1-1) unstable; urgency=low
++
++ * New upstream version. (Closes: #127619,#127618)
++
++ -- David Huggins-Daines <dhd@debian.org> Thu, 3 Jan 2002 21:53:29 -0500
++
++t1lib (1.2-1) unstable; urgency=low
++
++ * New upstream version.
++
++ -- David Huggins-Daines <dhd@debian.org> Wed, 22 Aug 2001 21:16:36 -0400
++
++t1lib (1.1.1-2.2) unstable; urgency=low
++
++ * NMU
++ * debian/rules: if LD_LIBRARY_PATH is already set, append to it, so
++ builds under fakeroot will work (Closes: #104046)
++
++ -- Branden Robinson <branden@debian.org> Fri, 10 Aug 2001 04:57:50 -0500
++
++t1lib (1.1.1-2.1) unstable; urgency=low
++
++ * NMU, with updated config.{guess,sub} for newer architectures
++
++ -- Randolph Chung <tausq@debian.org> Sat, 7 Jul 2001 01:01:51 -0600
++
++t1lib (1.1.1-2) unstable; urgency=high
++
++ * Yow! Major upstream weirdness. Do *not* try to print the documentation
++ when building... Closes: #94660
++
++ -- David Huggins-Daines <dhd@debian.org> Fri, 20 Apr 2001 20:35:49 -0400
++
++t1lib (1.1.1-1) unstable; urgency=low
++
++ * New upstream version. Closes: #94627 (why did I never get this bug
++ report in the first place?)
++
++ -- David Huggins-Daines <dhd@debian.org> Fri, 20 Apr 2001 11:16:15 -0400
++
++t1lib (1.0.1-2) unstable; urgency=low
++
++ * Recompile with new XFree86 libraries and glibc.
++
++ -- David Huggins-Daines <dhd@debian.org> Wed, 24 Jan 2001 22:33:43 -0500
++
++t1lib (1.0.1-1) unstable; urgency=low
++
++ * New upstream version. Closes: #69689
++
++ -- David Huggins-Daines <dhd@debian.org> Thu, 9 Nov 2000 00:29:06 -0500
++
++t1lib (1.0-2) frozen unstable; urgency=low
++
++ * Use dpkg-architecture to supply a target architecture name to
++ configure, should fix the compile problems on Alpha and ARM for good.
++ (closes:#57839)
++
++ -- David Huggins-Daines <dhd@eradicator.org> Wed, 1 Mar 2000 21:22:49 -0500
++
++t1lib (1.0-1) unstable; urgency=low
++
++ * New upstream version.
++ * Twiddled package names to make more sense.
++ * Move back to priority optional to satisfy dependencies of xpdf and
++ php3.
++ * Moved .la files to t1lib-dev. Added versioned Replaces: field in the
++ control file to cope with potato-to-potato upgrades (the t1lib0
++ packages in slink were not buggy in this way)
++ * t1libconfig and associated manual pages (FontDataBase.5,
++ t1libconfig.8) are now in the t1lib-bin package, for much the same
++ reason. Unfortunately this Replaces: field cannot be versioned.
++ * The t1lib packages no longer manage the contents of /etc/t1lib/. In
++ the near future, t1lib1 may have a debconf interface for doing so.
++ The t1lib.config and FontDataBase were never used by any programs that
++ linked with t1lib anyway, thankfully.
++
++ -- David Huggins-Daines <dhd@eradicator.org> Sun, 2 Jan 2000 03:02:30 -0500
++
++t1lib0 (0.9.2-1) unstable; urgency=low
++
++ * New upstream version.
++ * Being more intelligent in t1libconfig to avoid postinst-lossage.
++ Fixes: #44095
++ * Updated for FHS compliance.
++
++ -- David Huggins-Daines <dhd@debian.org> Fri, 8 Oct 1999 15:27:46 -0400
++
++t1lib0 (0.9.1-4) unstable; urgency=medium
++
++ * Updated the shlibs file since it appears that programs compiled
++ against 0.9.1 won't work with 0.9 (though the other way around does
++ work). Fixes: #43215, #43231
++ * Removed ARCH bogosity and updated config.sub and config.guess
++ (upstream maintainer will be notified)
++
++ -- David Huggins-Daines <dhd@debian.org> Sat, 21 Aug 1999 01:23:39 -0400
++
++t1lib0 (0.9.1-3) unstable; urgency=low
++
++ * Conditionalize that ARCH thing, or the Hurd people will kill me.
++
++ -- David Huggins-Daines <dhd@debian.org> Sat, 3 Jul 1999 13:56:12 -0400
++
++t1lib0 (0.9.1-2) unstable; urgency=low
++
++ * Oops. T1lib installs a dummy config file. We remove this before
++ building the package (because we generate our own). Also, the preinst
++ has to compensate for the past brokenness by saving it before an
++ upgrade.
++
++ -- David Huggins-Daines <dhd@debian.org> Fri, 2 Jul 1999 16:13:46 -0400
++
++t1lib0 (0.9.1-1) unstable; urgency=low
++
++ * New upstream version.
++ * Moved back to extra, because that's the way the winds are blowing.
++ * Added ARCH variable to debian/rules to work around strange
++ architecture detection on Alpha.
++
++ -- David Huggins-Daines <dhd@debian.org> Fri, 2 Jul 1999 14:58:32 -0400
++
++t1lib0 (0.9-1) unstable; urgency=low
++
++ * New upstream version
++
++ -- David Huggins-Daines <dhd@debian.org> Thu, 10 Jun 1999 23:00:12 -0400
++
++t1lib0 (0.8.1-1) unstable; urgency=low
++
++ * New upstream version. (fixes bug #31549)
++ * Upstream move to libtool has made debian/rules a lot less contorted,
++ and slimmed up the diff considerably. Thanks!
++ * I'm now uploading m68k versions as well.
++ * Fixed "confdif" typo in t1libconfig (oops!)
++ * This release breaks binary and source compatibility. Bumping the
++ soname seems a bit extreme, since there is only one Debian package
++ (gglyph) which depends on this, and I'm simultaneously uploading a
++ fixed version.
++
++ -- David Huggins-Daines <dhd@debian.org> Wed, 24 Feb 1999 17:16:41 -0500
++
++t1lib0 (0.7.1-5) unstable; urgency=low
++
++ * Changed debian/rules to remove debian/files on clean. (fixes bug #26907)
++ * Changed t1libconfig to allow installation </dev/null (fixes bug #27609)
++
++ -- David Huggins-Daines <dhd@debian.org> Fri, 16 Oct 1998 20:12:02 -0400
++
++t1lib0 (0.7.1-4) unstable; urgency=low
++
++ * Changed debian/rules not to use debhelper, to fix PowerPC and Alpha compile
++ problems and (hopefully) make the purists happy :)
++ * Upgraded priority to Optional, since it doesn't conflict with or break
++ anything, and is relatively stable.
++
++ -- David Huggins-Daines <dhd@debian.org> Fri, 18 Sep 1998 18:36:07 -0400
++
++t1lib0 (0.7.1-3) unstable; urgency=low
++
++ * Changed "read" to "read foo" in t1libconfig to make it more sh-friendly.
++ * Minor change to debian/rules (fixes bug #25501)
++
++ -- David Huggins-Daines <dhd@debian.org> Fri, 7 Aug 1998 13:31:28 -0400
++
++t1lib0 (0.7.1-2) unstable; urgency=low
++
++ * Patched lib/t1lib/t1finfo.c to fix segfault problems with some fonts.
++ * Fixed the URLs and info in copyright and README.Debian.
++
++ -- David Huggins-Daines <dhd@debian.org> Tue, 21 Jul 1998 16:01:03 -0400
++
++t1lib0 (0.7.1-1) unstable; urgency=low
++
++ * Initial release.
++
++ -- David Huggins-Daines <dhd@debian.org> Thu, 16 Jul 1998 22:07:08 -0400
++
++
+--- t1lib-5.1.2.orig/debian/libt1-5.docs
++++ t1lib-5.1.2/debian/libt1-5.docs
+@@ -0,0 +1,2 @@
++README.t1lib-*
++README.t1python
+--- t1lib-5.1.2.orig/debian/libt1-dev.docs
++++ t1lib-5.1.2/debian/libt1-dev.docs
+@@ -0,0 +1,2 @@
++README.t1lib-*
++README.t1python
--- t1lib-5.1.2.orig/debian/t1libconfig
+++ t1lib-5.1.2/debian/t1libconfig
@@ -0,0 +1,163 @@
@@ -164,128 +655,124 @@
+fi
+
+exit 0
---- t1lib-5.1.2.orig/debian/t1lib-bin.postrm
-+++ t1lib-5.1.2/debian/t1lib-bin.postrm
+--- t1lib-5.1.2.orig/debian/t1lib-bin.postinst
++++ t1lib-5.1.2/debian/t1lib-bin.postinst
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
-+if [ "$1" = "purge" ]; then
-+ rm -rf /etc/t1lib
++if [ ! -f /etc/t1lib/t1lib.config ]; then
++ /usr/sbin/t1libconfig
+fi
+
+#DEBHELPER#
---- t1lib-5.1.2.orig/debian/libt1-5.install
-+++ t1lib-5.1.2/debian/libt1-5.install
-@@ -0,0 +1 @@
-+debian/tmp/usr/lib/libt1*.so.*
---- t1lib-5.1.2.orig/debian/libt1-doc.docs
-+++ t1lib-5.1.2/debian/libt1-doc.docs
-@@ -0,0 +1 @@
-+doc/*.pdf
---- t1lib-5.1.2.orig/debian/libt1-dev.docs
-+++ t1lib-5.1.2/debian/libt1-dev.docs
+--- t1lib-5.1.2.orig/debian/t1lib-bin.menu
++++ t1lib-5.1.2/debian/t1lib-bin.menu
@@ -0,0 +1,2 @@
-+README.t1lib-*
-+README.t1python
---- t1lib-5.1.2.orig/debian/t1lib-bin.dirs
-+++ t1lib-5.1.2/debian/t1lib-bin.dirs
-@@ -0,0 +1 @@
-+etc/t1lib
---- t1lib-5.1.2.orig/debian/t1lib-bin.manpages
-+++ t1lib-5.1.2/debian/t1lib-bin.manpages
-@@ -0,0 +1,4 @@
-+debian/man/FontDatabase.5
-+debian/man/t1libconfig.8
-+debian/man/type1afm.1
-+debian/man/xglyph.1
---- t1lib-5.1.2.orig/debian/control
-+++ t1lib-5.1.2/debian/control
-@@ -0,0 +1,84 @@
-+Source: t1lib
-+Section: libs
-+Priority: optional
-+Maintainer: Ruben Molina <rmolina@udea.edu.co>
-+Build-Depends: cdbs, debhelper (>= 7), autotools-dev, libice-dev, libsm-dev, libx11-dev, libxext-dev, libxaw7-dev, quilt
-+Standards-Version: 3.8.0
-+Homepage: ftp://sunsite.unc.edu/pub/Linux/libs/graphics/
++?package(t1lib-bin): needs="X11" section="Applications/Viewers" \
++ title="XGlyph" command="/usr/bin/xglyph"
+--- t1lib-5.1.2.orig/debian/t1lib-bin.install
++++ t1lib-5.1.2/debian/t1lib-bin.install
+@@ -0,0 +1,2 @@
++debian/t1libconfig usr/sbin
++debian/tmp/usr/bin/*
+--- t1lib-5.1.2.orig/debian/copyright
++++ t1lib-5.1.2/debian/copyright
+@@ -0,0 +1,94 @@
++This package was debianized by David Huggins-Daines <dhd@debian.org> on
++Fri, 19 Jun 1998 20:01:01 -0400. It has been also maintained by Artur
++R. Czechowski <arturcz@hell.pl> and Torsten Werner <twerner@debian.org>.
+
-+Package: libt1-5
-+Section: libs
-+Architecture: any
-+Depends: ${shlibs:Depends}, ${misc:Depends}
-+Description: Type 1 font rasterizer library - runtime
-+ T1lib is an enhanced rasterizer for Type 1 fonts.
-+ .
-+ T1lib is based on the X11R5 font rasterizer code, but operates independently
-+ of X11. It includes many enhancements, including underlining, antialiasing,
-+ user-defined slant and extension factors, and rotation.
-+ .
-+ This package contains the shared libraries needed to run programs using T1lib.
++It was downloaded from ftp://sunsite.unc.edu/pub/Linux/libs/graphics/
+
-+Package: libt1-dev
-+Section: libdevel
-+Architecture: any
-+Depends: libt1-5 (= ${binary:Version}), libice-dev, libsm-dev, libx11-dev,
-+ libxext-dev, libxaw7-dev
-+Recommends: libt1-doc
-+Conflicts: t1lib-dev, t1lib1-dev
-+Description: Type 1 font rasterizer library - development
-+ T1lib is an enhanced rasterizer for Type 1 fonts.
-+ .
-+ T1lib is based on the X11R5 font rasterizer code, but operates independently
-+ of X11. It includes many enhancements, including underlining, antialiasing,
-+ user-defined slant and extension factors, and rotation.
-+ .
-+ This package contains the header files and static libraries needed to
-+ develop programs using T1lib.
-+ .
-+ Please note, that PDF documentation is placed in libt1-doc
++Upstream Author:
+
-+Package: t1lib-bin
-+Architecture: any
-+Section: misc
-+Depends: ${shlibs:Depends}
-+Provides: t1lib1-bin
-+Replaces: t1lib1-bin
-+Conflicts: t1lib1-bin
-+Description: Type 1 font rasterizer library - user binaries
-+ T1lib is an enhanced rasterizer for Type 1 fonts.
-+ .
-+ T1lib is based on the X11R5 font rasterizer code, but operates independently
-+ of X11. It includes many enhancements, including underlining, antialiasing,
-+ user-defined slant and extension factors, and rotation.
-+ .
-+ This package contains the programs "xglyph" and "type1afm", included in the
-+ upstream T1lib distribution. It also contains the "t1libconfig"
-+ script used to configure t1lib.
++ Rainer Menzner <Rainer.Menzner@web.de>
+
-+Package: libt1-doc
-+Architecture: all
-+Section: doc
-+Description: Type 1 font rasterizer library - developers documentation
-+ T1lib is an enhanced rasterizer for Type 1 fonts.
-+ .
-+ T1lib is based on the X11R5 font rasterizer code, but operates independently
-+ of X11. It includes many enhancements, including underlining, antialiasing,
-+ user-defined slant and extension factors, and rotation.
-+ .
-+ This package contains developers documentation.
++Copyright:
+
-+Package: libt1-5-dbg
-+Section: libdevel
-+Priority: extra
-+Architecture: any
-+Depends: libt1-5 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-+Description: Type 1 font rasterizer library - debugging runtime
-+ T1lib is an enhanced rasterizer for Type 1 fonts.
-+ .
-+ T1lib is based on the X11R5 font rasterizer code, but operates independently
-+ of X11. It includes many enhancements, including underlining, antialiasing,
-+ user-defined slant and extension factors, and rotation.
-+ .
-+ This package contains debugging information.
++ Copyright (C) 1996-2003 Rainer Menzner
++
++License:
++
++ This package is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2 of the License, or (at your option) any later version.
++
++ This package 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with this package; if not, write to the Free Software
++ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
++
++On Debian systems, the complete text of the GNU Lesser General
++Public License can be found in `/usr/share/common-licenses/LGPL'.
++
++The Debian packaging is (C) 2008, Ruben Molina <rmolina@udea.edu.co> and
++is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+
++Please note that there are parts of t1lib that are subject to other licenses:
++- The parseAFM-package is copyrighted by Adobe Systems Inc.
++- The type1 rasterizer is copyrighted by IBM and the X11-consortium.
++
++(from lib/t1lib/parseAFM.c)
++/*
++ * (C) 1988, 1989, 1990 by Adobe Systems Incorporated. All rights reserved.
++ *
++ * This file may be freely copied and redistributed as long as:
++ * 1) This entire notice continues to be included in the file,
++ * 2) If the file has been modified in any way, a notice of such
++ * modification is conspicuously indicated.
++ *
++ * PostScript, Display PostScript, and Adobe are registered trademarks of
++ * Adobe Systems Incorporated.
++ *
++ * ************************************************************************
++ * THE INFORMATION BELOW IS FURNISHED AS IS, IS SUBJECT TO CHANGE WITHOUT
++ * NOTICE, AND SHOULD NOT BE CONSTRUED AS A COMMITMENT BY ADOBE SYSTEMS
++ * INCORPORATED. ADOBE SYSTEMS INCORPORATED ASSUMES NO RESPONSIBILITY OR
++ * LIABILITY FOR ANY ERRORS OR INACCURACIES, MAKES NO WARRANTY OF ANY
++ * KIND (EXPRESS, IMPLIED OR STATUTORY) WITH RESPECT TO THIS INFORMATION,
++ * AND EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR PARTICULAR PURPOSES AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
++ * ************************************************************************
++ */
++
++(from lib/type1/type1.c)
++/* $XConsortium: type1.c,v 1.5 91/10/10 11:20:06 rws Exp $ */
++/* Copyright International Business Machines, Corp. 1991
++ * All Rights Reserved
++ * Copyright Lexmark International, Inc. 1991
++ * All Rights Reserved
++ * Portions Copyright (c) 1990 Adobe Systems Incorporated.
++ * All Rights Reserved
++ *
++ * License to use, copy, modify, and distribute this software and its
++ * documentation for any purpose and without fee is hereby granted,
++ * provided that the above copyright notice appear in all copies and that
++ * both that copyright notice and this permission notice appear in
++ * supporting documentation, and that the name of IBM or Lexmark or Adobe
++ * not be used in advertising or publicity pertaining to distribution of
++ * the software without specific, written prior permission.
++ *
++ * IBM, LEXMARK, AND ADOBE PROVIDE THIS SOFTWARE "AS IS", WITHOUT ANY
++ * WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT
++ * LIMITED TO ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
++ * PARTICULAR PURPOSE, AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. THE
++ * ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE, INCLUDING
++ * ANY DUTY TO SUPPORT OR MAINTAIN, BELONGS TO THE LICENSEE. SHOULD ANY
++ * PORTION OF THE SOFTWARE PROVE DEFECTIVE, THE LICENSEE (NOT IBM,
++ * LEXMARK, OR ADOBE) ASSUMES THE ENTIRE COST OF ALL SERVICING, REPAIR AND
++ * CORRECTION. IN NO EVENT SHALL IBM, LEXMARK, OR ADOBE BE LIABLE FOR ANY
++ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
++ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
++ * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
++ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ */
--- t1lib-5.1.2.orig/debian/NEWS
+++ t1lib-5.1.2/debian/NEWS
@@ -0,0 +1,9 @@
@@ -298,6 +785,38 @@
+ - README.t1lib-5.0.0.gz
+
+ -- Artur R. Czechowski <arturcz@hell.pl> Sun, 18 Jan 2004 00:02:29 +0100
+--- t1lib-5.1.2.orig/debian/t1lib-bin.manpages
++++ t1lib-5.1.2/debian/t1lib-bin.manpages
+@@ -0,0 +1,4 @@
++debian/man/FontDatabase.5
++debian/man/t1libconfig.8
++debian/man/type1afm.1
++debian/man/xglyph.1
+--- t1lib-5.1.2.orig/debian/rules
++++ t1lib-5.1.2/debian/rules
+@@ -0,0 +1,22 @@
++#!/usr/bin/make -f
++
++include /usr/share/cdbs/1/rules/debhelper.mk
++include /usr/share/cdbs/1/class/autotools.mk
++include /usr/share/cdbs/1/rules/patchsys-quilt.mk
++
++export LDFLAGS := -Wl,--as-needed
++
++DEB_MAKE_BUILD_TARGET := without_doc
++DEB_MAKE_INSTALL_TARGET := install prefix=$(CURDIR)/debian/tmp/usr
++DEB_INSTALL_DOCS_ALL += debian/README.Debian
++
++binary-post-install/libt1-5 ::
++ rm -rf debian/libt1-5-dbg/usr/lib/debug/usr/bin/
++binary-post-install/libt1-5-dbg ::
++ rm -rf debian/libt1-5-dbg/usr/lib/debug/usr/bin/
++binary-post-install/libt1-dev ::
++ rm -rf debian/libt1-5-dbg/usr/lib/debug/usr/bin/
++binary-post-install/libt1-doc ::
++ rm -rf debian/libt1-5-dbg/usr/lib/debug/usr/bin/
++binary-post-install/t1lib-bin ::
++ rm -rf debian/libt1-5-dbg/usr/lib/debug/usr/bin/
--- t1lib-5.1.2.orig/debian/libt1-5.symbols
+++ t1lib-5.1.2/debian/libt1-5.symbols
@@ -0,0 +1,381 @@
@@ -682,588 +1201,120 @@
+ T1_SetStringX@Base 5.1.1
+ T1_SetX11Params@Base 5.1.1
+ T1_XImageFromGlyph@Base 5.1.1
---- t1lib-5.1.2.orig/debian/rules
-+++ t1lib-5.1.2/debian/rules
-@@ -0,0 +1,22 @@
-+#!/usr/bin/make -f
+--- t1lib-5.1.2.orig/debian/control
++++ t1lib-5.1.2/debian/control
+@@ -0,0 +1,84 @@
++Source: t1lib
++Section: libs
++Priority: optional
++Maintainer: Ruben Molina <rmolina@udea.edu.co>
++Build-Depends: cdbs, debhelper (>= 7), autotools-dev, libice-dev, libsm-dev, libx11-dev, libxext-dev, libxaw7-dev, quilt
++Standards-Version: 3.8.0
++Homepage: ftp://sunsite.unc.edu/pub/Linux/libs/graphics/
+
-+include /usr/share/cdbs/1/rules/debhelper.mk
-+include /usr/share/cdbs/1/class/autotools.mk
-+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
++Package: libt1-5
++Section: libs
++Architecture: any
++Depends: ${shlibs:Depends}, ${misc:Depends}
++Description: Type 1 font rasterizer library - runtime
++ T1lib is an enhanced rasterizer for Type 1 fonts.
++ .
++ T1lib is based on the X11R5 font rasterizer code, but operates independently
++ of X11. It includes many enhancements, including underlining, antialiasing,
++ user-defined slant and extension factors, and rotation.
++ .
++ This package contains the shared libraries needed to run programs using T1lib.
+
-+export LDFLAGS := -Wl,--as-needed
++Package: libt1-dev
++Section: libdevel
++Architecture: any
++Depends: libt1-5 (= ${binary:Version}), libice-dev, libsm-dev, libx11-dev,
++ libxext-dev, libxaw7-dev
++Recommends: libt1-doc
++Conflicts: t1lib-dev, t1lib1-dev
++Description: Type 1 font rasterizer library - development
++ T1lib is an enhanced rasterizer for Type 1 fonts.
++ .
++ T1lib is based on the X11R5 font rasterizer code, but operates independently
++ of X11. It includes many enhancements, including underlining, antialiasing,
++ user-defined slant and extension factors, and rotation.
++ .
++ This package contains the header files and static libraries needed to
++ develop programs using T1lib.
++ .
++ Please note, that PDF documentation is placed in libt1-doc
+
-+DEB_MAKE_BUILD_TARGET := without_doc
-+DEB_MAKE_INSTALL_TARGET := install prefix=$(CURDIR)/debian/tmp/usr
-+DEB_INSTALL_DOCS_ALL += debian/README.Debian
++Package: t1lib-bin
++Architecture: any
++Section: misc
++Depends: ${shlibs:Depends}
++Provides: t1lib1-bin
++Replaces: t1lib1-bin
++Conflicts: t1lib1-bin
++Description: Type 1 font rasterizer library - user binaries
++ T1lib is an enhanced rasterizer for Type 1 fonts.
++ .
++ T1lib is based on the X11R5 font rasterizer code, but operates independently
++ of X11. It includes many enhancements, including underlining, antialiasing,
++ user-defined slant and extension factors, and rotation.
++ .
++ This package contains the programs "xglyph" and "type1afm", included in the
++ upstream T1lib distribution. It also contains the "t1libconfig"
++ script used to configure t1lib.
+
-+binary-post-install/libt1-5 ::
-+ rm -rf debian/libt1-5-dbg/usr/lib/debug/usr/bin/
-+binary-post-install/libt1-5-dbg ::
-+ rm -rf debian/libt1-5-dbg/usr/lib/debug/usr/bin/
-+binary-post-install/libt1-dev ::
-+ rm -rf debian/libt1-5-dbg/usr/lib/debug/usr/bin/
-+binary-post-install/libt1-doc ::
-+ rm -rf debian/libt1-5-dbg/usr/lib/debug/usr/bin/
-+binary-post-install/t1lib-bin ::
-+ rm -rf debian/libt1-5-dbg/usr/lib/debug/usr/bin/
++Package: libt1-doc
++Architecture: all
++Section: doc
++Description: Type 1 font rasterizer library - developers documentation
++ T1lib is an enhanced rasterizer for Type 1 fonts.
++ .
++ T1lib is based on the X11R5 font rasterizer code, but operates independently
++ of X11. It includes many enhancements, including underlining, antialiasing,
++ user-defined slant and extension factors, and rotation.
++ .
++ This package contains developers documentation.
++
++Package: libt1-5-dbg
++Section: libdevel
++Priority: extra
++Architecture: any
++Depends: libt1-5 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
++Description: Type 1 font rasterizer library - debugging runtime
++ T1lib is an enhanced rasterizer for Type 1 fonts.
++ .
++ T1lib is based on the X11R5 font rasterizer code, but operates independently
++ of X11. It includes many enhancements, including underlining, antialiasing,
++ user-defined slant and extension factors, and rotation.
++ .
++ This package contains debugging information.
++
+--- t1lib-5.1.2.orig/debian/libt1-dev.install
++++ t1lib-5.1.2/debian/libt1-dev.install
+@@ -0,0 +1,3 @@
++debian/tmp/usr/include/*
++debian/tmp/usr/lib/*.so
++debian/tmp/usr/lib/*.a
--- t1lib-5.1.2.orig/debian/compat
+++ t1lib-5.1.2/debian/compat
@@ -0,0 +1 @@
+7
---- t1lib-5.1.2.orig/debian/t1lib-bin.postinst
-+++ t1lib-5.1.2/debian/t1lib-bin.postinst
+--- t1lib-5.1.2.orig/debian/t1lib-bin.postrm
++++ t1lib-5.1.2/debian/t1lib-bin.postrm
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
-+if [ ! -f /etc/t1lib/t1lib.config ]; then
-+ /usr/sbin/t1libconfig
++if [ "$1" = "purge" ]; then
++ rm -rf /etc/t1lib
+fi
+
+#DEBHELPER#
---- t1lib-5.1.2.orig/debian/libt1-dev.install
-+++ t1lib-5.1.2/debian/libt1-dev.install
-@@ -0,0 +1,4 @@
-+debian/tmp/usr/include/*
-+debian/tmp/usr/lib/*.so
-+debian/tmp/usr/lib/*.la
-+debian/tmp/usr/lib/*.a
---- t1lib-5.1.2.orig/debian/changelog
-+++ t1lib-5.1.2/debian/changelog
-@@ -0,0 +1,414 @@
-+t1lib (5.1.2-3) unstable; urgency=low
-+
-+ * New Maintainer (Closes: #430611)
-+ * Solved some hyphen-used-as-minus-sign in FontDatabase.5
-+ * Reformated debian/copyrigth
-+ * Added symbols control file
-+
-+ -- Ruben Molina <rmolina@udea.edu.co> Wed, 23 Jul 2008 20:24:22 -0500
-+
-+t1lib (5.1.2-2) unstable; urgency=low
-+
-+ * Add a package with debugging information.
-+
-+ -- Torsten Werner <twerner@debian.org> Sat, 08 Mar 2008 10:21:43 +0100
-+
-+t1lib (5.1.2-1) unstable; urgency=low
-+
-+ * new upstream release
-+ * Correct debian/watch.
-+ * Remove patch cve-2007-4033.diff because it has been integrated upstream.
-+ * Remove parts of patch segfault.diff that have been integrated upstream.
-+ * Do not apply the remaining segfault.diff because it does not look safe but
-+ keep the patch as a reminder that something was broken in the past.
-+
-+ -- Torsten Werner <twerner@debian.org> Sat, 08 Mar 2008 10:07:54 +0100
-+
-+t1lib (5.1.1-5) unstable; urgency=low
-+
-+ * Replace Build-Depends-Indep by Build-Depends again.
-+
-+ -- Torsten Werner <twerner@debian.org> Tue, 08 Jan 2008 21:34:25 +0100
-+
-+t1lib (5.1.1-4) unstable; urgency=low
-+
-+ * Add Build-Depends-Indep: libxt-dev. (Closes: #459754)
-+
-+ -- Torsten Werner <twerner@debian.org> Tue, 08 Jan 2008 20:29:01 +0100
-+
-+t1lib (5.1.1-3) unstable; urgency=low
-+
-+ * Replace static changes of upstream files by quilt patches as requested by
-+ Fedora developers.
-+ * Remove postinst that removed the old /usr/doc symlink.
-+ * Remove preinst that removed the old /usr/share/doc/t1lib-bin symlink.
-+ * Rename menu.t1lib-bin to t1lib-bin.menu to make sure the menu file gets
-+ installed.
-+ * Update menu file to conform to current menu policy.
-+ * Install documentation with dh_installdocs instead of dh_install and some
-+ other minor cleanups.
-+ * Switch to cdbs.
-+ * Fix versioned Build-Depends: debhelper (>= 5).
-+ * Move some Build-Depends to Build-Depends-Indep.
-+ * Apply two patches provided by Patrice Dumas:
-+ - Update t1libconfig's font search.
-+ - Fixes a segfault.
-+ * Integrate another patch that fixes a segfault. (Closes: #313236)
-+
-+ -- Torsten Werner <twerner@debian.org> Sun, 06 Jan 2008 20:50:19 +0100
-+
-+t1lib (5.1.1-2) unstable; urgency=low
-+
-+ * Add Depends: libxaw7-dev to -dev package.
-+ * Switch to DH_COMPAT = 5.
-+ * Update Vcs headers in debian/control.
-+ * Change Standards-Version: 3.7.3.
-+ * Do not link with unneeded libraries.
-+ * Add LDFLAGS=-Wl,--as-needed.
-+
-+ -- Torsten Werner <twerner@debian.org> Fri, 21 Dec 2007 22:54:43 +0100
-+
-+t1lib (5.1.1-1) unstable; urgency=low
-+
-+ * new upstream version (Closes: #418664)
-+ * Add XS-Vcs-* header to debian/control.
-+ * Update Standards-Version to 3.7.2 (no changes).
-+ * Remove Depends: libc6-dev. (Closes: #446375).
-+ * Change Maintainer to myself.
-+ * Replace ${Source-Version} by ${binary:Version}.
-+ * Do not ignore errors of 'make distclean'.
-+
-+ -- Torsten Werner <twerner@debian.org> Sat, 13 Oct 2007 14:46:23 +0200
-+
-+t1lib (5.1.0-3) unstable; urgency=low
-+
-+ * Apply patch from Artur R. Czechowski to fix CVE-2007-4033.
-+ (Closes: #439927)
-+
-+ -- Torsten Werner <twerner@debian.org> Mon, 17 Sep 2007 23:25:45 +0200
-+
-+t1lib (5.1.0-2) unstable; urgency=low
-+
-+ * Upload to unstable
-+ * Bump-up Standards-Version to 3.6.2 (no changes required)
-+ * Torsten Werner <twerner@debian.org> is sponsoring the package
-+
-+ -- Artur R. Czechowski <arturcz@hell.pl> Sat, 6 Aug 2005 20:11:51 +0200
-+
-+t1lib (5.1.0-1) experimental; urgency=low
-+
-+ * New upstream release
-+ * README.t1lib-5.0.2 replaced with README.t1lib-5.1.0
-+ * README.win32 is no longer installed
-+ * Removed misleading information from README.Debian
-+ * Replace -V with -V 'libt1-5 (>= 5.0.2)' for dh_makeshlibs in debian/rules
-+ * Remove some commented stuff from debian/rules
-+ * Torsten Werner <twerner@debian.org> is sponsoring the package
-+
-+ -- Artur R. Czechowski <arturcz@hell.pl> Sat, 4 Jun 2005 22:12:43 +0200
-+
-+t1lib (5.0.2-3) unstable; urgency=low
-+
-+ * Update libtool (Closes: #246753)
-+ * Build-Depends on individual library instead dummy xlibs-dev
-+ * Added dependencies to -dev package (Closes: #249973)
-+ * Thanks to Christopher L Cheney for above patches
-+ * Add -V to dh_makeshlibs to make a versioned dependencies on this library
-+ * Torsten Werner <twerner@debian.org> is sponsoring the package
-+
-+ -- Artur R. Czechowski <arturcz@hell.pl> Sun, 23 May 2004 01:02:02 +0200
-+
-+t1lib (5.0.2-2) unstable; urgency=low
-+
-+ * change distribution to unstable
-+ * Torsten Werner <twerner@debian.org> is sponsoring the package
-+
-+ -- Artur R. Czechowski <arturcz@hell.pl> Sun, 18 Apr 2004 13:07:23 +0200
-+
-+t1lib (5.0.2-1) experimental; urgency=low
-+
-+ * New upstream release (Closes: #243916)
-+ - fixed some crashes (Closes: #242570, #243378)
-+ * Reference to README.t1lib-5.0.2 instead -5.0.0 in some debian/ files
-+ * Torsten Werner <twerner@debian.org> is sponsoring the package
-+
-+ -- Artur R. Czechowski <arturcz@hell.pl> Sat, 17 Apr 2004 19:22:09 +0200
-+
-+t1lib (5.0.0-5) unstable; urgency=low
-+
-+ * debian/rules: documentation is build from binary-indep (Closes: #230386)
-+ * debian/watch has been added
-+ * Torsten Werner <twerner@debian.org> is sponsoring the package
-+
-+ -- Artur R. Czechowski <arturcz@hell.pl> Sat, 21 Feb 2004 20:19:38 +0100
-+
-+t1lib (5.0.0-4) unstable; urgency=low
-+
-+ * Added missing files in NEWS.Debian
-+
-+ -- Artur R. Czechowski <arturcz@hell.pl> Wed, 21 Jan 2004 00:27:24 +0100
-+
-+t1lib (5.0.0-3) unstable; urgency=low
-+
-+ * New release uploaded to unstable (finaly closes: #185097, #216501)
-+ * Unleash it to allow to migrate to testing (Closes: #221198)
-+ * libt1-dev and t1lib-dev conflict with each other,
-+ * libt1-dev conflicts with t1lib1-dev to smooth upgrade from t1lib 1.3.1-6
-+ * t1lib-bin provides/conflicts/replaces t1lib1-bin to smooth upgrade from
-+ t1lib 1.3.1-6
-+ * Some README.* files in libt1-dev
-+ * Applied patch which fixes memory access bug (see #224314 for details)
-+ * Torsten Werner <twerner@debian.org> is sponsoring the package
-+
-+ -- Artur R. Czechowski <arturcz@hell.pl> Sun, 18 Jan 2004 03:00:05 +0100
-+
-+t1lib (5.0.0-2) experimental; urgency=low
-+
-+ * rename source package to t1lib
-+ * rename binary packages:
-+ + libt1-5 -> libt1-dev
-+ + t1lib5-bin -> t1lib-bin
-+ + libt1-5-doc -> libt1-doc
-+ * rationale for all above:
-+ http://lists.debian.org/debian-devel/2003/debian-devel-200311/msg01083.html
-+ and rest of this thread
-+ * linking libt1x with X libraries to avoid undefined symbols (see #220111)
-+ * clearing independency of X11 in README.Debian
-+ * removed all tracks of t1lib0 (Conflict, Replaces, etc)
-+ * Torsten Werner <twerner@debian.org> is sponsoring the package
-+
-+ -- Artur R. Czechowski <arturcz@hell.pl> Wed, 24 Dec 2003 01:50:37 +0100
-+
-+t1lib5 (5.0.0-1) experimental; urgency=low
-+
-+ * New upstream release (Closes: #185097, #216501)
-+ * This release is binary incompatible with the previous one.
-+ * t1lib-bin and t1lib-dev are virtual packages now
-+ * removed weird ``dbl'' from configure - typo in upstream configure.in
-+ * there is no necessity to conflict current -doc with the other ones
-+ * library, devel and documentation package is libt1-5{,-dev,-doc} to be
-+ consistent with Debian Policy 8.1
-+ * do not anymore copy config.{sub,guess} automagically
-+ * update ac-tools/config.{sub,guess} to 20031007
-+ * Torsten Werner <twerner@debian.org> is sponsoring the package
-+
-+ -- Artur R. Czechowski <arturcz@hell.pl> Sun, 9 Nov 2003 15:16:51 +0100
-+
-+t1lib (1.3.1-4) unstable; urgency=low
-+
-+ * New Maintainer, Adopted Package (Closes: #189694)
-+ * Prepare for migration to t1lib 5.x:
-+ - all packages renamed to t1lib1{,-foo}
-+ - empty packages t1lib-bin and t1lib-dev depending on t1lib1-bin
-+ and t1lib1-dev
-+ * Packaging from scratch using debhelper, Standards-Version is 3.6.1.0 now
-+ * Remove non-existent xlib6g-dev from Build-Depends
-+ * Updated README.Debian
-+ * Remove symlinks from /usr/doc/t1lib*
-+ * Only t1lib1-bin contains /etc/t1lib directory
-+ * t1lib-dev has been split into two packages: t1lib1-dev and t1lib1-doc
-+ * t1lib1-bin: change manual section for type1afm from 8 to 1
-+ * t1lib1-bin: create files in /etc/t1lib if don't exist (Closes: #58275)
-+ * t1lib1-bin: remove symlink /usr/share/doc/t1lib-bin -> t1lib1 if exists
-+ * Torsten Werner <twerner@debian.org> is sponsoring the package
-+
-+ -- Artur R. Czechowski <arturcz@hell.pl> Sun, 2 Nov 2003 03:47:51 +0100
-+
-+t1lib (1.3.1-3) unstable; urgency=low
-+
-+ * Change t1lib-dev's section from "devel" to "libdevel" (thanks, Katie!)
-+
-+ -- Adam Conrad <adconrad@0c3.net> Mon, 18 Aug 2003 22:42:17 -0600
-+
-+t1lib (1.3.1-2) unstable; urgency=low
-+
-+ * Set maintainer to QA, as this package was orphaned months ago (see #189694)
-+ * Change "make" to "make without_doc" and remove build-dep on
-+ tetex-bin (closes: #192291, #192290)
-+ * Change libxaw-dev build-dep to libxaw7-dev, so we are asking for a real
-+ package, rather than a virtual (closes: #170012)
-+ * lib/Makefile.in changes (closes: #193757)
-+ - add "-lm" to libt1.la target
-+ - add "-L@top_srcdir@/lib/.libs/ -lt1" to libt1x.la target
-+
-+ -- Adam Conrad <adconrad@0c3.net> Mon, 18 Aug 2003 21:50:22 -0600
-+
-+t1lib (1.3.1-1) unstable; urgency=low
-+
-+ * New upstream version. (Closes: #127619,#127618)
-+
-+ -- David Huggins-Daines <dhd@debian.org> Thu, 3 Jan 2002 21:53:29 -0500
-+
-+t1lib (1.2-1) unstable; urgency=low
-+
-+ * New upstream version.
-+
-+ -- David Huggins-Daines <dhd@debian.org> Wed, 22 Aug 2001 21:16:36 -0400
-+
-+t1lib (1.1.1-2.2) unstable; urgency=low
-+
-+ * NMU
-+ * debian/rules: if LD_LIBRARY_PATH is already set, append to it, so
-+ builds under fakeroot will work (Closes: #104046)
-+
-+ -- Branden Robinson <branden@debian.org> Fri, 10 Aug 2001 04:57:50 -0500
-+
-+t1lib (1.1.1-2.1) unstable; urgency=low
-+
-+ * NMU, with updated config.{guess,sub} for newer architectures
-+
-+ -- Randolph Chung <tausq@debian.org> Sat, 7 Jul 2001 01:01:51 -0600
-+
-+t1lib (1.1.1-2) unstable; urgency=high
-+
-+ * Yow! Major upstream weirdness. Do *not* try to print the documentation
-+ when building... Closes: #94660
-+
-+ -- David Huggins-Daines <dhd@debian.org> Fri, 20 Apr 2001 20:35:49 -0400
-+
-+t1lib (1.1.1-1) unstable; urgency=low
-+
-+ * New upstream version. Closes: #94627 (why did I never get this bug
-+ report in the first place?)
-+
-+ -- David Huggins-Daines <dhd@debian.org> Fri, 20 Apr 2001 11:16:15 -0400
-+
-+t1lib (1.0.1-2) unstable; urgency=low
-+
-+ * Recompile with new XFree86 libraries and glibc.
-+
-+ -- David Huggins-Daines <dhd@debian.org> Wed, 24 Jan 2001 22:33:43 -0500
-+
-+t1lib (1.0.1-1) unstable; urgency=low
-+
-+ * New upstream version. Closes: #69689
-+
-+ -- David Huggins-Daines <dhd@debian.org> Thu, 9 Nov 2000 00:29:06 -0500
-+
-+t1lib (1.0-2) frozen unstable; urgency=low
-+
-+ * Use dpkg-architecture to supply a target architecture name to
-+ configure, should fix the compile problems on Alpha and ARM for good.
-+ (closes:#57839)
-+
-+ -- David Huggins-Daines <dhd@eradicator.org> Wed, 1 Mar 2000 21:22:49 -0500
-+
-+t1lib (1.0-1) unstable; urgency=low
-+
-+ * New upstream version.
-+ * Twiddled package names to make more sense.
-+ * Move back to priority optional to satisfy dependencies of xpdf and
-+ php3.
-+ * Moved .la files to t1lib-dev. Added versioned Replaces: field in the
-+ control file to cope with potato-to-potato upgrades (the t1lib0
-+ packages in slink were not buggy in this way)
-+ * t1libconfig and associated manual pages (FontDataBase.5,
-+ t1libconfig.8) are now in the t1lib-bin package, for much the same
-+ reason. Unfortunately this Replaces: field cannot be versioned.
-+ * The t1lib packages no longer manage the contents of /etc/t1lib/. In
-+ the near future, t1lib1 may have a debconf interface for doing so.
-+ The t1lib.config and FontDataBase were never used by any programs that
-+ linked with t1lib anyway, thankfully.
-+
-+ -- David Huggins-Daines <dhd@eradicator.org> Sun, 2 Jan 2000 03:02:30 -0500
-+
-+t1lib0 (0.9.2-1) unstable; urgency=low
-+
-+ * New upstream version.
-+ * Being more intelligent in t1libconfig to avoid postinst-lossage.
-+ Fixes: #44095
-+ * Updated for FHS compliance.
-+
-+ -- David Huggins-Daines <dhd@debian.org> Fri, 8 Oct 1999 15:27:46 -0400
-+
-+t1lib0 (0.9.1-4) unstable; urgency=medium
-+
-+ * Updated the shlibs file since it appears that programs compiled
-+ against 0.9.1 won't work with 0.9 (though the other way around does
-+ work). Fixes: #43215, #43231
-+ * Removed ARCH bogosity and updated config.sub and config.guess
-+ (upstream maintainer will be notified)
-+
-+ -- David Huggins-Daines <dhd@debian.org> Sat, 21 Aug 1999 01:23:39 -0400
-+
-+t1lib0 (0.9.1-3) unstable; urgency=low
-+
-+ * Conditionalize that ARCH thing, or the Hurd people will kill me.
-+
-+ -- David Huggins-Daines <dhd@debian.org> Sat, 3 Jul 1999 13:56:12 -0400
-+
-+t1lib0 (0.9.1-2) unstable; urgency=low
-+
-+ * Oops. T1lib installs a dummy config file. We remove this before
-+ building the package (because we generate our own). Also, the preinst
-+ has to compensate for the past brokenness by saving it before an
-+ upgrade.
-+
-+ -- David Huggins-Daines <dhd@debian.org> Fri, 2 Jul 1999 16:13:46 -0400
-+
-+t1lib0 (0.9.1-1) unstable; urgency=low
-+
-+ * New upstream version.
-+ * Moved back to extra, because that's the way the winds are blowing.
-+ * Added ARCH variable to debian/rules to work around strange
-+ architecture detection on Alpha.
-+
-+ -- David Huggins-Daines <dhd@debian.org> Fri, 2 Jul 1999 14:58:32 -0400
-+
-+t1lib0 (0.9-1) unstable; urgency=low
-+
-+ * New upstream version
-+
-+ -- David Huggins-Daines <dhd@debian.org> Thu, 10 Jun 1999 23:00:12 -0400
-+
-+t1lib0 (0.8.1-1) unstable; urgency=low
-+
-+ * New upstream version. (fixes bug #31549)
-+ * Upstream move to libtool has made debian/rules a lot less contorted,
-+ and slimmed up the diff considerably. Thanks!
-+ * I'm now uploading m68k versions as well.
-+ * Fixed "confdif" typo in t1libconfig (oops!)
-+ * This release breaks binary and source compatibility. Bumping the
-+ soname seems a bit extreme, since there is only one Debian package
-+ (gglyph) which depends on this, and I'm simultaneously uploading a
-+ fixed version.
-+
-+ -- David Huggins-Daines <dhd@debian.org> Wed, 24 Feb 1999 17:16:41 -0500
-+
-+t1lib0 (0.7.1-5) unstable; urgency=low
-+
-+ * Changed debian/rules to remove debian/files on clean. (fixes bug #26907)
-+ * Changed t1libconfig to allow installation </dev/null (fixes bug #27609)
-+
-+ -- David Huggins-Daines <dhd@debian.org> Fri, 16 Oct 1998 20:12:02 -0400
-+
-+t1lib0 (0.7.1-4) unstable; urgency=low
-+
-+ * Changed debian/rules not to use debhelper, to fix PowerPC and Alpha compile
-+ problems and (hopefully) make the purists happy :)
-+ * Upgraded priority to Optional, since it doesn't conflict with or break
-+ anything, and is relatively stable.
-+
-+ -- David Huggins-Daines <dhd@debian.org> Fri, 18 Sep 1998 18:36:07 -0400
-+
-+t1lib0 (0.7.1-3) unstable; urgency=low
-+
-+ * Changed "read" to "read foo" in t1libconfig to make it more sh-friendly.
-+ * Minor change to debian/rules (fixes bug #25501)
-+
-+ -- David Huggins-Daines <dhd@debian.org> Fri, 7 Aug 1998 13:31:28 -0400
-+
-+t1lib0 (0.7.1-2) unstable; urgency=low
-+
-+ * Patched lib/t1lib/t1finfo.c to fix segfault problems with some fonts.
-+ * Fixed the URLs and info in copyright and README.Debian.
-+
-+ -- David Huggins-Daines <dhd@debian.org> Tue, 21 Jul 1998 16:01:03 -0400
-+
-+t1lib0 (0.7.1-1) unstable; urgency=low
-+
-+ * Initial release.
-+
-+ -- David Huggins-Daines <dhd@debian.org> Thu, 16 Jul 1998 22:07:08 -0400
-+
-+
---- t1lib-5.1.2.orig/debian/copyright
-+++ t1lib-5.1.2/debian/copyright
-@@ -0,0 +1,94 @@
-+This package was debianized by David Huggins-Daines <dhd@debian.org> on
-+Fri, 19 Jun 1998 20:01:01 -0400. It has been also maintained by Artur
-+R. Czechowski <arturcz@hell.pl> and Torsten Werner <twerner@debian.org>.
-+
-+It was downloaded from ftp://sunsite.unc.edu/pub/Linux/libs/graphics/
-+
-+Upstream Author:
-+
-+ Rainer Menzner <Rainer.Menzner@web.de>
-+
-+Copyright:
-+
-+ Copyright (C) 1996-2003 Rainer Menzner
-+
-+License:
-+
-+ This package is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2 of the License, or (at your option) any later version.
-+
-+ This package 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
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with this package; if not, write to the Free Software
-+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-+
-+On Debian systems, the complete text of the GNU Lesser General
-+Public License can be found in `/usr/share/common-licenses/LGPL'.
-+
-+The Debian packaging is (C) 2008, Ruben Molina <rmolina@udea.edu.co> and
-+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
-+
-+Please note that there are parts of t1lib that are subject to other licenses:
-+- The parseAFM-package is copyrighted by Adobe Systems Inc.
-+- The type1 rasterizer is copyrighted by IBM and the X11-consortium.
-+
-+(from lib/t1lib/parseAFM.c)
-+/*
-+ * (C) 1988, 1989, 1990 by Adobe Systems Incorporated. All rights reserved.
-+ *
-+ * This file may be freely copied and redistributed as long as:
-+ * 1) This entire notice continues to be included in the file,
-+ * 2) If the file has been modified in any way, a notice of such
-+ * modification is conspicuously indicated.
-+ *
-+ * PostScript, Display PostScript, and Adobe are registered trademarks of
-+ * Adobe Systems Incorporated.
-+ *
-+ * ************************************************************************
-+ * THE INFORMATION BELOW IS FURNISHED AS IS, IS SUBJECT TO CHANGE WITHOUT
-+ * NOTICE, AND SHOULD NOT BE CONSTRUED AS A COMMITMENT BY ADOBE SYSTEMS
-+ * INCORPORATED. ADOBE SYSTEMS INCORPORATED ASSUMES NO RESPONSIBILITY OR
-+ * LIABILITY FOR ANY ERRORS OR INACCURACIES, MAKES NO WARRANTY OF ANY
-+ * KIND (EXPRESS, IMPLIED OR STATUTORY) WITH RESPECT TO THIS INFORMATION,
-+ * AND EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR PARTICULAR PURPOSES AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
-+ * ************************************************************************
-+ */
-+
-+(from lib/type1/type1.c)
-+/* $XConsortium: type1.c,v 1.5 91/10/10 11:20:06 rws Exp $ */
-+/* Copyright International Business Machines, Corp. 1991
-+ * All Rights Reserved
-+ * Copyright Lexmark International, Inc. 1991
-+ * All Rights Reserved
-+ * Portions Copyright (c) 1990 Adobe Systems Incorporated.
-+ * All Rights Reserved
-+ *
-+ * License to use, copy, modify, and distribute this software and its
-+ * documentation for any purpose and without fee is hereby granted,
-+ * provided that the above copyright notice appear in all copies and that
-+ * both that copyright notice and this permission notice appear in
-+ * supporting documentation, and that the name of IBM or Lexmark or Adobe
-+ * not be used in advertising or publicity pertaining to distribution of
-+ * the software without specific, written prior permission.
-+ *
-+ * IBM, LEXMARK, AND ADOBE PROVIDE THIS SOFTWARE "AS IS", WITHOUT ANY
-+ * WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT
-+ * LIMITED TO ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-+ * PARTICULAR PURPOSE, AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. THE
-+ * ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE, INCLUDING
-+ * ANY DUTY TO SUPPORT OR MAINTAIN, BELONGS TO THE LICENSEE. SHOULD ANY
-+ * PORTION OF THE SOFTWARE PROVE DEFECTIVE, THE LICENSEE (NOT IBM,
-+ * LEXMARK, OR ADOBE) ASSUMES THE ENTIRE COST OF ALL SERVICING, REPAIR AND
-+ * CORRECTION. IN NO EVENT SHALL IBM, LEXMARK, OR ADOBE BE LIABLE FOR ANY
-+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
-+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-+ * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
---- t1lib-5.1.2.orig/debian/t1lib-bin.menu
-+++ t1lib-5.1.2/debian/t1lib-bin.menu
-@@ -0,0 +1,2 @@
-+?package(t1lib-bin): needs="X11" section="Applications/Viewers" \
-+ title="XGlyph" command="/usr/bin/xglyph"
--- t1lib-5.1.2.orig/debian/watch
+++ t1lib-5.1.2/debian/watch
@@ -0,0 +1,3 @@
+version=3
+ftp://sunsite.unc.edu/pub/Linux/libs/graphics/t1lib-(.*)\.tar\.gz \
+ debian debian/orig-tar.sh
---- t1lib-5.1.2.orig/debian/libt1-5.docs
-+++ t1lib-5.1.2/debian/libt1-5.docs
-@@ -0,0 +1,2 @@
-+README.t1lib-*
-+README.t1python
---- t1lib-5.1.2.orig/debian/t1lib-bin.install
-+++ t1lib-5.1.2/debian/t1lib-bin.install
-@@ -0,0 +1,2 @@
-+debian/t1libconfig usr/sbin
-+debian/tmp/usr/bin/*
--- t1lib-5.1.2.orig/debian/README.Debian
+++ t1lib-5.1.2/debian/README.Debian
@@ -0,0 +1,25 @@
@@ -1292,87 +1343,47 @@
+thanks to him for his good job.
+
+ -- Artur R. Czechowski <arturcz@hell.pl>, Tue, 11 Nov 2003 13:31:48 +0100
---- t1lib-5.1.2.orig/debian/orig-tar.sh
-+++ t1lib-5.1.2/debian/orig-tar.sh
-@@ -0,0 +1,11 @@
-+#!/bin/sh -e
-+
-+# called by uscan with '--upstream-version' <version> <file>
-+
-+# move to directory 'tarballs'
-+if [ -r .svn/deb-layout ]; then
-+ . .svn/deb-layout
-+ mv $3 $origDir
-+ echo "moved $3 to $origDir"
-+fi
-+
---- t1lib-5.1.2.orig/debian/patches/series
-+++ t1lib-5.1.2/debian/patches/series
-@@ -0,0 +1,4 @@
-+no-docs.diff
-+no-config.diff
-+lib-cleanup.diff
-+#segfault.diff
---- t1lib-5.1.2.orig/debian/patches/no-config.diff
-+++ t1lib-5.1.2/debian/patches/no-config.diff
-@@ -0,0 +1,57 @@
-+do not install a static configuration file
+--- t1lib-5.1.2.orig/debian/t1lib-bin.dirs
++++ t1lib-5.1.2/debian/t1lib-bin.dirs
+@@ -0,0 +1 @@
++etc/t1lib
+--- t1lib-5.1.2.orig/debian/patches/no-docs.diff
++++ t1lib-5.1.2/debian/patches/no-docs.diff
+@@ -0,0 +1,34 @@
++We are using debhelper to install the documentation in the correct
++directory.
+
-+Index: t1lib-5.1.1/lib/Makefile.in
++Index: t1lib-5.1.1/doc/Makefile.in
+===================================================================
-+--- t1lib-5.1.1.orig/lib/Makefile.in 2008-01-05 19:13:57.000000000 +0100
-++++ t1lib-5.1.1/lib/Makefile.in 2008-01-05 19:14:18.000000000 +0100
-+@@ -161,17 +161,17 @@
++--- t1lib-5.1.1.orig/doc/Makefile.in 2008-01-05 19:05:03.000000000 +0100
+++++ t1lib-5.1.1/doc/Makefile.in 2008-01-05 19:05:25.000000000 +0100
++@@ -89,16 +89,16 @@
++
++
+ install: dummy
-+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
-+ $(MKINSTALLDIRS) $(DESTDIR)$(includedir)
-+- $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@
-++# $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@
-+ $(LIBTOOL) --mode=install \
-+ $(INSTALL_DATA) $(MAIN_TARGET) $(DESTDIR)$(libdir)
-+ $(LIBTOOL) --mode=install \
-+ $(INSTALL_DATA) $(MAIN_HEADER) $(DESTDIR)$(includedir)
-+- if (test -f $(DESTDIR)@T1LIB_DATA_DIR@/t1lib.config) \
++- if (test -f t1lib_doc.ps) \
+- then \
-+- echo "Alert: Global configuration file exists, installation skipped!"; \
-+- else \
-+- $(LIBTOOL) --mode=install $(INSTALL_DATA) t1lib.config $(DESTDIR)@T1LIB_DATA_DIR@; \
++- $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@/doc; \
++- $(INSTALL_DATA) t1lib_doc.ps $(DESTDIR)@T1LIB_DATA_DIR@/doc; \
+- fi;
-++# if (test -f $(DESTDIR)@T1LIB_DATA_DIR@/t1lib.config) \
++- if (test -f t1lib_doc.pdf) \
++- then \
++- $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@/doc; \
++- $(INSTALL_DATA) t1lib_doc.pdf $(DESTDIR)@T1LIB_DATA_DIR@/doc; \
++- fi;
+++# if (test -f t1lib_doc.ps) \
++# then \
-++# echo "Alert: Global configuration file exists, installation skipped!"; \
-++# else \
-++# $(LIBTOOL) --mode=install $(INSTALL_DATA) t1lib.config $(DESTDIR)@T1LIB_DATA_DIR@; \
+++# $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@/doc; \
+++# $(INSTALL_DATA) t1lib_doc.ps $(DESTDIR)@T1LIB_DATA_DIR@/doc; \
+++# fi;
+++# if (test -f t1lib_doc.pdf) \
+++# then \
+++# $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@/doc; \
+++# $(INSTALL_DATA) t1lib_doc.pdf $(DESTDIR)@T1LIB_DATA_DIR@/doc; \
++# fi;
+
+
+ uninstall: dummy
-+@@ -179,7 +179,7 @@
-+ -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libt1x.la
-+ -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(includedir)/t1lib.h
-+ -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(includedir)/t1libx.h
-+- -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)@T1LIB_DATA_DIR@/t1lib.config
-++# -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)@T1LIB_DATA_DIR@/t1lib.config
-+
-+
-+ dummy:
-+Index: t1lib-5.1.1/xglyph/xglyph.c
-+===================================================================
-+--- t1lib-5.1.1.orig/xglyph/xglyph.c 2008-01-05 19:16:30.000000000 +0100
-++++ t1lib-5.1.1/xglyph/xglyph.c 2008-01-05 19:16:40.000000000 +0100
-+@@ -526,9 +526,12 @@
-+
-+ /* Check for environment entry. If not set, set it to current
-+ directory so that configuration file is found there */
-++ /* It violates the Debian Policy */
-++#if 0
-+ if (getenv("T1LIB_CONFIG")==NULL){
-+ putenv( "T1LIB_CONFIG=./t1lib.config");
-+ }
-++#endif
-+
-+
-+ /* Set log-level: */
--- t1lib-5.1.2.orig/debian/patches/lib-cleanup.diff
+++ t1lib-5.1.2/debian/patches/lib-cleanup.diff
@@ -0,0 +1,59 @@
@@ -1435,43 +1446,66 @@
+
+
+ all: xglyph
---- t1lib-5.1.2.orig/debian/patches/no-docs.diff
-+++ t1lib-5.1.2/debian/patches/no-docs.diff
-@@ -0,0 +1,34 @@
-+We are using debhelper to install the documentation in the correct
-+directory.
+--- t1lib-5.1.2.orig/debian/patches/no-config.diff
++++ t1lib-5.1.2/debian/patches/no-config.diff
+@@ -0,0 +1,57 @@
++do not install a static configuration file
+
-+Index: t1lib-5.1.1/doc/Makefile.in
++Index: t1lib-5.1.1/lib/Makefile.in
+===================================================================
-+--- t1lib-5.1.1.orig/doc/Makefile.in 2008-01-05 19:05:03.000000000 +0100
-++++ t1lib-5.1.1/doc/Makefile.in 2008-01-05 19:05:25.000000000 +0100
-+@@ -89,16 +89,16 @@
-+
-+
++--- t1lib-5.1.1.orig/lib/Makefile.in 2008-01-05 19:13:57.000000000 +0100
+++++ t1lib-5.1.1/lib/Makefile.in 2008-01-05 19:14:18.000000000 +0100
++@@ -161,17 +161,17 @@
+ install: dummy
-+- if (test -f t1lib_doc.ps) \
-+- then \
-+- $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@/doc; \
-+- $(INSTALL_DATA) t1lib_doc.ps $(DESTDIR)@T1LIB_DATA_DIR@/doc; \
-+- fi;
-+- if (test -f t1lib_doc.pdf) \
++ $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
++ $(MKINSTALLDIRS) $(DESTDIR)$(includedir)
++- $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@
+++# $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@
++ $(LIBTOOL) --mode=install \
++ $(INSTALL_DATA) $(MAIN_TARGET) $(DESTDIR)$(libdir)
++ $(LIBTOOL) --mode=install \
++ $(INSTALL_DATA) $(MAIN_HEADER) $(DESTDIR)$(includedir)
++- if (test -f $(DESTDIR)@T1LIB_DATA_DIR@/t1lib.config) \
+- then \
-+- $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@/doc; \
-+- $(INSTALL_DATA) t1lib_doc.pdf $(DESTDIR)@T1LIB_DATA_DIR@/doc; \
++- echo "Alert: Global configuration file exists, installation skipped!"; \
++- else \
++- $(LIBTOOL) --mode=install $(INSTALL_DATA) t1lib.config $(DESTDIR)@T1LIB_DATA_DIR@; \
+- fi;
-++# if (test -f t1lib_doc.ps) \
-++# then \
-++# $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@/doc; \
-++# $(INSTALL_DATA) t1lib_doc.ps $(DESTDIR)@T1LIB_DATA_DIR@/doc; \
-++# fi;
-++# if (test -f t1lib_doc.pdf) \
+++# if (test -f $(DESTDIR)@T1LIB_DATA_DIR@/t1lib.config) \
++# then \
-++# $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@/doc; \
-++# $(INSTALL_DATA) t1lib_doc.pdf $(DESTDIR)@T1LIB_DATA_DIR@/doc; \
+++# echo "Alert: Global configuration file exists, installation skipped!"; \
+++# else \
+++# $(LIBTOOL) --mode=install $(INSTALL_DATA) t1lib.config $(DESTDIR)@T1LIB_DATA_DIR@; \
++# fi;
+
+
+ uninstall: dummy
++@@ -179,7 +179,7 @@
++ -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libt1x.la
++ -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(includedir)/t1lib.h
++ -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(includedir)/t1libx.h
++- -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)@T1LIB_DATA_DIR@/t1lib.config
+++# -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)@T1LIB_DATA_DIR@/t1lib.config
++
++
++ dummy:
++Index: t1lib-5.1.1/xglyph/xglyph.c
++===================================================================
++--- t1lib-5.1.1.orig/xglyph/xglyph.c 2008-01-05 19:16:30.000000000 +0100
+++++ t1lib-5.1.1/xglyph/xglyph.c 2008-01-05 19:16:40.000000000 +0100
++@@ -526,9 +526,12 @@
++
++ /* Check for environment entry. If not set, set it to current
++ directory so that configuration file is found there */
+++ /* It violates the Debian Policy */
+++#if 0
++ if (getenv("T1LIB_CONFIG")==NULL){
++ putenv( "T1LIB_CONFIG=./t1lib.config");
++ }
+++#endif
++
++
++ /* Set log-level: */
--- t1lib-5.1.2.orig/debian/patches/segfault.diff
+++ t1lib-5.1.2/debian/patches/segfault.diff
@@ -0,0 +1,62 @@
@@ -1537,42 +1571,330 @@
+ extern int T1_SetFontDataBase( char *filename);
+ extern int T1_AddFontDataBase( int mode, char *filename);
+ extern int T1_SetFontDataBaseXLFD( char *filename);
---- t1lib-5.1.2.orig/debian/man/type1afm.1
-+++ t1lib-5.1.2/debian/man/type1afm.1
-@@ -0,0 +1,34 @@
-+.TH TYPE1AFM 1
+--- t1lib-5.1.2.orig/debian/patches/CVE-2010-2642.patch
++++ t1lib-5.1.2/debian/patches/CVE-2010-2642.patch
+@@ -0,0 +1,24 @@
++diff --git a/lib/t1lib/parseAFM.c b/lib/t1lib/parseAFM.c
++index 6a31d7f..ba64541 100644
++--- a/lib/t1lib/parseAFM.c
+++++ b/lib/t1lib/parseAFM.c
++@@ -199,7 +199,9 @@ static char *token(stream)
++ idx = 0;
++
++ while (ch != EOF && ch != ' ' && ch != CR && ch != LF &&
++- ch != CTRL_Z && ch != '\t' && ch != ':' && ch != ';'){
+++ ch != CTRL_Z && ch != '\t' && ch != ':' && ch != ';'
+++ && idx < (MAX_NAME -1))
+++ {
++ ident[idx++] = ch;
++ ch = fgetc(stream);
++ } /* while */
++@@ -235,7 +237,7 @@ static char *linetoken(stream)
++ while ((ch = fgetc(stream)) == ' ' || ch == '\t' );
++
++ idx = 0;
++- while (ch != EOF && ch != CR && ch != LF && ch != CTRL_Z)
+++ while (ch != EOF && ch != CR && ch != LF && ch != CTRL_Z && idx < (MAX_NAME - 1))
++ {
++ ident[idx++] = ch;
++ ch = fgetc(stream);
+--- t1lib-5.1.2.orig/debian/patches/CVE-2011-0764.diff
++++ t1lib-5.1.2/debian/patches/CVE-2011-0764.diff
+@@ -0,0 +1,32 @@
++Description: Don't lookup previous point if there isn't any
++Author: Marc Deslauriers <marc.deslauriers@canonical.com>
++Forwarded: no
++
++Index: t1lib-5.1.2/lib/type1/type1.c
++===================================================================
++--- t1lib-5.1.2.orig/lib/type1/type1.c 2011-12-13 14:24:14.280965637 -0600
+++++ t1lib-5.1.2/lib/type1/type1.c 2011-12-13 14:25:25.893320747 -0600
++@@ -1700,6 +1700,7 @@
++ long pindex = 0;
++
++ /* compute hinting for previous segment! */
+++ if (ppoints == NULL) Error0i("RLineTo: No previous point!\n");
++ FindStems( currx, curry, currx-ppoints[numppoints-2].x, curry-ppoints[numppoints-2].y, dx, dy);
++
++ /* Allocate a new path point and pre-setup data */
++@@ -1728,6 +1729,7 @@
++ long pindex = 0;
++
++ /* compute hinting for previous point! */
+++ if (ppoints == NULL) Error0i("RRCurveTo: No previous point!\n");
++ FindStems( currx, curry, currx-ppoints[numppoints-2].x, curry-ppoints[numppoints-2].y, dx1, dy1);
++
++ /* Allocate three new path points and pre-setup data */
++@@ -1903,6 +1905,7 @@
++ FindStems( currx, curry, 0, 0, dx, dy);
++ }
++ else {
+++ if (ppoints == NULL) Error0i("RMoveTo: No previous point!\n");
++ FindStems( currx, curry, ppoints[numppoints-2].x, ppoints[numppoints-2].y, dx, dy);
++ }
++
+--- t1lib-5.1.2.orig/debian/patches/CVE-2011-1552_1553_1554.patch
++++ t1lib-5.1.2/debian/patches/CVE-2011-1552_1553_1554.patch
+@@ -0,0 +1,133 @@
++Author: Jaroslav Škarvada <jskarvad@redhat.com>
++Description: Fix more crashes on oversized fonts
++Bug-Redhat: http://bugzilla.redhat.com/show_bug.cgi?id=692909
++Index: t1lib-5.1.2/lib/type1/lines.c
++===================================================================
++--- t1lib-5.1.2.orig/lib/type1/lines.c 2007-12-23 09:49:42.000000000 -0600
+++++ t1lib-5.1.2/lib/type1/lines.c 2012-01-17 14:15:08.000000000 -0600
++@@ -67,6 +67,10 @@
++ None.
++ */
++
+++#define BITS (sizeof(LONG)*8)
+++#define HIGHTEST(p) (((p)>>(BITS-2)) != 0) /* includes sign bit */
+++#define TOOBIG(xy) ((xy < 0) ? HIGHTEST(-xy) : HIGHTEST(xy))
+++
++ /*
++ :h2.StepLine() - Produces Run Ends for a Line After Checks
++
++@@ -84,6 +88,9 @@
++ IfTrace4((LineDebug > 0), ".....StepLine: (%d,%d) to (%d,%d)\n",
++ x1, y1, x2, y2);
++
+++ if ( TOOBIG(x1) || TOOBIG(x2) || TOOBIG(y1) || TOOBIG(y2))
+++ abort("Lines this big not supported", 49);
+++
++ dy = y2 - y1;
++
++ /*
++Index: t1lib-5.1.2/lib/type1/objects.c
++===================================================================
++--- t1lib-5.1.2.orig/lib/type1/objects.c 2007-12-23 09:49:42.000000000 -0600
+++++ t1lib-5.1.2/lib/type1/objects.c 2012-01-17 14:15:08.000000000 -0600
++@@ -1137,12 +1137,13 @@
++ "Context: out of them", /* 46 */
++ "MatrixInvert: can't", /* 47 */
++ "xiStub called", /* 48 */
++- "Illegal access type1 abort() message" /* 49 */
+++ "Lines this big not supported", /* 49 */
+++ "Illegal access type1 abort() message" /* 50 */
++ };
++
++- /* no is valid from 1 to 48 */
++- if ( (number<1)||(number>48))
++- number=49;
+++ /* no is valid from 1 to 49 */
+++ if ( (number<1)||(number>49))
+++ number=50;
++ return( err_msgs[number-1]);
++
++ }
++Index: t1lib-5.1.2/lib/type1/type1.c
++===================================================================
++--- t1lib-5.1.2.orig/lib/type1/type1.c 2012-01-17 14:13:28.000000000 -0600
+++++ t1lib-5.1.2/lib/type1/type1.c 2012-01-17 14:19:54.000000000 -0600
++@@ -1012,6 +1012,7 @@
++ double nextdtana = 0.0; /* tangent of post-delta against horizontal line */
++ double nextdtanb = 0.0; /* tangent of post-delta against vertical line */
++
+++ if (ppoints == NULL || numppoints < 1) Error0v("FindStems: No previous point!\n");
++
++ /* setup default hinted position */
++ ppoints[numppoints-1].ax = ppoints[numppoints-1].x;
++@@ -1289,7 +1290,7 @@
++ static int DoRead(CodeP)
++ int *CodeP;
++ {
++- if (strindex >= CharStringP->len) return(FALSE); /* end of string */
+++ if (!CharStringP || strindex >= CharStringP->len) return(FALSE); /* end of string */
++ /* We handle the non-documented Adobe convention to use lenIV=-1 to
++ suppress charstring encryption. */
++ if (blues->lenIV==-1) {
++@@ -1700,7 +1701,7 @@
++ long pindex = 0;
++
++ /* compute hinting for previous segment! */
++- if (ppoints == NULL) Error0i("RLineTo: No previous point!\n");
+++ if (ppoints == NULL || numppoints < 2) Error0i("RLineTo: No previous point!\n");
++ FindStems( currx, curry, currx-ppoints[numppoints-2].x, curry-ppoints[numppoints-2].y, dx, dy);
++
++ /* Allocate a new path point and pre-setup data */
++@@ -1729,7 +1730,7 @@
++ long pindex = 0;
++
++ /* compute hinting for previous point! */
++- if (ppoints == NULL) Error0i("RRCurveTo: No previous point!\n");
+++ if (ppoints == NULL || numppoints < 2) Error0i("RRCurveTo: No previous point!\n");
++ FindStems( currx, curry, currx-ppoints[numppoints-2].x, curry-ppoints[numppoints-2].y, dx1, dy1);
++
++ /* Allocate three new path points and pre-setup data */
++@@ -1788,7 +1789,9 @@
++ long tmpind;
++ double deltax = 0.0;
++ double deltay = 0.0;
++-
+++
+++ if (ppoints == NULL || numppoints < 1) Error0i("DoClosePath: No previous point!");
+++
++ /* If this ClosePath command together with the starting point of this
++ path completes to a segment aligned to a stem, we would miss
++ hinting for this point. --> Check and explicitly care for this! */
++@@ -1803,6 +1806,7 @@
++ deltax = ppoints[i].x - ppoints[numppoints-1].x;
++ deltay = ppoints[i].y - ppoints[numppoints-1].y;
++
+++ if (ppoints == NULL || numppoints <= i + 1) Error0i("DoClosePath: No previous point!");
++ /* save nummppoints and reset to move point */
++ tmpind = numppoints;
++ numppoints = i + 1;
++@@ -1905,7 +1909,7 @@
++ FindStems( currx, curry, 0, 0, dx, dy);
++ }
++ else {
++- if (ppoints == NULL) Error0i("RMoveTo: No previous point!\n");
+++ if (ppoints == NULL || numppoints < 2) Error0i("RMoveTo: No previous point!\n");
++ FindStems( currx, curry, ppoints[numppoints-2].x, ppoints[numppoints-2].y, dx, dy);
++ }
++
++@@ -2155,6 +2159,7 @@
++ DOUBLE cx, cy;
++ DOUBLE ex, ey;
++
+++ if (ppoints == NULL || numppoints < 8) Error0v("FlxProc: No previous point!");
++
++ /* Our PPOINT list now contains 7 moveto commands which
++ are about to be consumed by the Flex mechanism. --> Remove these
++@@ -2324,6 +2329,7 @@
++ /* Returns currentpoint on stack */
++ static void FlxProc2()
++ {
+++ if (ppoints == NULL || numppoints < 1) Error0v("FlxProc2: No previous point!");
++ /* Push CurrentPoint on fake PostScript stack */
++ PSFakePush( ppoints[numppoints-1].x);
++ PSFakePush( ppoints[numppoints-1].y);
+--- t1lib-5.1.2.orig/debian/patches/format-security.diff
++++ t1lib-5.1.2/debian/patches/format-security.diff
+@@ -0,0 +1,33 @@
++--- a/lib/type1/objects.c
+++++ b/lib/type1/objects.c
++@@ -957,7 +957,7 @@
++
++ sprintf(typemsg, "Wrong object type in %s; expected %s, found %s.\n",
++ name, TypeFmt(expect), TypeFmt(obj->type));
++- IfTrace0(TRUE,typemsg);
+++ IfTrace1(TRUE, "%s", typemsg);
++
++ ObjectPostMortem(obj);
++
++--- a/lib/t1lib/t1subset.c
+++++ b/lib/t1lib/t1subset.c
++@@ -759,7 +759,7 @@
++ tr_len);
++ T1_PrintLog( "T1_SubsetFont()", err_warn_msg_buf,
++ T1LOG_DEBUG);
++- l+=sprintf( &(trailerbuf[l]), linebuf); /* contains the PostScript trailer */
+++ l+=sprintf( &(trailerbuf[l]), "%s", linebuf); /* contains the PostScript trailer */
++ }
++
++ /* compute size of output file */
++--- a/lib/type1/objects.h
+++++ b/lib/type1/objects.h
++@@ -214,7 +214,7 @@
++ /*SHARED*/
++ /* NDW: personally, I want to see status and error messages! */
++ #define IfTrace0(condition,model) \
++- {if (condition) printf(model);}
+++ {if (condition) fputs(model,stdout);}
++ #define IfTrace1(condition,model,arg0) \
++ {if (condition) printf(model,arg0);}
++ #define IfTrace2(condition,model,arg0,arg1) \
+--- t1lib-5.1.2.orig/debian/patches/series
++++ t1lib-5.1.2/debian/patches/series
+@@ -0,0 +1,8 @@
++no-docs.diff
++no-config.diff
++lib-cleanup.diff
++#segfault.diff
++format-security.diff
++CVE-2011-0764.diff
++CVE-2011-1552_1553_1554.patch
++CVE-2010-2642.patch
+--- t1lib-5.1.2.orig/debian/man/FontDatabase.5
++++ t1lib-5.1.2/debian/man/FontDatabase.5
+@@ -0,0 +1,77 @@
++.TH FONTDATABASE 5
+.SH NAME
-+.B type1afm
-+\- create a font metrics file from a Type 1 font file
-+.SH SYNOPSIS
-+.B type1afm
-+[
-+.BR \-l
-+]
-+.B fontfile
-+[
-+.B fontfile...
-+]
++FontDataBase \- database of fonts accessible to t1lib.
+.SH DESCRIPTION
-+This manual page was written for the Debian GNU/Linux distribution
-+because the original program does not have a manual page.
++This manual page has been written for the Debian GNU/Linux
++distribution. It has been adapted from the documentation included in
++the upstream
++.B t1lib
++distribution.
+.PP
-+.B type1afm
-+reads in Type 1 font files specified on the command line, rasterizes
-+them to 1000bp, and writes AFM (font metrics) files based on the
-+observed metrics information.
++.B /etc/t1lib/FontDataBase
++is a text file which contains, minimally, the basenames of Type 1 font
++files to be made accessible to the
++.B t1lib
++font rasterizer library. The format is intentionally similar to that
++of the
++.B fonts.dir
++and
++.B fonts.scale
++files used by X11.
+.PP
-+The AFM file is created in the same directory as the font file, so be
-+sure that you have write access there before running this program.
-+.SH OPTIONS
-+.TP
-+.BR \-l
-+Write a log file
-+.SH SEE ALSO
-+.BR getafm (1)
-+.SH AUTHOR
-+This manual page was David Huggins-Daines <dhd@debian.org>
-+for the Debian GNU/Linux distribution (but may be used by others)
++Line 1 of this file contains a positive integer specifying the number
++of fonts declared in that file. This is as in the
++.B fonts.dir
++files of the X11 system.
++.PP
++All remaining lines contain declarations of one font each. The only
++thing taken from such a line is the last string (delimited by white
++space) in it. It is assumed to be a filename of the format
++\fIbasename\fR.\fIsomeextension\fR.
++.PP
++The \fIbasename\fR part is assumed to be the
++.BR basename (1)
++of a fontfile. After the a string has been parsed, the
++.I extension
++is cut off and replaced in turn with
++.I .pfa
++and
++.I .pfb.
++The initialization routine tries to open a font file in
++its search path with one of the resulting filenames.
++.PP
++The remainder of the line, i.e., from beginning to the start of the
++filename string, is completely ignored and thus may contain
++information for other programs.
++.SH EXAMPLES
++Here is a minimal font database file for 4 fonts:
++.sp
++.nf
++4
++isvl.afm
++isvli.afm
++isvd.afm
++isvdi.afm
++.fi
++.PP
++This file is \fIminimal\fR, because it contains just the information
++needed, and nothing not needed by the library.
++.PP
++Here is a more realistic example, which allows an application to match
++a fully qualified X11 fontname to a FontID in
++.B t1lib.
++This is also a valid font database file:
++.sp
++.nf
++4
++Souvenir Souvenir-Light --- \-itc-souvenir-light-r-normal--#-0-0-0-p-0-iso8859-1 isvl.afm
++Souvenir Souvenir-LightItalic -*- \-itc-souvenir-light-i-normal--#-0-0-0-p-0-iso8859-1 isvli.afm
++ Souvenir-Demi *-- \-itc-souvenir-demi-r-normal--#-0-0-0-p-0-iso8859-1 isvd.afm
++ Souvenir-DemiItalic **- \-itc-souvenir-demi-i-normal--#-0-0-0-p-0-iso8859-1 isvdi.afm
++.fi
++.PP
++.SH FILES
++.I /etc/t1lib/FontDataBase
++.SH "SEE ALSO"
++.BR mkfontdir (1x)
+
--- t1lib-5.1.2.orig/debian/man/t1libconfig.8
+++ t1lib-5.1.2/debian/man/t1libconfig.8
@@ -1748,83 +2070,40 @@
+This manual page was written by David Huggins-Daines
+<dhd@debian.org>, for the Debian GNU/Linux system (but may
+be used by others).
---- t1lib-5.1.2.orig/debian/man/FontDatabase.5
-+++ t1lib-5.1.2/debian/man/FontDatabase.5
-@@ -0,0 +1,77 @@
-+.TH FONTDATABASE 5
+--- t1lib-5.1.2.orig/debian/man/type1afm.1
++++ t1lib-5.1.2/debian/man/type1afm.1
+@@ -0,0 +1,34 @@
++.TH TYPE1AFM 1
+.SH NAME
-+FontDataBase \- database of fonts accessible to t1lib.
++.B type1afm
++\- create a font metrics file from a Type 1 font file
++.SH SYNOPSIS
++.B type1afm
++[
++.BR \-l
++]
++.B fontfile
++[
++.B fontfile...
++]
+.SH DESCRIPTION
-+This manual page has been written for the Debian GNU/Linux
-+distribution. It has been adapted from the documentation included in
-+the upstream
-+.B t1lib
-+distribution.
-+.PP
-+.B /etc/t1lib/FontDataBase
-+is a text file which contains, minimally, the basenames of Type 1 font
-+files to be made accessible to the
-+.B t1lib
-+font rasterizer library. The format is intentionally similar to that
-+of the
-+.B fonts.dir
-+and
-+.B fonts.scale
-+files used by X11.
-+.PP
-+Line 1 of this file contains a positive integer specifying the number
-+of fonts declared in that file. This is as in the
-+.B fonts.dir
-+files of the X11 system.
-+.PP
-+All remaining lines contain declarations of one font each. The only
-+thing taken from such a line is the last string (delimited by white
-+space) in it. It is assumed to be a filename of the format
-+\fIbasename\fR.\fIsomeextension\fR.
-+.PP
-+The \fIbasename\fR part is assumed to be the
-+.BR basename (1)
-+of a fontfile. After the a string has been parsed, the
-+.I extension
-+is cut off and replaced in turn with
-+.I .pfa
-+and
-+.I .pfb.
-+The initialization routine tries to open a font file in
-+its search path with one of the resulting filenames.
-+.PP
-+The remainder of the line, i.e., from beginning to the start of the
-+filename string, is completely ignored and thus may contain
-+information for other programs.
-+.SH EXAMPLES
-+Here is a minimal font database file for 4 fonts:
-+.sp
-+.nf
-+4
-+isvl.afm
-+isvli.afm
-+isvd.afm
-+isvdi.afm
-+.fi
-+.PP
-+This file is \fIminimal\fR, because it contains just the information
-+needed, and nothing not needed by the library.
++This manual page was written for the Debian GNU/Linux distribution
++because the original program does not have a manual page.
+.PP
-+Here is a more realistic example, which allows an application to match
-+a fully qualified X11 fontname to a FontID in
-+.B t1lib.
-+This is also a valid font database file:
-+.sp
-+.nf
-+4
-+Souvenir Souvenir-Light --- \-itc-souvenir-light-r-normal--#-0-0-0-p-0-iso8859-1 isvl.afm
-+Souvenir Souvenir-LightItalic -*- \-itc-souvenir-light-i-normal--#-0-0-0-p-0-iso8859-1 isvli.afm
-+ Souvenir-Demi *-- \-itc-souvenir-demi-r-normal--#-0-0-0-p-0-iso8859-1 isvd.afm
-+ Souvenir-DemiItalic **- \-itc-souvenir-demi-i-normal--#-0-0-0-p-0-iso8859-1 isvdi.afm
-+.fi
++.B type1afm
++reads in Type 1 font files specified on the command line, rasterizes
++them to 1000bp, and writes AFM (font metrics) files based on the
++observed metrics information.
+.PP
-+.SH FILES
-+.I /etc/t1lib/FontDataBase
-+.SH "SEE ALSO"
-+.BR mkfontdir (1x)
++The AFM file is created in the same directory as the font file, so be
++sure that you have write access there before running this program.
++.SH OPTIONS
++.TP
++.BR \-l
++Write a log file
++.SH SEE ALSO
++.BR getafm (1)
++.SH AUTHOR
++This manual page was David Huggins-Daines <dhd@debian.org>
++for the Debian GNU/Linux distribution (but may be used by others)
+