xfonts-utils: Changes to 'debian-unstable'

2016-11-22 Thread Emilio Pozuelo Monfort 
 debian/changelog |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit b9ec8a1d1f4494202224974eed7070fe33dc7f4a
Author: Emilio Pozuelo Monfort 
Date:   Wed Nov 23 00:09:28 2016 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index a21e921..f9a5221 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xfonts-utils (1:7.7+4) UNRELEASED; urgency=medium
+xfonts-utils (1:7.7+4) unstable; urgency=medium
 
   [ Julien Cristau ]
   * Update Vcs-* control fields to https.
@@ -7,7 +7,10 @@ xfonts-utils (1:7.7+4) UNRELEASED; urgency=medium
   [ Andreas Boll ]
   * Replace build-dep libxfont-dev with libxfont1-dev.
 
- -- Julien Cristau   Sun, 21 Aug 2016 18:52:52 +0200
+  [ Emilio Pozuelo Monfort ]
+  * Upload to unstable.
+
+ -- Emilio Pozuelo Monfort   Wed, 23 Nov 2016 00:09:26 +0100
 
 xfonts-utils (1:7.7+3) unstable; urgency=medium

xfonts-utils: Changes to 'debian-unstable'

2016-11-17 Thread Andreas Boll 
 debian/changelog |4 
 debian/control   |2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 528c491443f7fafb78c9599639f692238c3ffea0
Author: Andreas Boll 
Date:   Thu Nov 17 14:13:16 2016 +0100

Replace build-dep libxfont-dev with libxfont1-dev.

diff --git a/debian/changelog b/debian/changelog
index be68967..a21e921 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 xfonts-utils (1:7.7+4) UNRELEASED; urgency=medium
 
+  [ Julien Cristau ]
   * Update Vcs-* control fields to https.
   * Switch www.gnu.org and xorg.freedesktop.org URLs in packaging to https.
 
+  [ Andreas Boll ]
+  * Replace build-dep libxfont-dev with libxfont1-dev.
+
  -- Julien Cristau   Sun, 21 Aug 2016 18:52:52 +0200
 
 xfonts-utils (1:7.7+3) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 07ecd96..28285db 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
  pkg-config,
  quilt,
  autotools-dev,
- libxfont-dev (>= 1:1.0.0),
+ libxfont1-dev (>= 1:1.0.0),
  libx11-dev (>= 2:1.0.0),
  x11proto-core-dev (>= 7.0.25),
  libfreetype6-dev,

xfonts-utils: Changes to 'debian-unstable'

2016-08-21 Thread Julien Cristau 
 debian/changelog  |7 +++
 debian/control|4 ++--
 debian/copyright  |4 ++--
 debian/local/update-fonts-alias   |2 +-
 debian/local/update-fonts-alias.8 |2 +-
 debian/local/update-fonts-dir |2 +-
 debian/local/update-fonts-dir.8   |2 +-
 debian/local/update-fonts-scale   |2 +-
 debian/local/update-fonts-scale.8 |2 +-
 debian/watch.bdftopcf |2 +-
 debian/watch.font-util|2 +-
 debian/watch.fonttosfnt   |2 +-
 debian/watch.mkfontdir|2 +-
 debian/watch.mkfontscale  |2 +-
 14 files changed, 22 insertions(+), 15 deletions(-)

New commits:
commit b2392861ea3c5f00f2c02561818d1fbd345df571
Author: Julien Cristau 
Date:   Sun Aug 21 18:55:23 2016 +0200

Switch www.gnu.org and xorg.freedesktop.org URLs in packaging to https.

diff --git a/debian/changelog b/debian/changelog
index 628a6d2..be68967 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xfonts-utils (1:7.7+4) UNRELEASED; urgency=medium
 
   * Update Vcs-* control fields to https.
+  * Switch www.gnu.org and xorg.freedesktop.org URLs in packaging to https.
 
  -- Julien Cristau   Sun, 21 Aug 2016 18:52:52 +0200
 
diff --git a/debian/copyright b/debian/copyright
index d53a74e..84d108d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 Packaged by: David Nusinow  and others.
 Source:
- http://xorg.freedesktop.org/releases/individual/font/
- http://xorg.freedesktop.org/releases/individual/app/
+ https://xorg.freedesktop.org/releases/individual/font/
+ https://xorg.freedesktop.org/releases/individual/app/
 
 bdftopcf:
   Copyright 1991, 1993, 1998  The Open Group
diff --git a/debian/local/update-fonts-alias b/debian/local/update-fonts-alias
index a344542..6d02fd5 100644
--- a/debian/local/update-fonts-alias
+++ b/debian/local/update-fonts-alias
@@ -8,7 +8,7 @@
 # Copyright 1999, 2001, 2002, 2004 Branden Robinson.
 # Copyright 2006 Steve Langasek.
 # Licensed under the GNU General Public License, version 2.  See the file
-# /usr/share/common-licenses/GPL or .
+# /usr/share/common-licenses/GPL or .
 
 PROGNAME=${0##*/}
 
diff --git a/debian/local/update-fonts-alias.8 
b/debian/local/update-fonts-alias.8
index 1425a6a..1bb6ab0 100644
--- a/debian/local/update-fonts-alias.8
+++ b/debian/local/update-fonts-alias.8
@@ -158,7 +158,7 @@ experienced a fatal error; see the section on diagnostic 
messages above.
 was invoked with invalid arguments.
 .SH BUGS
 See
-.URL "http://bugs.debian.org/xfonts\-utils"; "the Debian Bug Tracking System" .
+.URL "https://bugs.debian.org/xfonts\-utils"; "the Debian Bug Tracking System" .
 If you wish to report a bug in
 .BR update\-fonts\-alias ,
 please see
diff --git a/debian/local/update-fonts-dir b/debian/local/update-fonts-dir
index 5a327e7..b2d13b2 100644
--- a/debian/local/update-fonts-dir
+++ b/debian/local/update-fonts-dir
@@ -7,7 +7,7 @@
 
 # Copyright 1999, 2001, 2002, 2004 Branden Robinson.
 # Licensed under the GNU General Public License, version 2.  See the file
-# /usr/share/common-licenses/GPL or .
+# /usr/share/common-licenses/GPL or .
 
 PROGNAME=${0##*/}
 ENCDIR=/usr/share/fonts/X11/encodings
diff --git a/debian/local/update-fonts-dir.8 b/debian/local/update-fonts-dir.8
index 277eaf5..3eb6982 100644
--- a/debian/local/update-fonts-dir.8
+++ b/debian/local/update-fonts-dir.8
@@ -160,7 +160,7 @@ experienced a fatal error; see the section on diagnostic 
messages above.
 was invoked with invalid arguments.
 .SH BUGS
 See
-.URL "http://bugs.debian.org/xfonts\-utils"; "the Debian Bug Tracking System" .
+.URL "https://bugs.debian.org/xfonts\-utils"; "the Debian Bug Tracking System" .
 If you wish to report a bug in
 .BR update\-fonts\-dir ,
 please see
diff --git a/debian/local/update-fonts-scale b/debian/local/update-fonts-scale
index 163d550..7055874 100644
--- a/debian/local/update-fonts-scale
+++ b/debian/local/update-fonts-scale
@@ -8,7 +8,7 @@
 # Copyright 1999-2002, 2004 Branden Robinson.
 # Copyright 2006 Steve Langasek.
 # Licensed under the GNU General Public License, version 2.  See the file
-# /usr/share/common-licenses/GPL or .
+# /usr/share/common-licenses/GPL or .
 
 PROGNAME=${0##*/}
 
diff --git a/debian/local/update-fonts-scale.8 
b/debian/local/update-fonts-scale.8
index 067451a..9169d30 100644
--- a/debian/local/update-fonts-scale.8
+++ b/debian/local/update-fonts-scale.8
@@ -182,7 +182,7 @@ experienced a fatal error; see the section on diagnostic 
messages above.
 was invoked with invalid arguments.
 .SH BUGS
 See
-.URL "http://bugs.debian.org/xfonts\-utils"; "the Debian Bug Tracking System" .
+.URL "https://bugs.debian.org/xfonts\-utils"; "the Debian Bug Tracking System" .
 If yo

xfonts-utils: Changes to 'debian-unstable'

2014-07-12 Thread Julien Cristau 
 debian/changelog |5 +++--
 debian/rules |2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 386474ce7b2c59db6225225ed6c02cf342242e6f
Author: Julien Cristau 
Date:   Sat Jul 12 19:50:05 2014 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index a14047c..a444e75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xfonts-utils (1:7.7+2) UNRELEASED; urgency=medium
+xfonts-utils (1:7.7+2) unstable; urgency=medium
 
   * Delete no-longer-used debian/xsfbs/
   * Restore quilt usage (no-op now, we don't have any patches).
   * Remove Cyril from Uploaders.
   * Allow parallel builds.
 
- -- Julien Cristau   Wed, 25 Dec 2013 18:20:16 +0100
+ -- Julien Cristau   Sat, 12 Jul 2014 19:38:52 +0200
 
 xfonts-utils (1:7.7+1) unstable; urgency=medium
 

commit 85fb9d1d0ed8cbee182a1555046791f8c99fa3bf
Author: Julien Cristau 
Date:   Wed Dec 25 18:34:31 2013 +0100

Allow parallel builds.

diff --git a/debian/changelog b/debian/changelog
index 6212cba..a14047c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xfonts-utils (1:7.7+2) UNRELEASED; urgency=medium
   * Delete no-longer-used debian/xsfbs/
   * Restore quilt usage (no-op now, we don't have any patches).
   * Remove Cyril from Uploaders.
+  * Allow parallel builds.
 
  -- Julien Cristau   Wed, 25 Dec 2013 18:20:16 +0100
 
diff --git a/debian/rules b/debian/rules
index 6640ae7..37a0d65 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@
 SUBDIRS = bdftopcf mkfontdir mkfontscale font-util fonttosfnt
 
 %:
-   dh $@ --with autotools-dev,quilt
+   dh $@ --with autotools-dev,quilt --parallel
 
 STAMP_DIR = stampdir
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1x61rx-0004xl...@moszumanska.debian.org

xfonts-utils: Changes to 'debian-unstable'

2013-12-25 Thread Julien Cristau 
 debian/changelog |2 ++
 debian/control   |1 -
 debian/rules |2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 3d53d30534298c3d397c94a902666858ac1e6d40
Author: Julien Cristau 
Date:   Wed Dec 25 18:31:16 2013 +0100

Remove Cyril from Uploaders.

diff --git a/debian/changelog b/debian/changelog
index 2421d96..6212cba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xfonts-utils (1:7.7+2) UNRELEASED; urgency=medium
 
   * Delete no-longer-used debian/xsfbs/
   * Restore quilt usage (no-op now, we don't have any patches).
+  * Remove Cyril from Uploaders.
 
  -- Julien Cristau   Wed, 25 Dec 2013 18:20:16 +0100
 
diff --git a/debian/control b/debian/control
index 9c1b5fc..50b8d60 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,6 @@ Source: xfonts-utils
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
-Uploaders: Cyril Brulebois 
 Build-Depends:
  debhelper (>= 7),
  pkg-config,

commit 68038343ed4864ac950010493b58ad2df6775bdc
Author: Julien Cristau 
Date:   Wed Dec 25 18:23:10 2013 +0100

Restore quilt usage (no-op now, we don't have any patches).

diff --git a/debian/changelog b/debian/changelog
index 3d79eca..2421d96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xfonts-utils (1:7.7+2) UNRELEASED; urgency=medium
 
   * Delete no-longer-used debian/xsfbs/
+  * Restore quilt usage (no-op now, we don't have any patches).
 
  -- Julien Cristau   Wed, 25 Dec 2013 18:20:16 +0100
 
diff --git a/debian/rules b/debian/rules
index 39707e7..6640ae7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@
 SUBDIRS = bdftopcf mkfontdir mkfontscale font-util fonttosfnt
 
 %:
-   dh $@ --with autotools-dev
+   dh $@ --with autotools-dev,quilt
 
 STAMP_DIR = stampdir
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1vvsik-0005wn...@moszumanska.debian.org

xfonts-utils: Changes to 'debian-unstable'

2013-12-25 Thread Julien Cristau 
 debian/README.source   |   73 -
 debian/changelog   |6 
 debian/xsfbs/repack.sh |   32 --
 debian/xsfbs/xsfbs.mk  |  285 --
 debian/xsfbs/xsfbs.sh  |  622 -
 5 files changed, 6 insertions(+), 1012 deletions(-)

New commits:
commit 0c2770caaf7291992ab765247de6752eb092515d
Author: Julien Cristau 
Date:   Wed Dec 25 18:20:18 2013 +0100

Delete no-longer-used debian/xsfbs/

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index b09a1ab..000
--- a/debian/README.source
+++ /dev/null
@@ -1,73 +0,0 @@
---
-Quick Guide To Patching This Package For The Impatient
---
-
-1. Make sure you have quilt installed
-2. Unpack the package as usual with "dpkg-source -x"
-3. Run the "patch" target in debian/rules
-4. Create a new patch with "quilt new" (see quilt(1))
-5. Edit all the files you want to include in the patch with "quilt edit" 
-   (see quilt(1)).
-6. Write the patch with "quilt refresh" (see quilt(1))
-7. Run the "clean" target in debian/rules
-
-Alternatively, instead of using quilt directly, you can drop the patch in to 
-debian/patches and add the name of the patch to debian/patches/series.
-
-
-Guide To The X Strike Force Packages
-
-
-The X Strike Force team maintains X packages in git repositories on
-git.debian.org in the pkg-xorg subdirectory. Most upstream packages
-are actually maintained in git repositories as well, so they often
-just need to be pulled into git.debian.org in a "upstream-*" branch.
-Otherwise, the upstream sources are manually installed in the Debian
-git repository.
-
-The .orig.tar.gz upstream source file could be generated using this
-"upstream-*" branch in the Debian git repository but it is actually
-copied from upstream tarballs directly.
-
-Due to X.org being highly modular, packaging all X.org applications
-as their own independent packages would have created too many Debian
-packages. For this reason, some X.org applications have been grouped
-into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils,
-x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils.
-Most packages, including the X.org server itself and all libraries
-and drivers are, however maintained independently.
-
-The Debian packaging is added by creating the "debian-*" git branch
-which contains the aforementioned "upstream-*" branch plus the debian/
-repository files.
-When a patch has to be applied to the Debian package, two solutions
-are involved:
-* If the patch is available in one of the upstream branches, it
-  may be git'cherry-picked into the Debian repository. In this
-  case, it appears directly in the .diff.gz.
-* Otherwise, the patch is added to debian/patches/ which is managed
-  with quilt as documented in /usr/share/doc/quilt/README.source.
-
-quilt is actually invoked by the Debian X packaging through a larger
-set of scripts called XSFBS. XSFBS brings some other X specific
-features such as managing dependencies and conflicts due to the video
-and input driver ABIs.
-XSFBS itself is maintained in a separate repository at
-  git://git.debian.org/pkg-xorg/xsfbs.git
-and it is pulled inside the other Debian X repositories when needed.
-
-The XSFBS patching system requires a build dependency on quilt. Also
-a dependency on $(STAMP_DIR)/patch has to be added to debian/rules
-so that the XSFBS patching occurs before the actual build. So the
-very first target of the build (likely the one running autoreconf)
-should depend on $(STAMP_DIR)/patch. It should also not depend on
-anything so that parallel builds are correctly supported (nothing
-should probably run while patching is being done). And finally, the
-clean target should depend on the xsfclean target so that patches
-are unapplied on clean.
-
-When the upstream sources contain some DFSG-nonfree files, they are
-listed in text files in debian/prune/ in the "debian-*" branch of
-the Debian repository. XSFBS' scripts then take care of removing
-these listed files during the build so as to generate a modified
-DFSG-free .orig.tar.gz tarball.
diff --git a/debian/changelog b/debian/changelog
index a2a2b88..3d79eca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xfonts-utils (1:7.7+2) UNRELEASED; urgency=medium
+
+  * Delete no-longer-used debian/xsfbs/
+
+ -- Julien Cristau   Wed, 25 Dec 2013 18:20:16 +0100
+
 xfonts-utils (1:7.7+1) unstable; urgency=medium
 
   * bdftopcf 1.0.4
diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh
deleted file mode 100755
index 5935cc9..000
--- a/debian/xsfbs/repack.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if ! [ -d debian/prune ]; then
-   exit 0
-fi
-
-if [ "x$1" != x--upstream-version ]; then
-   exit 1
-fi
-
-version="$2"
-filename="$3"
-
-if [ -z

xfonts-utils: Changes to 'debian-unstable'

2013-12-25 Thread Julien Cristau 
 bdftopcf/ChangeLog  |   96 
 bdftopcf/Makefile.am|   15 
 bdftopcf/Makefile.in|  354 +-
 bdftopcf/aclocal.m4 | 1149 +--
 bdftopcf/bdftopcf.c |  276 -
 bdftopcf/bdftopcf.man   |  112 
 bdftopcf/config.guess   |  233 -
 bdftopcf/config.sub |  134 
 bdftopcf/configure  | 6063 +++-
 bdftopcf/configure.ac   |   10 
 bdftopcf/depcomp|   74 
 bdftopcf/install-sh |   29 
 bdftopcf/man/Makefile.am|   12 
 bdftopcf/man/Makefile.in|  425 ++
 bdftopcf/man/bdftopcf.man   |  115 
 debian/changelog|   11 
 debian/compat   |2 
 debian/control  |3 
 debian/rules|  114 
 debian/xfonts-utils.postinst|   17 
 debian/xfonts-utils.postinst.in |   22 
 debian/xfonts-utils.postrm  |   17 
 debian/xfonts-utils.postrm.in   |   22 
 mkfontscale/ChangeLog   |   80 
 mkfontscale/Makefile.in |  439 +-
 mkfontscale/aclocal.m4  |  997 --
 mkfontscale/compile |  347 ++
 mkfontscale/config.guess|  407 +-
 mkfontscale/config.h.in |   32 
 mkfontscale/config.sub  |  237 -
 mkfontscale/configure   | 4194 ---
 mkfontscale/configure.ac|3 
 mkfontscale/depcomp |  531 ++-
 mkfontscale/hash.c  |   31 
 mkfontscale/ident.c |5 
 mkfontscale/install-sh  |   35 
 mkfontscale/man/Makefile.in |  131 
 mkfontscale/man/mkfontscale.man |6 
 mkfontscale/missing |  461 ---
 mkfontscale/mkfontscale.c   |   33 
 40 files changed, 13079 insertions(+), 4195 deletions(-)

New commits:
commit 8d3ccfa291c86c1b6f66519b3e7f93cd92d4f575
Author: Julien Cristau 
Date:   Wed Dec 25 17:43:39 2013 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index aa0229d..a2a2b88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xfonts-utils (1:7.7~2) UNRELEASED; urgency=medium
+xfonts-utils (1:7.7+1) unstable; urgency=medium
 
   * bdftopcf 1.0.4
   * mkfontscale 1.1.1
@@ -7,7 +7,7 @@ xfonts-utils (1:7.7~2) UNRELEASED; urgency=medium
 config.{guess,sub} (closes: #717842).
   * Disable silent build rules.
 
- -- Julien Cristau   Wed, 25 Dec 2013 16:30:20 +0100
+ -- Julien Cristau   Wed, 25 Dec 2013 17:43:35 +0100
 
 xfonts-utils (1:7.7~1) unstable; urgency=low
 

commit 2ad56becd7a9ec1bf8f550457fbba4ed884539f1
Author: Julien Cristau 
Date:   Wed Dec 25 16:57:29 2013 +0100

Disable silent build rules.

diff --git a/debian/changelog b/debian/changelog
index 498e125..aa0229d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xfonts-utils (1:7.7~2) UNRELEASED; urgency=medium
   * Bump debhelper compat level to 7.
   * Switch to dh with the autotools-dev addon; should give us updated
 config.{guess,sub} (closes: #717842).
+  * Disable silent build rules.
 
  -- Julien Cristau   Wed, 25 Dec 2013 16:30:20 +0100
 
diff --git a/debian/rules b/debian/rules
index dc9bfc4..39707e7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,6 +26,7 @@ override_dh_auto_build: $(BUILD_STAMPS)
 $(STAMP_DIR)/configure-%:
mkdir -p $(STAMP_DIR)
dh_auto_configure -D$* -B$*-build -- \
+   --disable-silent-rules \
--with-mapdir=\$${prefix}/share/fonts/X11/util
>$@
 

commit 8c77d11c06e1d18a04f1a921543dd6e1575b6de8
Author: Julien Cristau 
Date:   Wed Dec 25 16:49:10 2013 +0100

Switch to dh with the autotools-dev addon

Should give us updated config.{guess,sub} (closes: #717842).

diff --git a/debian/changelog b/debian/changelog
index be1ba3d..498e125 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ xfonts-utils (1:7.7~2) UNRELEASED; urgency=medium
   * bdftopcf 1.0.4
   * mkfontscale 1.1.1
   * Bump debhelper compat level to 7.
+  * Switch to dh with the autotools-dev addon; should give us updated
+config.{guess,sub} (closes: #717842).
 
  -- Julien Cristau   Wed, 25 Dec 2013 16:30:20 +0100
 
diff --git a/debian/control b/debian/control
index 51602fc..9c1b5fc 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Build-Depends:
  debhelper (>= 7),
  pkg-config,
  quilt,
+ autotools-dev,
  libxfont-dev (>= 1:1.0.0),
  libx11-dev (>= 2:1.0.0),
  x11proto-core-dev,
diff --git a/debian/rules b/debian/rules
index 55d..dc9bfc4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,101 +7,52 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# set this to the name of the main shlib's binary package
-PACKAGE = xfonts-utils
-
-include debian/xsfbs/xsfbs.mk
-
 # This package contains multiple modules as shipped by upstream. Each module 
is # contained in a subdirectory in the root dir of the package. You must list 
each
 # subdirectory explicitly so that the build system knows

xfonts-utils: Changes to 'debian-unstable'

2012-05-05 Thread Julien Cristau 
 debian/changelog|6 --
 debian/control  |1 +
 debian/xfonts-utils.install |2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 2a5477c8a52e1cc0f7f225c14a8796aaf6efac3d
Author: Julien Cristau 
Date:   Sun May 6 00:01:43 2012 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 76a5705..cf6349c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xfonts-utils (1:7.7~1) UNRELEASED; urgency=low
+xfonts-utils (1:7.7~1) unstable; urgency=low
 
   * font-util 1.3.0
   * mkfontdir 1.0.7
@@ -7,7 +7,7 @@ xfonts-utils (1:7.7~1) UNRELEASED; urgency=low
   * Move fontutil.pc to /usr/share/pkgconfig.
   * Mark xfonts-utils Multi-arch: foreign.
 
- -- Julien Cristau   Sat, 05 May 2012 23:25:02 +0200
+ -- Julien Cristau   Sun, 06 May 2012 00:01:33 +0200
 
 xfonts-utils (1:7.6+1) unstable; urgency=low
 

commit 2717c2f5592ef4153488fba33c621de59c890f4b
Author: Julien Cristau 
Date:   Sun May 6 00:01:17 2012 +0200

Mark xfonts-utils Multi-arch: foreign.

diff --git a/debian/changelog b/debian/changelog
index cccb9fd..76a5705 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xfonts-utils (1:7.7~1) UNRELEASED; urgency=low
   * mkfontscale 1.1.0
   * Drop dh_testroot from debian/rules clean.
   * Move fontutil.pc to /usr/share/pkgconfig.
+  * Mark xfonts-utils Multi-arch: foreign.
 
  -- Julien Cristau   Sat, 05 May 2012 23:25:02 +0200
 
diff --git a/debian/control b/debian/control
index de91996..36e3734 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,7 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/font/xfonts-utils.git
 
 Package: xfonts-utils
 Architecture: any
+Multi-Arch: foreign
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},

commit 7c35d6c326a97080e1edf8a23c9e460ab3b69f2d
Author: Julien Cristau 
Date:   Sat May 5 23:55:40 2012 +0200

Move fontutil.pc to /usr/share/pkgconfig.

diff --git a/debian/changelog b/debian/changelog
index 02f487d..cccb9fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xfonts-utils (1:7.7~1) UNRELEASED; urgency=low
   * mkfontdir 1.0.7
   * mkfontscale 1.1.0
   * Drop dh_testroot from debian/rules clean.
+  * Move fontutil.pc to /usr/share/pkgconfig.
 
  -- Julien Cristau   Sat, 05 May 2012 23:25:02 +0200
 
diff --git a/debian/xfonts-utils.install b/debian/xfonts-utils.install
index b57306b..296ec0c 100644
--- a/debian/xfonts-utils.install
+++ b/debian/xfonts-utils.install
@@ -9,7 +9,7 @@ usr/share/man/man1/mkfontdir.1
 usr/share/man/man1/mkfontscale.1
 usr/share/man/man1/ucs2any.1
 usr/share/aclocal/fontutil.m4
-usr/lib/pkgconfig/fontutil.pc
+usr/lib/pkgconfig/fontutil.pc usr/share/pkgconfig/
 ../local/update-fonts-alias usr/sbin
 ../local/update-fonts-dir usr/sbin
 ../local/update-fonts-scale usr/sbin


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1sqn5s-0006dm...@vasks.debian.org

xfonts-utils: Changes to 'debian-unstable'

2012-05-05 Thread Julien Cristau 
 debian/changelog|9 
 debian/rules|3 
 font-util/ChangeLog |  123 
 font-util/Makefile.in   |2 
 font-util/aclocal.m4| 1074 +--
 font-util/bdftruncate.c |   30 
 font-util/bdftruncate.man   |   32 
 font-util/configure | 6092 +++-
 font-util/configure.ac  |   16 
 font-util/fontutil.m4   |  324 --
 font-util/fontutil.m4.in|   34 
 font-util/man/Makefile.in   |2 
 font-util/ucs2any.c |9 
 font-util/ucs2any.man   |   74 
 mkfontdir/ChangeLog |   83 
 mkfontdir/Makefile.am   |   27 
 mkfontdir/Makefile.in   |  339 +-
 mkfontdir/aclocal.m4|  972 +--
 mkfontdir/configure | 5639 +++-
 mkfontdir/configure.ac  |9 
 mkfontdir/man/Makefile.am   |   12 
 mkfontdir/man/Makefile.in   |  411 ++
 mkfontdir/man/mkfontdir.man |  175 +
 mkfontdir/mkfontdir.cpp |3 
 mkfontdir/mkfontdir.in  |5 
 mkfontdir/mkfontdir.man |  175 -
 mkfontscale/ChangeLog   |   83 
 mkfontscale/Makefile.am |6 
 mkfontscale/Makefile.in |7 
 mkfontscale/aclocal.m4  |  610 ++--
 mkfontscale/configure   | 5404 ++-
 mkfontscale/configure.ac|   12 
 mkfontscale/data.h  |9 
 mkfontscale/hash.c  |8 
 mkfontscale/hash.h  |2 
 mkfontscale/ident.c |   10 
 mkfontscale/list.c  |   12 
 mkfontscale/list.h  |8 
 mkfontscale/man/Makefile.in |1 
 mkfontscale/mkfontscale.c   |  100 
 40 files changed, 19619 insertions(+), 2327 deletions(-)

New commits:
commit 634f682fed17d4eab6d4879b3c09cbb1c6fb88df
Author: Julien Cristau 
Date:   Sat May 5 23:48:51 2012 +0200

Drop dh_testroot from debian/rules clean.

diff --git a/debian/changelog b/debian/changelog
index d31e816..02f487d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xfonts-utils (1:7.7~1) UNRELEASED; urgency=low
   * font-util 1.3.0
   * mkfontdir 1.0.7
   * mkfontscale 1.1.0
+  * Drop dh_testroot from debian/rules clean.
 
  -- Julien Cristau   Sat, 05 May 2012 23:25:02 +0200
 
diff --git a/debian/rules b/debian/rules
index 8f9ef68..55d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,15 +55,12 @@ $(STAMP_DIR)/build-%: $(STAMP_DIR)/patch
 
 clean: xsfclean
dh_testdir
-   dh_testroot
rm -f build-stamp
-
rm -f config.cache config.log config.status
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
rm -rf *-build
-
dh_clean
 
 install: build

commit 540095e11dafb2322b47e8c818d12df81a873421
Author: Julien Cristau 
Date:   Sat May 5 23:33:44 2012 +0200

mkfontscale 1.1.0

diff --git a/debian/changelog b/debian/changelog
index 3c06b2e..d31e816 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xfonts-utils (1:7.7~1) UNRELEASED; urgency=low
 
   * font-util 1.3.0
   * mkfontdir 1.0.7
+  * mkfontscale 1.1.0
 
  -- Julien Cristau   Sat, 05 May 2012 23:25:02 +0200
 
diff --git a/mkfontscale/ChangeLog b/mkfontscale/ChangeLog
index bcf2923..9f64a23 100644
--- a/mkfontscale/ChangeLog
+++ b/mkfontscale/ChangeLog
@@ -1,3 +1,86 @@
+commit 4c3f72f9e3385d9c855416b6498ced067a97c712
+Author: Alan Coopersmith 
+Date:   Fri Feb 10 20:19:37 2012 -0800
+
+mkfontscale 1.1.0
+
+Signed-off-by: Alan Coopersmith 
+
+commit bf7d4fd83c896b70f68d59de756a3847417d9add
+Author: Maxim Iorsh 
+Date:   Thu Oct 20 08:08:47 2011 +0200
+
+mkfontscale: fix Culmus entries to precede URW
+
+Culmus must precede URW and Bitstream in notice list, since its fonts are
+based on URW/Bitstream sometimes.
+
+Signed-off-by: Maxim Iorsh 
+Signed-off-by: Alan Coopersmith 
+
+commit cd8182e74636ffd9b140603fc61502b42a9d6f2b
+Author: Maxim Iorsh 
+Date:   Tue Oct 18 22:07:45 2011 -0700
+
+Add Culmus foundry to the vendor list for TrueType & Type1 fonts
+
+Maps fonts produced by the Culmus project 
+to the XLFD foundry name "culmus"
+
+For TrueType fonts, maps the vendor code "CLM" from the TrueType vendor
+id field.
+
+For Type1 fonts, which use heuristics to guess mappings to XLFD foundries
+from words in the copyright notice, add the names of the main contributors
+to the Culmus product to recognize the fonts under their copyright.
+
+Signed-off-by: Maxim Iorsh 
+Reviewed-by: Alan Coopersmith 
+Signed-off-by: Alan Coopersmith 
+
+commit a39deac00add15532b15827c80601f87738cb405
+Author: Alan Coopersmith 
+Date:   Tue Oct 4 21:03:13 2011 -0700
+
+Strip trailing whitespace
+
+Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
+git diff -w & git diff -b show no diffs from this change
+
+Signed-off-by: Alan Coopersmith 
+
+commit b2d0f04

xfonts-utils: Changes to 'debian-unstable'

2011-06-30 Thread Cyril Brulebois 
 debian/changelog|   10 
 debian/control  |   13 -
 mkfontscale/ChangeLog   |  143 +
 mkfontscale/Makefile.am |   15 -
 mkfontscale/Makefile.in |  293 ++-
 mkfontscale/aclocal.m4  |  424 
 mkfontscale/configure   |  112 ++
 mkfontscale/configure.ac|   14 -
 mkfontscale/list.c  |   44 +++-
 mkfontscale/list.h  |9 
 mkfontscale/man/Makefile.am |   12 +
 mkfontscale/man/Makefile.in |  417 +++
 mkfontscale/man/mkfontscale.man |  156 ++
 mkfontscale/mkfontscale.c   |   27 +-
 mkfontscale/mkfontscale.man |  156 --
 15 files changed, 1461 insertions(+), 384 deletions(-)

New commits:
commit efb5b05b635a8a34ea8a564116d11875591e20de
Author: Cyril Brulebois 
Date:   Thu Jun 30 14:09:13 2011 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index baba412..f3a3ddf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xfonts-utils (1:7.6+1) UNRELEASED; urgency=low
+xfonts-utils (1:7.6+1) unstable; urgency=low
 
   * mkfontscale 1.0.9
   * Update Uploaders list. Thanks, David & Brice!
@@ -6,7 +6,7 @@ xfonts-utils (1:7.6+1) UNRELEASED; urgency=low
   * Remove long obsolete Replaces.
   * Bump Standards-Version to 3.9.2 (no changes).
 
- -- Cyril Brulebois   Thu, 30 Jun 2011 14:01:58 +0200
+ -- Cyril Brulebois   Thu, 30 Jun 2011 14:09:10 +0200
 
 xfonts-utils (1:7.6~1) unstable; urgency=low
 

commit 323a068434e2fbedc2e0f74498bdbbf68daf542a
Author: Cyril Brulebois 
Date:   Thu Jun 30 14:09:06 2011 +0200

Bump Standards-Version to 3.9.2 (no changes).

diff --git a/debian/changelog b/debian/changelog
index 5a43c75..baba412 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xfonts-utils (1:7.6+1) UNRELEASED; urgency=low
   * Update Uploaders list. Thanks, David & Brice!
   * Wrap Depends/Replaces.
   * Remove long obsolete Replaces.
+  * Bump Standards-Version to 3.9.2 (no changes).
 
  -- Cyril Brulebois   Thu, 30 Jun 2011 14:01:58 +0200
 
diff --git a/debian/control b/debian/control
index 0dbb164..de91996 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
  libfreetype6-dev,
  libfontenc-dev,
  xutils-dev (>= 1:7.5+4),
-Standards-Version: 3.8.3
+Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/pkg-xorg/font/xfonts-utils
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/font/xfonts-utils.git
 

commit d41d4329b74e844a289f957c84a45b6769929682
Author: Cyril Brulebois 
Date:   Thu Jun 30 14:08:37 2011 +0200

Remove long obsolete Replaces.

diff --git a/debian/changelog b/debian/changelog
index 3c5f01f..5a43c75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xfonts-utils (1:7.6+1) UNRELEASED; urgency=low
   * mkfontscale 1.0.9
   * Update Uploaders list. Thanks, David & Brice!
   * Wrap Depends/Replaces.
+  * Remove long obsolete Replaces.
 
  -- Cyril Brulebois   Thu, 30 Jun 2011 14:01:58 +0200
 
diff --git a/debian/control b/debian/control
index 15372ab..0dbb164 100644
--- a/debian/control
+++ b/debian/control
@@ -24,9 +24,6 @@ Depends:
  ${misc:Depends},
  x11-common,
  xfonts-encodings,
-Replaces:
- xutils (<< 1:1.0.1-1),
- fonttosfnt (<< 1.0.4),
 Description: X Window System font utility programs
  xfonts-utils provides a set of utility programs shipped with the X Window
  System that are needed for font management.

commit 599081fa1614612047514632b43fa7774afa2248
Author: Cyril Brulebois 
Date:   Thu Jun 30 14:06:47 2011 +0200

Kill trailing space.

diff --git a/debian/control b/debian/control
index 788d762..15372ab 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,7 @@ Replaces:
  xutils (<< 1:1.0.1-1),
  fonttosfnt (<< 1.0.4),
 Description: X Window System font utility programs
- xfonts-utils provides a set of utility programs shipped with the X Window 
+ xfonts-utils provides a set of utility programs shipped with the X Window
  System that are needed for font management.
  .
  The programs in this package include:

commit f61e58fe557ab61fd1e0ea9de944160658bc165d
Author: Cyril Brulebois 
Date:   Thu Jun 30 14:06:08 2011 +0200

Wrap Depends/Replaces.

diff --git a/debian/changelog b/debian/changelog
index 1fc92e0..3c5f01f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xfonts-utils (1:7.6+1) UNRELEASED; urgency=low
 
   * mkfontscale 1.0.9
   * Update Uploaders list. Thanks, David & Brice!
+  * Wrap Depends/Replaces.
 
  -- Cyril Brulebois   Thu, 30 Jun 2011 14:01:58 +0200
 
diff --git a/debian/control b/debian/control
index 16de616..788d762 100644
--- a/debian/control
+++ b/debian/control
@@ -19,8 +19,14 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/font/xfonts-utils.git
 
 Package: xfonts-utils
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, xfonts-en

xfonts-utils: Changes to 'debian-unstable'

2010-11-16 Thread Cyril Brulebois 
 debian/changelog |   10 --
 debian/control   |   13 +++--
 2 files changed, 19 insertions(+), 4 deletions(-)

New commits:
commit 8bb50692c269f7498ca67c869c6ac59f7ab6119e
Author: Cyril Brulebois 
Date:   Tue Nov 16 22:08:46 2010 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 84b587b..427e923 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xfonts-utils (1:7.6~1) UNRELEASED; urgency=low
+xfonts-utils (1:7.6~1) unstable; urgency=low
 
   [ Julien Cristau ]
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
@@ -16,7 +16,7 @@ xfonts-utils (1:7.6~1) UNRELEASED; urgency=low
   * Wrap build-deps.
   * Add xutils-dev build-dep for new macros.
 
- -- Julien Cristau   Sat, 16 Jan 2010 16:47:59 +
+ -- Cyril Brulebois   Tue, 16 Nov 2010 22:08:41 +0100
 
 xfonts-utils (1:7.5+2) unstable; urgency=low
 

commit c686e06e172f3ca5ce6e1c982456f018b4ba60c4
Author: Cyril Brulebois 
Date:   Tue Nov 16 22:00:42 2010 +0100

Add xutils-dev build-dep for new macros.

diff --git a/debian/changelog b/debian/changelog
index 0e90c48..84b587b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ xfonts-utils (1:7.6~1) UNRELEASED; urgency=low
   [ Cyril Brulebois ]
   * Add myself to Uploaders.
   * Wrap build-deps.
+  * Add xutils-dev build-dep for new macros.
 
  -- Julien Cristau   Sat, 16 Jan 2010 16:47:59 +
 
diff --git a/debian/control b/debian/control
index a460785..d415460 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Build-Depends:
  x11proto-core-dev,
  libfreetype6-dev,
  libfontenc-dev,
+ xutils-dev (>= 1:7.5+4),
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/font/xfonts-utils
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/font/xfonts-utils.git

commit f35ab2eeb9efe9f7882bc30bc420c9c7956161bb
Author: Cyril Brulebois 
Date:   Tue Nov 16 21:56:54 2010 +0100

Wrap build-deps.

diff --git a/debian/changelog b/debian/changelog
index 660bebc..0e90c48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ xfonts-utils (1:7.6~1) UNRELEASED; urgency=low
 
   [ Cyril Brulebois ]
   * Add myself to Uploaders.
+  * Wrap build-deps.
 
  -- Julien Cristau   Sat, 16 Jan 2010 16:47:59 +
 
diff --git a/debian/control b/debian/control
index 1350ee2..a460785 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,15 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
 Uploaders: David Nusinow , Brice Goglin 
, Cyril Brulebois 
-Build-Depends: debhelper (>= 6.0.7~), pkg-config, quilt, libxfont-dev (>= 
1:1.0.0), libx11-dev (>= 2:1.0.0), x11proto-core-dev, libfreetype6-dev, 
libfontenc-dev
+Build-Depends:
+ debhelper (>= 6.0.7~),
+ pkg-config,
+ quilt,
+ libxfont-dev (>= 1:1.0.0),
+ libx11-dev (>= 2:1.0.0),
+ x11proto-core-dev,
+ libfreetype6-dev,
+ libfontenc-dev,
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/font/xfonts-utils
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/font/xfonts-utils.git

commit 77bec0d281e01242d134f2ef50c27c543dc90a00
Author: Cyril Brulebois 
Date:   Tue Nov 16 21:51:37 2010 +0100

Add myself to Uploaders.

diff --git a/debian/changelog b/debian/changelog
index 8f4c05f..660bebc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 xfonts-utils (1:7.6~1) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
 good reason.  Thanks, Colin Watson!
   * Remove myself from Uploaders
@@ -10,6 +11,9 @@ xfonts-utils (1:7.6~1) UNRELEASED; urgency=low
 - mkfontscale 1.0.8
   * Update debian/copyright from upstream COPYING, drop DEP5 use.
 
+  [ Cyril Brulebois ]
+  * Add myself to Uploaders.
+
  -- Julien Cristau   Sat, 16 Jan 2010 16:47:59 +
 
 xfonts-utils (1:7.5+2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index cc9132c..1350ee2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xfonts-utils
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
-Uploaders: David Nusinow , Brice Goglin 

+Uploaders: David Nusinow , Brice Goglin 
, Cyril Brulebois 
 Build-Depends: debhelper (>= 6.0.7~), pkg-config, quilt, libxfont-dev (>= 
1:1.0.0), libx11-dev (>= 2:1.0.0), x11proto-core-dev, libfreetype6-dev, 
libfontenc-dev
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/font/xfonts-utils


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pisov-0003g3...@alioth.debian.org

xfonts-utils: Changes to 'debian-unstable'

2010-11-16 Thread Julien Cristau 
 debian/README.source  |2 +-
 debian/xsfbs/xsfbs.mk |   35 ++-
 2 files changed, 23 insertions(+), 14 deletions(-)

New commits:
commit 81fc271788605b52e85c2d11635a0371fb44605e
Author: Cyril Brulebois 
Date:   Sun May 2 02:14:45 2010 +0200

Add xorg-driver-{video,input} to Provides.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 77c4a39..3c59c20 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -261,8 +261,8 @@ INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 
2>/dev/null)
 # these two can be removed post-squeeze
 VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
 INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
-VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
-INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
+VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video
+INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input
 
 ifeq ($(PACKAGE),)
 PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)

commit b045afbd8277ad0c44e29d7c45802053c4335ccd
Author: Julien Cristau 
Date:   Fri Apr 16 22:14:46 2010 +0200

Update serverabi rule for xserver 1.7.6.901

Add new variables ${xviddriver:Depends} and ${xinpdriver:Depends} for
drivers.  The ${xserver:Depends} variable is deprecated.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 351fea5..77c4a39 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -253,25 +253,33 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
#debian/*.prerm
>$@
 
-SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
+# Compute dependencies for drivers
+#
+VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null)
+INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null)
+
+# these two can be removed post-squeeze
 VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
 INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
-SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS))
 VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
 INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
+
 ifeq ($(PACKAGE),)
 PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
 endif
 
 .PHONY: serverabi
 serverabi: install
-ifeq ($(SERVERMINVERS),)
-   @echo error: xserver-xorg-dev needs to be installed
+ifeq ($(VIDEODEP),)
+   @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed'
@exit 1
 else
-   echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars
+   echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PACKAGE).substvars
+   echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PACKAGE).substvars
+   # the following is there for compatibility...
echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> 
debian/$(PACKAGE).substvars
echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> 
debian/$(PACKAGE).substvars
+   echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> 
debian/$(PACKAGE).substvars
 endif
 
 # vim:set noet ai sts=8 sw=8 tw=0:

commit 8bd2e9b523da35493db1bd781d4ef6bfbbeb2eff
Author: Julien Cristau 
Date:   Tue Apr 13 14:06:33 2010 +0200

xsfbs.mk: don't use a directory as a make target

The timestamp on the directory gets updated each time a file is added in
it, which causes useless rebuilds.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 5e16b10..351fea5 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -110,14 +110,15 @@ $(STAMP_DIR)/stampdir:
 .PHONY: prepare
 stampdir_targets+=prepare
 prepare: $(STAMP_DIR)/prepare
-$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts
+$(STAMP_DIR)/prepare: $(STAMP_DIR)/logdir $(STAMP_DIR)/genscripts
>$@
 
-.PHONY: log
-stampdir_targets+=log
-log: $(STAMP_DIR)/log
-$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir
+.PHONY: logdir
+stampdir_targets+=logdir
+logdir: $(STAMP_DIR)/logdir
+$(STAMP_DIR)/logdir: $(STAMP_DIR)/stampdir
mkdir -p $(STAMP_DIR)/log
+   >$@
 
 # Apply all patches to the upstream source.
 .PHONY: patch
@@ -145,7 +146,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
 
 # Revert all patches to the upstream source.
 .PHONY: unpatch
-unpatch: $(STAMP_DIR)/log
+unpatch: $(STAMP_DIR)/logdir
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if $(QUILT) applied >/dev/null 2>/dev/null; then \

commit 734e3b2d1dcfe5db07cb19902617fd1212c0c186
Author: Cyril Brulebois 
Date:   Thu Apr 1 20:49:15 2010 +0200

Fix typo.

diff --git a/debian/README.source b/debian/README.source
index 34ab4bf..b09a1ab 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -25,7 +25,7 @@ just need to be pulled into git.debian.org in a "upstream-*" 
branch.
 Otherwise, the upstream sources are manually installed in

xfonts-utils: Changes to 'debian-unstable'

2010-11-16 Thread Julien Cristau 
 bdftopcf/ChangeLog|  115 +
 bdftopcf/INSTALL  |  291 ++
 bdftopcf/Makefile.am  |   34 
 bdftopcf/Makefile.in  |   83 
 bdftopcf/aclocal.m4   |  845 +++-
 bdftopcf/bdftopcf.c   |3 
 bdftopcf/bdftopcf.man |3 
 bdftopcf/config.guess |  210 --
 bdftopcf/config.h.in  |3 
 bdftopcf/config.sub   |  115 -
 bdftopcf/configure| 4029 +--
 bdftopcf/configure.ac |   20 
 debian/changelog  |8 
 debian/copyright  |  549 ++---
 font-util/COPYING |   52 
 font-util/ChangeLog   |  185 +
 font-util/INSTALL |  291 ++
 font-util/Makefile.am |   35 
 font-util/Makefile.in |  317 ++-
 font-util/aclocal.m4  |  989 -
 font-util/config.guess|  210 --
 font-util/config.h.in |3 
 font-util/config.sub  |  115 -
 font-util/configure   | 4026 +--
 font-util/configure.ac|   18 
 font-util/fontutil.m4.in  |  102 -
 font-util/man/Makefile.am |   35 
 font-util/man/Makefile.in |  435 
 font-util/man/bdftruncate.man |   32 
 font-util/man/ucs2any.man |   74 
 font-util/ucs2any.c   |1 
 mkfontdir/ChangeLog   |  105 +
 mkfontdir/INSTALL |  291 ++
 mkfontdir/Makefile.am |   28 
 mkfontdir/Makefile.in |   54 
 mkfontdir/aclocal.m4  | 1007 -
 mkfontdir/config.guess|  210 --
 mkfontdir/config.sub  |  115 -
 mkfontdir/configure   | 3670 
 mkfontdir/configure.ac|   20 
 mkfontdir/mkfontdir.cpp   |1 
 mkfontdir/mkfontdir.man   |3 
 mkfontscale/COPYING   |   39 
 mkfontscale/ChangeLog |  101 
 mkfontscale/INSTALL   |  291 ++
 mkfontscale/Makefile.am   |   28 
 mkfontscale/Makefile.in   |   52 
 mkfontscale/aclocal.m4|  851 +++-
 mkfontscale/config.guess  |  210 --
 mkfontscale/config.h.in   |3 
 mkfontscale/config.sub|  115 -
 mkfontscale/configure | 4250 ++
 mkfontscale/configure.ac  |   22 
 mkfontscale/data.h|1 
 mkfontscale/hash.h|1 
 mkfontscale/ident.c   |   42 
 mkfontscale/ident.h   |2 
 mkfontscale/list.c|1 
 mkfontscale/list.h|1 
 mkfontscale/mkfontscale.c |2 
 60 files changed, 14004 insertions(+), 10740 deletions(-)

New commits:
commit 460bdd01e549f630b7fe30b39e76c86627bef5b7
Author: Julien Cristau 
Date:   Tue Nov 16 15:25:58 2010 +0100

Update debian/copyright from upstream COPYING, drop DEP5 use.

diff --git a/debian/changelog b/debian/changelog
index b1529a5..8f4c05f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xfonts-utils (1:7.6~1) UNRELEASED; urgency=low
 - font-util 1.2.0
 - mkfontdir 1.0.6
 - mkfontscale 1.0.8
+  * Update debian/copyright from upstream COPYING, drop DEP5 use.
 
  -- Julien Cristau   Sat, 16 Jan 2010 16:47:59 +
 
diff --git a/debian/copyright b/debian/copyright
index f0ddee9..d53a74e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,298 +1,261 @@
-Format-Specification: 
http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=59
-Packaged-By: David Nusinow  and others.
-Maintainer: x...@lists.freedesktop.org
+Packaged by: David Nusinow  and others.
 Source:
  http://xorg.freedesktop.org/releases/individual/font/
  http://xorg.freedesktop.org/releases/individual/app/
 
-Files: bdftopcf/bdftopcf.*
-Copyright: Copyright 1991, 1993, 1998  The Open Group
-License: MIT-TOG
-
-Files: */Makefile.am, */configure.ac
-Copyright: Copyright 2005  Red Hat, Inc.
-License:
- Permission to use, copy, modify, distribute, and sell this software
- and its documentation for any purpose is hereby granted without fee,
- 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 Red Hat not be used in
- advertising or publicity pertaining to distribution of the software
- without specific, written prior permission.  Red Hat makes no
- representations about the suitability of this software for any
- purpose.  It is provided "as is" without express or implied warranty.
- .
- RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- NO EVENT SHALL RED HAT 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.
-
-Files: font-util/fontutil.m4.in
-Copyright: Cop

xfonts-utils: Changes to 'debian-unstable'

2010-01-22 Thread Julien Cristau 
 debian/changelog |1 +
 debian/control   |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit c70b5626ebe5b4852a8aab82e09b3a1de13ab83f
Author: Julien Cristau 
Date:   Sat Jan 23 01:46:50 2010 +0100

Remove myself from Uploaders

diff --git a/debian/changelog b/debian/changelog
index 838730c..bc0885b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xfonts-utils (1:7.5+3) UNRELEASED; urgency=low
 
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
 good reason.  Thanks, Colin Watson!
+  * Remove myself from Uploaders
 
  -- Julien Cristau   Sat, 16 Jan 2010 16:47:59 +
 
diff --git a/debian/control b/debian/control
index 6e46ac5..cc9132c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xfonts-utils
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
-Uploaders: David Nusinow , Julien Cristau 
, Brice Goglin 
+Uploaders: David Nusinow , Brice Goglin 

 Build-Depends: debhelper (>= 6.0.7~), pkg-config, quilt, libxfont-dev (>= 
1:1.0.0), libx11-dev (>= 2:1.0.0), x11proto-core-dev, libfreetype6-dev, 
libfontenc-dev
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/font/xfonts-utils


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

xfonts-utils: Changes to 'debian-unstable'

2010-01-16 Thread Julien Cristau 
 debian/changelog |7 +++
 debian/rules |   10 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

New commits:
commit e6c6827834a201bd83b82a62747a05139031faba
Author: Julien Cristau 
Date:   Sat Jan 16 16:49:09 2010 +

Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good 
reason.  Thanks, Colin Watson!

diff --git a/debian/changelog b/debian/changelog
index 5ac4bb9..838730c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xfonts-utils (1:7.5+3) UNRELEASED; urgency=low
+
+  * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+good reason.  Thanks, Colin Watson!
+
+ -- Julien Cristau   Sat, 16 Jan 2010 16:47:59 +
+
 xfonts-utils (1:7.5+2) unstable; urgency=low
 
   [ Theppitak Karoonboonyanan ]
diff --git a/debian/rules b/debian/rules
index a4a71ff..8f9ef68 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,13 +43,13 @@ build-stamp: $(STAMP_DIR)/genscripts $(addprefix 
$(STAMP_DIR)/build-,$(SUBDIRS))
 
 $(STAMP_DIR)/build-%: $(STAMP_DIR)/patch
dh_testdir
-   mkdir -p $*-obj-$(DEB_BUILD_GNU_TYPE)
-   cd $*-obj-$(DEB_BUILD_GNU_TYPE) && \
+   mkdir -p $*-build
+   cd $*-build && \
../$*/configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
--with-mapdir=\$${prefix}/share/fonts/X11/util \
CFLAGS="$(CFLAGS)" CPPFLAGS="-D_GNU_SOURCE"
-   cd $*-obj-$(DEB_BUILD_GNU_TYPE) && \
+   cd $*-build && \
$(MAKE)
>$@
 
@@ -62,7 +62,7 @@ clean: xsfclean
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
-   rm -rf *-obj-*
+   rm -rf *-build
 
dh_clean
 
@@ -73,7 +73,7 @@ install: build
dh_installdirs
 
for FILE in $(SUBDIRS); do \
-   cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) 
DESTDIR=$(CURDIR)/debian/tmp install ; \
+   cd "$$FILE"-build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp 
install ; \
cd ..; \
done
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

xfonts-utils: Changes to 'debian-unstable'

2009-12-25 Thread Julien Cristau 
 debian/changelog |9 +++--
 debian/rules |2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit f8d079f96aedf65baf0c5e9b52e6c3e17fedc067
Author: Julien Cristau 
Date:   Fri Dec 25 12:56:59 2009 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 08dbb11..5ac4bb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xfonts-utils (1:7.5+2) UNRELEASED; urgency=low
+xfonts-utils (1:7.5+2) unstable; urgency=low
 
   [ Theppitak Karoonboonyanan ]
   * update-font-alias: use an exclude file listing alias files we need to
@@ -9,7 +9,7 @@ xfonts-utils (1:7.5+2) UNRELEASED; urgency=low
   * Set CPPFLAGS to -D_GNU_SOURCE for vasprintf (temporary, fixed in upstream
 fonttosfnt git already).
 
- -- Theppitak Karoonboonyanan   Wed, 09 Dec 2009 15:04:53 
+0700
+ -- Julien Cristau   Fri, 25 Dec 2009 12:56:34 +0100
 
 xfonts-utils (1:7.5+1) unstable; urgency=low
 

commit a33a91677365bd6380c8f221933b231c1fdaf68f
Author: Julien Cristau 
Date:   Fri Dec 25 12:54:30 2009 +0100

Set CPPFLAGS to -D_GNU_SOURCE for vasprintf

Temporary, fixed in upstream fonttosfnt git already.

diff --git a/debian/changelog b/debian/changelog
index 13b6aa7..08dbb11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 xfonts-utils (1:7.5+2) UNRELEASED; urgency=low
 
+  [ Theppitak Karoonboonyanan ]
   * update-font-alias: use an exclude file listing alias files we need to
 ignore, which is to be used when font packages are removed
 (closes: #543512).
 
+  [ Julien Cristau ]
+  * Set CPPFLAGS to -D_GNU_SOURCE for vasprintf (temporary, fixed in upstream
+fonttosfnt git already).
+
  -- Theppitak Karoonboonyanan   Wed, 09 Dec 2009 15:04:53 
+0700
 
 xfonts-utils (1:7.5+1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 36974bf..a4a71ff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,7 +48,7 @@ $(STAMP_DIR)/build-%: $(STAMP_DIR)/patch
../$*/configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
--with-mapdir=\$${prefix}/share/fonts/X11/util \
-   CFLAGS="$(CFLAGS)"
+   CFLAGS="$(CFLAGS)" CPPFLAGS="-D_GNU_SOURCE"
cd $*-obj-$(DEB_BUILD_GNU_TYPE) && \
$(MAKE)
>$@


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

xfonts-utils: Changes to 'debian-unstable'

2009-12-09 Thread Julien Cristau 
 debian/changelog|8 ++
 debian/local/update-fonts-alias |  118 ++--
 debian/xfonts-utils.postinst.in |   22 +++
 debian/xfonts-utils.postrm.in   |   22 +++
 4 files changed, 129 insertions(+), 41 deletions(-)

New commits:
commit 6c9954c869ef8960790cfcb63a30200c0390689f
Author: Theppitak Karoonboonyanan 
Date:   Wed Dec 9 14:30:57 2009 +0100

update-fonts-alias: add an exclude file

Use an exclude file in /var/lib/xfonts/ listing alias files we need to
ignore, which is to be used when font packages are removed.

Signed-off-by: Julien Cristau 

diff --git a/debian/changelog b/debian/changelog
index c82dca7..13b6aa7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xfonts-utils (1:7.5+2) UNRELEASED; urgency=low
+
+  * update-font-alias: use an exclude file listing alias files we need to
+ignore, which is to be used when font packages are removed
+(closes: #543512).
+
+ -- Theppitak Karoonboonyanan   Wed, 09 Dec 2009 15:04:53 
+0700
+
 xfonts-utils (1:7.5+1) unstable; urgency=low
 
   [ Julien Cristau ]
diff --git a/debian/local/update-fonts-alias b/debian/local/update-fonts-alias
index 508e313..a344542 100644
--- a/debian/local/update-fonts-alias
+++ b/debian/local/update-fonts-alias
@@ -43,7 +43,7 @@ usage () {
 message "usage error: $*"
 fi
 cat <&2
-exit 2
-;;
-esac
+INCLUDE_ALIAS=
+EXCLUDE_ALIAS=
+EXCLUDE_CONF=/var/lib/xfonts/excluded-aliases
+
+# Validate options.
+while [ $# -gt 0 ]; do
+case "$1" in
+-h|--help)
+usage
+exit 0
+;;
+-7|--x11r7-layout)
+X11R7_LAYOUT=true
+shift
+;;
+-i|--include)
+if [ $# -lt 2 ]; then
+usage "alias file to include is missing" >&2
+exit 2
+fi
+INCLUDE_ALIAS="$INCLUDE_ALIAS $2"
+shift 2
+;;
+-x|--exclude)
+if [ $# -lt 2 ]; then
+usage "alias file to exclude is missing" >&2
+exit 2
+fi
+EXCLUDE_ALIAS="$EXCLUDE_ALIAS $2"
+shift 2
+;;
+-*)
+usage "unrecognized option" >&2
+exit 2
+;;
+*)
+break
+;;
+esac
+done
 
 if [ $# -eq 0 ]; then
 usage "one or more font directories must be specified" >&2
 exit 2
 fi
 
+# Remove aliases to be included from exclude list
+for f in $INCLUDE_ALIAS; do
+sed -i "\\,^$f$,d" $EXCLUDE_CONF
+done
+# Add aliases to be excluded to exclude list
+for f in $EXCLUDE_ALIAS; do
+sed -i "\\,^$f$,d" $EXCLUDE_CONF
+echo "$f" >> $EXCLUDE_CONF
+done
+
 while [ -n "$1" ]; do
 # Try to be clever about the argument; were we given an absolute path?
 if expr "$1" : "/.*" >/dev/null 2>&1; then
@@ -129,30 +162,33 @@ while [ -n "$1" ]; do
 continue
 fi
 
-# Are there any files to process?
-if [ "$(echo "$ETCDIR"/*.alias "$ETC7DIR"/*.alias)" != "$ETCDIR/*.alias 
$ETC7DIR/*.alias" ]
-then
-if [ -n "$X11R7DIR" ] && [ -d "$X11R7DIR" ]; then
-# Write the new alias file in a temporary location in case we are
-# interrupted.
-cat >"$X11R7DIR/fonts.alias.update-new" <"$X11R7DIR/fonts.alias.update-new" <>"$X11R7DIR/fonts.alias.update-new"
-cat "$FILE" >>"$X11R7DIR/fonts.alias.update-new"
-done
-mv "$X11R7DIR/fonts.alias.update-new" "$X11R7DIR/fonts.alias"
-fi
-else
-if [ -n "$X11R7DIR" ] && [ -d "$X11R7DIR" ]; then
-# There are no files to process; remove any alias file already in
-# the font directory.
-rm -f "$X11R7DIR/fonts.alias"
-# Remove the font directory if it is empty.
-rmdir "$X11R7DIR" >/dev/null 2>&1 || true
+has_data=0
+for FILE in "$ETCDIR"/*.alias "$ETC7DIR"/*.alias; do
+[ -e "$FILE" ] || continue
+
+# Skip excluded aliases
+grep -q "^$FILE$" $EXCLUDE_CONF && continue
+
+echo "!! $FILE" >>"$X11R7DIR/fonts.alias.update-new"
+cat "$FILE" >>"$X11R7DIR/fonts.alias.update-new"
+has_data=1
+done
+if [ $has_data -eq 1 ]; then
+  mv "$X11R7DIR/fonts.alias.update-new" "$X11R7DIR/fonts.alias"
+else
+  rm -f "$X11R7DIR/fonts.alias.update-new"
+  # There are no files to process; remove any alias file already in
+  # the font directory.
+  rm -f "$X11R7DIR/fonts.alias"
+  # Remove the font directory if it is empty.
+  rmdir "$X11R7DIR" >/dev/null 2>&1 || true
 fi
 fi
 done
diff --git a/debian/xfonts-utils.postinst.in b/debian/xfonts-utils.postinst.in
new file mode 100644
index 000..d4695c8
--- /dev/null
+++ b/debian/xfonts-utils.postinst.in
@@ -0,0 +1,22 @@
+#!/bin/sh
+

xfonts-utils: Changes to 'debian-unstable'

2009-12-06 Thread Brice Goglin 
 debian/changelog |9 +++--
 debian/control   |4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 205046194800643800e74a4fa446a066f181f7be
Author: Brice Goglin 
Date:   Sun Dec 6 22:19:48 2009 +0100

Prepare Changelog for upload

diff --git a/debian/changelog b/debian/changelog
index f67ab33..c82dca7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xfonts-utils (1:7.5+1) UNRELEASED; urgency=low
+xfonts-utils (1:7.5+1) unstable; urgency=low
 
   [ Julien Cristau ]
   * lintian has been fixed, kill the override.
@@ -12,8 +12,9 @@ xfonts-utils (1:7.5+1) UNRELEASED; urgency=low
 
   [ Brice Goglin ]
   * Bump Standards-Version to 3.8.3, no changes.
+  * Add myself to Uploaders.
 
- -- Brice Goglin   Sun, 06 Dec 2009 22:15:53 +0100
+ -- Brice Goglin   Sun, 06 Dec 2009 22:19:44 +0100
 
 xfonts-utils (1:7.4+2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 14fc6ca..6e46ac5 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xfonts-utils
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
-Uploaders: David Nusinow , Julien Cristau 

+Uploaders: David Nusinow , Julien Cristau 
, Brice Goglin 
 Build-Depends: debhelper (>= 6.0.7~), pkg-config, quilt, libxfont-dev (>= 
1:1.0.0), libx11-dev (>= 2:1.0.0), x11proto-core-dev, libfreetype6-dev, 
libfontenc-dev
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/font/xfonts-utils

commit 424fd4597b62a87e93da32088bf729c83a64cdd0
Author: Brice Goglin 
Date:   Sun Dec 6 22:17:04 2009 +0100

Bump Standards-Version to 3.8.3

diff --git a/debian/changelog b/debian/changelog
index 1f94588..f67ab33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 xfonts-utils (1:7.5+1) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * lintian has been fixed, kill the override.
   * debian/watch.*, debian/rules: add a target to download the latest upstream
 tarballs.
@@ -9,7 +10,10 @@ xfonts-utils (1:7.5+1) UNRELEASED; urgency=low
   * mkfontscale 1.0.7.
   * Update debian/copyright.
 
- -- Julien Cristau   Fri, 16 Oct 2009 20:42:19 +0200
+  [ Brice Goglin ]
+  * Bump Standards-Version to 3.8.3, no changes.
+
+ -- Brice Goglin   Sun, 06 Dec 2009 22:15:53 +0100
 
 xfonts-utils (1:7.4+2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 357278d..14fc6ca 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian X Strike Force 
 Uploaders: David Nusinow , Julien Cristau 

 Build-Depends: debhelper (>= 6.0.7~), pkg-config, quilt, libxfont-dev (>= 
1:1.0.0), libx11-dev (>= 2:1.0.0), x11proto-core-dev, libfreetype6-dev, 
libfontenc-dev
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/font/xfonts-utils
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/font/xfonts-utils.git
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

xfonts-utils: Changes to 'debian-unstable'

2009-10-16 Thread Julien Cristau 
 bdftopcf/ChangeLog|   45 
 bdftopcf/Makefile.am  |6 
 bdftopcf/Makefile.in  |  369 +-
 bdftopcf/README   |   24 
 bdftopcf/aclocal.m4   |  697 +++--
 bdftopcf/compile  |  142 -
 bdftopcf/config.guess |  101 
 bdftopcf/config.h.in  |   30 
 bdftopcf/config.sub   |  109 
 bdftopcf/configure| 4406 ++
 bdftopcf/configure.ac |   10 
 bdftopcf/depcomp  |  172 +
 bdftopcf/install-sh   |  517 ++-
 bdftopcf/missing  |  104 
 debian/changelog  |   13 
 debian/copyright  |  196 -
 debian/rules  |5 
 debian/watch.bdftopcf |2 
 debian/watch.font-util|2 
 debian/watch.fonttosfnt   |2 
 debian/watch.mkfontdir|2 
 debian/watch.mkfontscale  |2 
 debian/xfonts-utils.lintian-overrides |1 
 debian/xsfbs/xsfbs.mk |   21 
 debian/xsfbs/xsfbs.sh |  233 -
 font-util/COPYING |   29 
 font-util/ChangeLog   |   61 
 font-util/Makefile.am |2 
 font-util/Makefile.in |  328 +-
 font-util/README  |5 
 font-util/aclocal.m4  | 1469 ++-
 font-util/bdftruncate.c   |4 
 font-util/config.guess|   58 
 font-util/config.h.in |3 
 font-util/config.sub  |   15 
 font-util/configure   | 4163 
 font-util/configure.ac|   33 
 font-util/depcomp |   87 
 font-util/fontutil.m4 |  441 ++-
 font-util/fontutil.m4.in  |  324 ++
 font-util/fontutil.pc.in  |3 
 font-util/install-sh  |5 
 font-util/missing |   49 
 mkfontdir/ChangeLog   |   36 
 mkfontdir/Makefile.am |8 
 mkfontdir/Makefile.in |  223 +
 mkfontdir/README  |   27 
 mkfontdir/aclocal.m4  | 1570 +++-
 mkfontdir/config.guess|   55 
 mkfontdir/config.sub  |   54 
 mkfontdir/configure   | 4186 ++--
 mkfontdir/configure.ac|   11 
 mkfontdir/install-sh  |5 
 mkfontdir/missing |   49 
 mkfontscale/COPYING   |   28 
 mkfontscale/ChangeLog |   66 
 mkfontscale/Makefile.am   |   18 
 mkfontscale/Makefile.in   |  341 +-
 mkfontscale/README|   26 
 mkfontscale/aclocal.m4| 1737 +++--
 mkfontscale/config.guess  |   51 
 mkfontscale/config.h.in   |   36 
 mkfontscale/config.sub|   54 
 mkfontscale/configure | 4250 ++--
 mkfontscale/configure.ac  |   23 
 mkfontscale/data.h|4 
 mkfontscale/depcomp   |   87 
 mkfontscale/ident.c   |  223 +
 mkfontscale/ident.h   |2 
 mkfontscale/install-sh|5 
 mkfontscale/missing   |   49 
 mkfontscale/mkfontscale.c |   12 
 mkfontscale/mkfontscale.man   |2 
 73 files changed, 18490 insertions(+), 9038 deletions(-)

New commits:
commit 82500d21386f1fa7d882a702881f6468bd1519a4
Author: Julien Cristau 
Date:   Fri Oct 16 23:05:53 2009 +0200

Update debian/copyright.

diff --git a/debian/changelog b/debian/changelog
index 43d0ad8..1f94588 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xfonts-utils (1:7.5+1) UNRELEASED; urgency=low
   * font-util 1.1.1.
   * mkfontdir 1.0.5.
   * mkfontscale 1.0.7.
+  * Update debian/copyright.
 
  -- Julien Cristau   Fri, 16 Oct 2009 20:42:19 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 7912f6a..f0ddee9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,37 +1,17 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Format-Specification: 
http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=59
 Packaged-By: David Nusinow  and others.
-Original-Source-Location:
+Maintainer: x...@lists.freedesktop.org
+Source:
  http://xorg.freedesktop.org/releases/individual/font/
  http://xorg.freedesktop.org/releases/individual/app/
 
 Files: bdftopcf/bdftopcf.*
 Copyright: Copyright 1991, 1993, 1998  The Open Group
-License: MIT
- Permission to use, copy, modify, distribute, and sell this software and its
- documentation for any purpose is hereby granted without fee, provided that
- the above copyright notice appe

xfonts-utils: Changes to 'debian-unstable'

2009-08-07 Thread Julien Cristau 
 debian/README.source  |   73 
 debian/changelog  |   16 
 debian/control|4 
 debian/copyright  |   36 
 debian/rules  |   37 
 debian/xfonts-utils.lintian-overrides |1 
 debian/xsfbs/repack.sh|   32 
 debian/xsfbs/xsfbs.mk |   47 
 debian/xsfbs/xsfbs.sh |   78 
 font-util/COPYING |   78 
 font-util/ChangeLog   |  273 +
 font-util/Makefile.am |   22 
 font-util/Makefile.in |  232 -
 font-util/README  |   25 
 font-util/aclocal.m4  |  292 +
 font-util/autogen.sh  |   12 
 font-util/bdftruncate.c   |  222 +
 font-util/bdftruncate.pl  |   77 
 font-util/config.guess|  782 +++--
 font-util/config.h.in |   42 
 font-util/config.sub  |  331 +-
 font-util/configure   | 5050 --
 font-util/configure.ac|   18 
 font-util/depcomp |  188 +
 font-util/install-sh  |  659 ++--
 font-util/missing |  193 -
 font-util/mkinstalldirs   |  111 
 font-util/ucs2any.c   |   12 
 28 files changed, 5673 insertions(+), 3270 deletions(-)

New commits:
commit 1e63c708c7851d934236422058a1abf4762fd52c
Author: Julien Cristau 
Date:   Fri Aug 7 22:09:11 2009 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 47de758..e706b7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xfonts-utils (1:7.4+2) UNRELEASED; urgency=low
+xfonts-utils (1:7.4+2) unstable; urgency=low
 
   [ Brice Goglin ]
   * Add Replaces: fonttosfnt (<< 1.0.4), as Ubuntu had it as a separate
@@ -18,7 +18,7 @@ xfonts-utils (1:7.4+2) UNRELEASED; urgency=low
   * Override lintian error about our Depends: xfonts-encodings.  Use
 dh_lintian, and bump debhelper build-dep.
 
- -- Brice Goglin   Fri, 13 Jun 2008 07:14:33 +0200
+ -- Julien Cristau   Fri, 07 Aug 2009 22:09:07 +0200
 
 xfonts-utils (1:7.4+1) unstable; urgency=low
 

commit eb7acc935a37051dfeadbf918116be23713ca1e5
Author: Julien Cristau 
Date:   Fri Aug 7 22:09:01 2009 +0200

Override lintian error about our Depends: xfonts-encodings.

Use dh_lintian, and bump debhelper build-dep.

diff --git a/debian/changelog b/debian/changelog
index 172e151..47de758 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ xfonts-utils (1:7.4+2) UNRELEASED; urgency=low
 lintian.
   * font-util 1.0.2.
   * debian/copyright: update from font-util/COPYING.
+  * Override lintian error about our Depends: xfonts-encodings.  Use
+dh_lintian, and bump debhelper build-dep.
 
  -- Brice Goglin   Fri, 13 Jun 2008 07:14:33 +0200
 
diff --git a/debian/control b/debian/control
index 99ed80a..357278d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
 Uploaders: David Nusinow , Julien Cristau 

-Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, libxfont-dev (>= 
1:1.0.0), libx11-dev (>= 2:1.0.0), x11proto-core-dev, libfreetype6-dev, 
libfontenc-dev
+Build-Depends: debhelper (>= 6.0.7~), pkg-config, quilt, libxfont-dev (>= 
1:1.0.0), libx11-dev (>= 2:1.0.0), x11proto-core-dev, libfreetype6-dev, 
libfontenc-dev
 Standards-Version: 3.8.2
 Vcs-Git: git://git.debian.org/git/pkg-xorg/font/xfonts-utils
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/font/xfonts-utils.git
diff --git a/debian/rules b/debian/rules
index 39e56f3..0b96a91 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,6 +85,7 @@ binary-arch: build install
dh_installdocs
dh_install --sourcedir=debian/tmp --fail-missing
dh_installchangelogs
+   dh_lintian
dh_link
dh_strip
dh_compress
diff --git a/debian/xfonts-utils.lintian-overrides 
b/debian/xfonts-utils.lintian-overrides
new file mode 100644
index 000..313b87e
--- /dev/null
+++ b/debian/xfonts-utils.lintian-overrides
@@ -0,0 +1 @@
+package-depends-on-an-x-font-package depends: xfonts-encodings

commit fc8ca65fa080d4588c3d4e2a4558571e7916844e
Author: Julien Cristau 
Date:   Fri Aug 7 22:04:07 2009 +0200

debian/copyright: update from font-util/COPYING.

diff --git a/debian/changelog b/debian/changelog
index 2508520..172e151 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ xfonts-utils (1:7.4+2) UNRELEASED; urgency=low
   * Move dh_makeshlibs call before dh_shlibdeps and dh_gencontrol to silence
 lintian.
   * font-util 1.0.2.
+  * debian/copyright: update from font-util/COPYING.
 
  -- Brice Goglin   Fri, 13 Jun 2008 07:14:33 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 576098b..7912f6a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -97,7 +97,7 @@

xfonts-utils: Changes to 'debian-unstable'

2009-08-02 Thread Julien Cristau 
 debian/changelog |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 737dd057690d224e12d47034764bb3a1438320c1
Author: Julien Cristau 
Date:   Sun Aug 2 16:07:42 2009 +0200

Add bug closer

diff --git a/debian/changelog b/debian/changelog
index 360d2aa..23aaea7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xfonts-utils (1:7.4+2) UNRELEASED; urgency=low
 package.
   * Mention fonttosfnt in the long description.
   * bdftopcf 1.0.1.
++ updated config.{guess,sub} add support for avr32 (closes: #535803)
 
  -- Brice Goglin   Fri, 13 Jun 2008 07:14:33 +0200
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

xfonts-utils: Changes to 'debian-unstable'

2008-06-12 Thread Brice Goglin 
 bdftopcf/ChangeLog |  199 ++-
 bdftopcf/Makefile.am   |   15 
 bdftopcf/Makefile.in   |   29 -
 bdftopcf/aclocal.m4| 1240 -
 bdftopcf/bdftopcf.c|4 
 bdftopcf/compile   |  147 +++--
 bdftopcf/config.guess  |  677 +++---
 bdftopcf/config.h.in   |9 
 bdftopcf/config.sub|  237 +++--
 bdftopcf/configure |  492 ---
 bdftopcf/configure.ac  |7 
 bdftopcf/depcomp   |  103 +++-
 bdftopcf/install-sh|  477 +-
 bdftopcf/missing   |  142 +++--
 bdftopcf/mkinstalldirs |  111 
 debian/changelog   |3 
 16 files changed, 2231 insertions(+), 1661 deletions(-)

New commits:
commit f18e4f504709dd9219ead7dc6f81496db78f4995
Author: Brice Goglin <[EMAIL PROTECTED]>
Date:   Fri Jun 13 07:14:49 2008 +0200

bdftopcf 1.0.1

diff --git a/bdftopcf/ChangeLog b/bdftopcf/ChangeLog
index 7a42159..44474cd 100644
--- a/bdftopcf/ChangeLog
+++ b/bdftopcf/ChangeLog
@@ -1,41 +1,190 @@
-2005-12-14  Kevin E. Martin  
+commit 963c88d67500b581fd4d44d4f561089c66bf7c56
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date:   Tue Apr 24 20:04:39 2007 -0700
 
-   * configure.ac:
-   Update package version number for final X11R7 release candidate.
+Fix sparse warning: Using plain integer as NULL pointer
 
-2005-12-06  Kevin E. Martin  
+commit 7206fb39a668384dfba3c8436222722123f4c9ff
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date:   Tue Apr 24 20:03:51 2007 -0700
 
-   * Makefile.am:
-   Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+Add target for checking code with sparse/lint/etc.
 
-2005-12-03  Kevin E. Martin  
+commit c42df278513724e3236eecda859f069c34f78508
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date:   Tue Apr 24 20:01:40 2007 -0700
 
-   * configure.ac:
-   Update package version number for X11R7 RC3 release.
+Replace static ChangeLog with disthook to generate from git log
 
-2005-11-19  Kevin E. Martin  
+commit 608915a471c5a7a1cc3ecca19fc1b516480f439f
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date:   Tue Apr 24 19:31:40 2007 -0700
 
-   * configure.ac:
-   Update dependencies to work with separate build roots.
+Sun bug 6509763: bdftopcf crashes when bad font passed on stdin
+
+When printing corrupt font error message, make sure file name reported is
+not NULL.
 
-2005-11-09  Kevin E. Martin  
+commit a498f77133c4a6df5a192133528a846bd9e88d7c
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date:   Tue Apr 24 19:30:13 2007 -0700
 
-   * configure.ac:
-   Update package version number for X11R7 RC2 release.
+renamed: .cvsignore -> .gitignore
 
-2005-11-01  Kevin E. Martin  
+commit ebb668bf17f019813cc9615269d28da8205f1d00
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date:   Thu Dec 15 00:24:01 2005 +
 
-   * configure.ac:
-   Update pkgcheck depedencies to work with separate build roots.
+Update package version number for final X11R7 release candidate.
 
-2005-10-18  Kevin E. Martin  
+commit 8e3cd1b0e5c443c3c93565343c6721a3345c085e
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date:   Tue Dec 6 22:48:15 2005 +
 
-   * configure.ac:
-   Update package version number for RC1 release.
+Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
 
-2005-09-23  Kristian Høgsberg  <[EMAIL PROTECTED]>
+commit a61fd8c9f26b1defde1bf45ba5b938c197951d3f
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date:   Sat Dec 3 05:49:14 2005 +
 
-   * AUTHORS:
-   * COPYING:
-   * README: Fill these in.
+Update package version number for X11R7 RC3 release.
 
+commit 148db4c885a1adebf21e21d8f505b0148763cc00
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date:   Mon Nov 28 22:01:36 2005 +
+
+Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
+
+commit a8afffe03349e74fbec823dd074b0c65bcc579c4
+Author: Eric Anholt <[EMAIL PROTECTED]>
+Date:   Mon Nov 21 10:34:54 2005 +
+
+Another pass at .cvsignores for apps.
+
+commit 1f9a92c950da572b246a5ee354617c7628539e9b
+Author: Eric Anholt <[EMAIL PROTECTED]>
+Date:   Sun Nov 20 22:08:47 2005 +
+
+Add/improve .cvsignore files for apps.
+
+commit f4d3c5288e31356b794253afb48c3691779b1cc2
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date:   Sat Nov 19 07:15:35 2005 +
+
+Update pkgconfig files to separate library build-time dependencies from
+application build-time dependencies, and update package deps to work
+with separate build roots.
+
+commit ebac4be33d3b439772212d35934f2753f03f42fe
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date:   Wed Nov 9 21:09:19 2005 +
+
+Update package version number for X11R7 RC2 release.
+
+commit 95833b04ce5ee998bcf2aaea03718157566ec671
+Author: Kevin E Martin <[EMAIL PROTECTED]>
+Date:   Tue Nov 1 15:05:18 2005 +
+
+Upd

xfonts-utils: Changes to 'debian-unstable'

2008-05-30 Thread Julien Cristau 
 debian/changelog  |8 +
 debian/control|3 
 debian/xsfbs/xsfbs.mk |2 
 debian/xsfbs/xsfbs.sh |  387 +++---
 4 files changed, 220 insertions(+), 180 deletions(-)

New commits:
commit 39c73138e78e5cd6f3ee990de36d847405c15843
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri May 30 15:44:29 2008 +0200

Add Replaces: fonttosfnt (<< 1.0.4), and mention fonttosfnt in the 
description

* Add Replaces: fonttosfnt (<< 1.0.4), as Ubuntu had it as a separate
  package.
* Mention fonttosfnt in the long description.

diff --git a/debian/changelog b/debian/changelog
index f11e51a..1962254 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xfonts-utils (1:7.4+2) UNRELEASED; urgency=low
+
+  * Add Replaces: fonttosfnt (<< 1.0.4), as Ubuntu had it as a separate
+package.
+  * Mention fonttosfnt in the long description.
+
+ -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 30 May 2008 15:43:21 +0200
+
 xfonts-utils (1:7.4+1) unstable; urgency=low
 
   * Change versioning to more or less match X.Org katamaris
diff --git a/debian/control b/debian/control
index 9e8fb7c..d55c8a5 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/font/xfonts-utils.git
 Package: xfonts-utils
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, xfonts-encodings
-Replaces: xutils (<< 1:1.0.1-1)
+Replaces: xutils (<< 1:1.0.1-1), fonttosfnt (<< 1.0.4)
 Description: X Window System font utility programs
  xfonts-utils provides a set of utility programs shipped with the X Window 
  System that are needed for font management.
@@ -22,3 +22,4 @@ Description: X Window System font utility programs
 from ISO 10646-encoded fonts
   - mkfontdir, a program to generate fonts.dir files;
   - mkfontscale, a program to generate fonts.scale files;
+  - fonttosfnt, a program to wrap bitmap fonts in a sfnt (TrueType) wrapper.

commit dcf4204d5328834172df80951a18de014b0f74ef
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri May 30 12:26:18 2008 +0200

xsfbs.sh: use 'local' now that policy allows it

Policy 3.7.3 allows /bin/sh scripts to use 'local'.

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 0c7607a..72efa95 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -238,19 +238,19 @@ analyze_path () {
   # analyze_path /usr/X11R6/bin -> ls -dl /usr /usr/X11R6 /usr/X11R6/bin
   # Thanks to Randolph Chung for this clever hack.
 
-  #local f g
+  local f g
 
   while [ -n "$1" ]; do
 reject_whitespace "$1"
-_g=
+g=
 message "Analyzing $1:"
-for _f in $(echo "$1" | tr / \  ); do
-  if [ -e /$_g$_f ]; then
-ls -dl /$_g$_f /$_g$_f.dpkg-* 2> /dev/null || true
-_g=$_g$_f/
+for f in $(echo "$1" | tr / \  ); do
+  if [ -e /$g$f ]; then
+ls -dl /$g$f /$g$f.dpkg-* 2> /dev/null || true
+g=$g$f/
   else
-message "/$_g$_f: nonexistent; directory contents of /$_g:"
-ls -l /$_g
+message "/$g$f: nonexistent; directory contents of /$g:"
+ls -l /$g
 break
   fi
 done
@@ -259,27 +259,27 @@ analyze_path () {
 }
 
 find_culprits () {
-  #local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package 
\
-  #  msg
+  local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
+msg
 
   reject_whitespace "$1"
   message "Searching for overlapping packages..."
-  _dpkg_info_dir=/var/lib/dpkg/info
-  if [ -d $_dpkg_info_dir ]; then
-if [ "$(echo $_dpkg_info_dir/*.list)" != "$_dpkg_info_dir/*.list" ]; then
-  _possible_culprits=$(ls -1 $_dpkg_info_dir/*.list | egrep -v \
+  dpkg_info_dir=/var/lib/dpkg/info
+  if [ -d $dpkg_info_dir ]; then
+if [ "$(echo $dpkg_info_dir/*.list)" != "$dpkg_info_dir/*.list" ]; then
+  possible_culprits=$(ls -1 $dpkg_info_dir/*.list | egrep -v \
 "(xbase-clients|x11-common|xfs|xlibs)")
-  if [ -n "$_possible_culprits" ]; then
-_smoking_guns=$(grep -l "$1" $_possible_culprits || true)
-if [ -n "$_smoking_guns" ]; then
-  _bad_packages=$(printf "\\n")
-  for f in $_smoking_guns; do
+  if [ -n "$possible_culprits" ]; then
+smoking_guns=$(grep -l "$1" $possible_culprits || true)
+if [ -n "$smoking_guns" ]; then
+  bad_packages=$(printf "\\n")
+  for f in $smoking_guns; do
 # too bad you can't nest parameter expansion voodoo
 p=${f%*.list}  # strip off the trailing ".list"
-_package=${p##*/}   # strip off the directories
-_bad_packages=$(printf "%s\n%s" "$_bad_packages" "$_package")
+package=${p##*/}   # strip off the directories
+bad_packages=$(printf "%s\n%s" "$bad_packages" "$package")
   done
-  _msg=$(cat < /dev/null 2>&1; then
-  _shortcmd=${_cmd##*/}
-  observe "running $

xfonts-utils: Changes to 'debian-unstable'

2008-05-11 Thread Julien Cristau 
 debian/changelog |6 --
 debian/control   |2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit cbe4822ba0e690aa2b116652024c36d575b5ccec
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Sun May 11 22:03:42 2008 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index ffc7f6c..f11e51a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xfonts-utils (1:7.4+1) UNRELEASED; urgency=low
+xfonts-utils (1:7.4+1) unstable; urgency=low
 
   * Change versioning to more or less match X.Org katamaris
   * mkfontscale 1.0.5
@@ -12,7 +12,7 @@ xfonts-utils (1:7.4+1) UNRELEASED; urgency=low
   * Add build-dependencies on x11proto-core-dev, libfreetype6-dev,
 libfontenc-dev for fonttosfnt.
 
- -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 07 Mar 2008 17:41:15 +0100
+ -- Julien Cristau <[EMAIL PROTECTED]>  Sun, 11 May 2008 22:03:39 +0200
 
 xfonts-utils (1:1.0.1-2) unstable; urgency=low
 

commit 7f06ed3691264263a9ef3d2b78138b410ac09d03
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Sun May 11 22:03:36 2008 +0200

Add build-dependencies for fonttosfnt.

Its configure script needs x11proto-core-dev, libfreetype6-dev
and libfontenc-dev.

diff --git a/debian/changelog b/debian/changelog
index 57f8d21..ffc7f6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ xfonts-utils (1:7.4+1) UNRELEASED; urgency=low
   * Switch to machine-interpretable debian/copyright format
 (http://wiki.debian.org/Proposals/CopyrightFormat).
   * Add fonttosfnt, version 1.0.4.
+  * Add build-dependencies on x11proto-core-dev, libfreetype6-dev,
+libfontenc-dev for fonttosfnt.
 
  -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 07 Mar 2008 17:41:15 +0100
 
diff --git a/debian/control b/debian/control
index 5bfce49..9e8fb7c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
 Uploaders: David Nusinow <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL 
PROTECTED]>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, libxfont-dev (>= 
1:1.0.0), libx11-dev (>= 2:1.0.0)
+Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, libxfont-dev (>= 
1:1.0.0), libx11-dev (>= 2:1.0.0), x11proto-core-dev, libfreetype6-dev, 
libfontenc-dev
 Standards-Version: 3.7.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/font/xfonts-utils
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/font/xfonts-utils.git


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

xfonts-utils: Changes to 'debian-unstable'

2008-05-10 Thread Julien Cristau 
 debian/xsfbs/xsfbs-autoreconf.mk |  150 ---
 debian/xsfbs/xsfbs.mk|4 -
 2 files changed, 1 insertion(+), 153 deletions(-)

New commits:
commit c87ea43906787791a87a659c0a9d6312945ffb32
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Sun Apr 13 03:12:18 2008 +0200

Remove xsfbs-autoreconf.mk

It has never been used, and that doesn't look likely to change.

diff --git a/debian/xsfbs/xsfbs-autoreconf.mk b/debian/xsfbs/xsfbs-autoreconf.mk
deleted file mode 100644
index dce8fc8..000
--- a/debian/xsfbs/xsfbs-autoreconf.mk
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/usr/bin/make -f
-# $Id$
-
-# Automagical conversion of autoreconf results into quilt patches.
-
-# Copyright 2006 Eugene Konev
-#
-# Licensed under the GNU General Public License, version 2.  See the file
-# /usr/share/common-licenses/GPL or .
-
-# The idea behind this is storing changes produced by autoreconf as a 
-# separate patch on quilt stack (on top of stack actually).
-# The only usable target here is 'autoreconf`. Other targets are not
-# supposed to be called directly. DO NOT invoke them, unless you know what
-# you are doing.
-# The autoreconf target will check if files with names in $(RECONF_CHECKFILES)
-# were changed during patching (from upstream version or from previously
-# autoreconfed version) and call actual autoreconfing if they were.
-# The actual autoreconfing target (doautoreconf) WILL FAIL after 
-# calling autoreconf and pushing changes into quilt stack by design. It
-# should never be invoked by automatic build process.
-# The proposed use is adding autoreconf into clean's prerequisites before
-# xsfclean like:
-# - clean: xsfclean
-# + clean: autoreconf xsfclean
-# This will ensure it is called when you build package with dpkg-buildpackage.
-
-# This dir will be used for producing diff of autoreconfed tree
-RECONF_DIR := xsfautoreconf
-
-# This files will be checked for changes
-RECONF_CHECKFILES += configure.ac Makefile.am
-
-# This files will not be hardlinked but copied
-RECONF_NOLINKFILES += aclocal.m4
-
-# This files/dirs will be pruned after autoreconf run
-RECONF_PRUNEFILES += autom4te.cache config.h.in~ aclocal.m4~
-
-# Internal target. Never invoke directly.
-stampdir_target+=check.md5sum
-$(STAMP_DIR)/check.md5sum:
-   dh_testdir
-   $(MAKE) -f debian/rules prepare
-   for F in $(RECONF_CHECKFILES); do \
- find . -wholename ./$(STAMP_DIR) -prune -o -name $$F -print | \
-   LC_ALL=C sort | xargs --no-run-if-empty md5sum >>$@; \
-   done
-
-# Internal target. Never invoke directly.
-$(STAMP_DIR)/clean.md5sum:
-   dh_testdir
-   $(MAKE) -f debian/rules unpatch
-   rm -f $(STAMP_DIR)/check.md5sum
-   $(MAKE) -f debian/rules $(STAMP_DIR)/check.md5sum
-   mv $(STAMP_DIR)/check.md5sum $@
-
-# Internal target. Never invoke directly.
-debian/patches/patched.md5sum:
-   dh_testdir
-   [ -f $(STAMP_DIR)/clean.md5sum ] || \
- $(MAKE) -f debian/rules $(STAMP_DIR)/clean.md5sum
-
-   $(MAKE) -f debian/rules patch
-   rm -f $(STAMP_DIR)/check.md5sum
-   $(MAKE) -f debian/rules $(STAMP_DIR)/check.md5sum
-   if ! diff $(STAMP_DIR)/clean.md5sum \
- $(STAMP_DIR)/check.md5sum > /dev/null; then \
- $(MAKE) -f debian/rules doautoreconf; \
-   else \
- mv $(STAMP_DIR)/check.md5sum $@; \
-   fi
-
-# Internal target. Never invoke directly.
-,PHONY: doautoreconf
-doautoreconf: patch
-   quilt push -a >>$(STAMP_DIR)/log/autoreconf 2>&1 || true
-   if quilt applied | grep ^autoreconf.diff$$ > /dev/null; then \
- quilt pop -a >>$(STAMP_DIR)/log/autoreconf 2>&1; \
- quilt rename -p autoreconf.diff autoreconf-old.diff \
-  >>$(STAMP_DIR)/log/autoreconf 2>&1; \
- quilt delete autoreconf-old.diff >>$(STAMP_DIR)/log/autoreconf 2>&1; \
- quilt push -a >>$(STAMP_DIR)/log/autoreconf 2>&1; \
-   fi
-
-   if [ -e $(RECONF_DIR) ]; then \
- echo "ERROR: $(RECONF_DIR) already exists. Cleanup by hand"; \
- exit 1; \
-   fi
-
-   mkdir -p $(RECONF_DIR)/before
-   find . -maxdepth 1 -mindepth 1 ! -wholename ./$(RECONF_DIR) \
--a ! -wholename ./debian -a ! -wholename ./patches \
--a ! -wholename ./.pc -a ! -wholename ./$(STAMP_DIR) | \
- xargs -i{} cp -al {} $(RECONF_DIR)/before/
-
-   for F in $(RECONF_PRUNEFILES); do \
- find $(RECONF_DIR)/before -name $$F -print | \
-   xargs --no-run-if-empty rm -r; \
-   done
-
-   cp -al $(RECONF_DIR)/before $(RECONF_DIR)/after
-
-   for F in $(RECONF_NOLINKFILES); do \
- find . -wholename ./$(RECONF_DIR) -prune -o -wholename ./debian \
-  -prune -o -wholename ./$(STAMP_DIR) -prune -o -name $$F \
-  -print | \
-   xargs --no-run-if-empty -i{} cp --remove-destination {} \
- $(RECONF_DIR)/after/{}; \
-

xfonts-utils: Changes to 'debian-unstable'

2008-05-10 Thread Julien Cristau 
 debian/changelog|3 
 debian/copyright|  299 +-
 debian/rules|6 
 debian/xfonts-utils.install |2 
 fonttosfnt/COPYING  |   19 
 fonttosfnt/ChangeLog|  315 ++
 fonttosfnt/Makefile.am  |   80 
 fonttosfnt/Makefile.in  |  684 
 fonttosfnt/aclocal.m4   | 1555 +++
 fonttosfnt/config.guess | 1526 ++
 fonttosfnt/config.h.in  |   68 
 fonttosfnt/config.sub   | 1658 +++
 fonttosfnt/configure| 6189 
 fonttosfnt/configure.ac |   51 
 fonttosfnt/depcomp  |  589 
 fonttosfnt/env.c|  151 +
 fonttosfnt/fonttosfnt.c |  118 
 fonttosfnt/fonttosfnt.h |  182 +
 fonttosfnt/fonttosfnt.man   |   77 
 fonttosfnt/install-sh   |  519 +++
 fonttosfnt/missing  |  367 ++
 fonttosfnt/read.c   |  318 ++
 fonttosfnt/struct.c |  514 +++
 fonttosfnt/util.c   |  438 +++
 fonttosfnt/write.c  | 1078 +++
 25 files changed, 16750 insertions(+), 56 deletions(-)

New commits:
commit bbe9d54e23cfd8c286bd49ee3b16e59ada283ff5
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Sun May 11 02:44:32 2008 +0200

Update FSF address in debian/copyright

diff --git a/debian/copyright b/debian/copyright
index 09d98b6..576098b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -253,6 +253,6 @@ License: GPL-2
  .
  You should have received a copy of the GNU General Public License with
  the Debian operating system, in /usr/share/common-licenses/GPL-2;  if
- not, write to the Free Software Foundation, Inc., 59 Temple Place,
- Suite 330, Boston, MA 02111-1307 USA
+ not, write to the Free Software Foundation, Inc., 51 Franklin Street,
+ Fifth Floor, Boston, MA 02110-1301 USA.
 

commit 19d6e3d2b74e555320144e5b5b511f246a47cadd
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Sun May 11 02:36:25 2008 +0200

Add fonttosfnt, version 1.0.4.

diff --git a/debian/changelog b/debian/changelog
index 617a287..57f8d21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xfonts-utils (1:7.4+1) UNRELEASED; urgency=low
   * Add Vcs-* fields
   * Switch to machine-interpretable debian/copyright format
 (http://wiki.debian.org/Proposals/CopyrightFormat).
+  * Add fonttosfnt, version 1.0.4.
 
  -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 07 Mar 2008 17:41:15 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 0f0f74f..09d98b6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -126,6 +126,59 @@ License: BSD-4
  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  POSSIBILITY OF SUCH DAMAGE.
 
+Files: fonttosfnt/*.c, fonttosfnt/*.h
+Copyright: Copyright (c) 2002-2008 by Juliusz Chroboczek
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
+Files: fonttosfnt/env.c
+Copyright: Copyright (c) 1987, 1993 The Regents of the University of 
California.
+ All rights reserved.
+License: BSD-4
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+ 3. All advertising materials mentioning features or use of this software
+must display the following acknowledgement:
+  This product includes software developed by the University of
+  California, Berkeley and its contributors.
+ 4. Neither the name of the University nor the names of its contributors
+may be used to endorse or promote products derived from this software
+without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE REGENT

xfonts-utils: Changes to 'debian-unstable'

2008-05-10 Thread Julien Cristau 
 debian/changelog  |2 -
 debian/copyright  |5 +-
 mkfontscale/COPYING   |2 -
 mkfontscale/ChangeLog |   59 
 mkfontscale/aclocal.m4|   22 ++--
 mkfontscale/config.guess  |6 +--
 mkfontscale/configure |   84 +-
 mkfontscale/configure.ac  |2 -
 mkfontscale/hash.c|2 -
 mkfontscale/ident.c   |1 
 mkfontscale/mkfontscale.c |   27 +-
 11 files changed, 146 insertions(+), 66 deletions(-)

New commits:
commit 7b1233bd2226c36fcdb8510e91baae41a7cb6aba
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Sun May 11 01:12:45 2008 +0200

mkfontscale 1.0.5

diff --git a/debian/changelog b/debian/changelog
index 760eba1..9626aaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 xfonts-utils (1:7.4+1) UNRELEASED; urgency=low
 
   * Change versioning to more or less match X.Org katamaris
-  * mkfontscale 1.0.4
+  * mkfontscale 1.0.5
   * mkfontdir 1.0.4
 + drop 001_mkfontdir_location_fix.diff, fixed upstream
   * Bump Standards-Version to 3.7.3
diff --git a/debian/copyright b/debian/copyright
index dec3ee2..54c4517 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,10 @@
 This package contains the bdftopcf, font-util, mkfontdir and mkfontscale
 utilities downloaded
-from http://xorg.freedesktop.org/releases/individual/font/
+from http://xorg.freedesktop.org/releases/individual/font/ and
+http://xorg.freedesktop.org/releases/individual/app/
 
 Copyright 1987, 1990, 1991, 1993, 1998  The Open Group
-Copyright (c) 2001-2003 by Juliusz Chroboczek
+Copyright (c) 2001-2008 by Juliusz Chroboczek
 Copyright (c) 2002 by Tomohiro KUBOTA
 Copyright (c) 1993 Quarterdeck Office Systems
 Copyright 2002-2004 by Roland Mainz <[EMAIL PROTECTED]>
diff --git a/mkfontscale/COPYING b/mkfontscale/COPYING
index 31965e8..b706b38 100644
--- a/mkfontscale/COPYING
+++ b/mkfontscale/COPYING
@@ -1,4 +1,4 @@
-Copyright (c) 2002-2003 by Juliusz Chroboczek
+Copyright (c) 2002-2008 by Juliusz Chroboczek
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/mkfontscale/ChangeLog b/mkfontscale/ChangeLog
index c6f8dfb..a0001ad 100644
--- a/mkfontscale/ChangeLog
+++ b/mkfontscale/ChangeLog
@@ -1,3 +1,62 @@
+commit 8126d2b694f48cc8137be05705a125f7d02e7e12
+Author: Julien Cristau <[EMAIL PROTECTED]>
+Date:   Sun May 11 00:03:44 2008 +0200
+
+Bump to 1.0.5
+
+commit f131ff40d2b46692c393346110df2567cfa67c29
+Author: Juliusz Chroboczek <[EMAIL PROTECTED]>
+Date:   Sat May 10 23:58:55 2008 +0200
+
+Update copyright date.
+
+commit c322c79c2b9b8d6075b6782d572033cc50799a49
+Author: Juliusz Chroboczek <[EMAIL PROTECTED]>
+Date:   Sat May 10 23:56:33 2008 +0200
+
+Fix handling of OpenType/CFF fonts with embedded bitmaps.
+The old workaround would trigger with CFF fonts with embedded bitmaps.
+We now explicitly check for the font format being TrueType.
+Reported by Andrey V. Panov.
+
+commit 5db9e13aafbed8c0562838005147ebefb12d08ac
+Author: Juliusz Chroboczek <[EMAIL PROTECTED]>
+Date:   Sat May 10 23:37:14 2008 +0200
+
+Remove doubly included header.
+
+commit b0860282c3229d088840fa0758d8473ea6d8813b
+Author: Juliusz Chroboczek <[EMAIL PROTECTED]>
+Date:   Mon Apr 28 19:53:11 2008 +0200
+
+Add bdf and pcf to font priority table.
+This mirrors the behaviour of the old mkfontdir, which prefers pcf to
+bdf fonts.
+
+commit 9c5594ad13e9143e86a7fd94f90858795ae2970b
+Author: Juliusz Chroboczek <[EMAIL PROTECTED]>
+Date:   Mon Apr 28 19:15:05 2008 +0200
+
+Fix typo in mkfontscale.c.
+This spurious break statement disabled checking for Apple and ISO Unicode
+CMaps in SFNT fonts.  Thanks to Alan Coopersmith and Stefan Dirsch.
+
+commit 5ca409f025fb35a20ab1ef4742a9034a36e3d959
+Author: Paulo Cesar Pereira de Andrade <[EMAIL PROTECTED]>
+Date:   Sat Mar 15 18:44:06 2008 -0300
+
+Compile warning fixes.
+
+Include headers for proper prototypes and "ansify" makeHashTable.
+
+Signed-off-by: Alan Coopersmith <[EMAIL PROTECTED]>
+
+commit 47ec1e2697eb856f823cc1b488c6b5a1d2077df9
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date:   Thu Mar 6 16:40:41 2008 -0500
+
+mkfontscale 1.0.4
+
 commit 1cb9c0074c5075bbce63ff3601712f34bbb74ca1
 Author: Adam Jackson <[EMAIL PROTECTED]>
 Date:   Sun Feb 24 21:34:00 2008 -0500
diff --git a/mkfontscale/aclocal.m4 b/mkfontscale/aclocal.m4
index e5b3eb6..5a8f292 100644
--- a/mkfontscale/aclocal.m4
+++ b/mkfontscale/aclocal.m4
@@ -87,14 +87,16 @@ fi])
 # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
 # -
 m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
-pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
-PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-

xfonts-utils: Changes to 'debian-unstable'

2008-03-07 Thread Julien Cristau 
 debian/changelog   |4 
 debian/control |4 
 debian/patches/001_mkfontdir_location_fix.diff |   13 
 debian/patches/series  |1 
 mkfontdir/COPYING  |   49 +-
 mkfontdir/ChangeLog|  217 +-
 mkfontdir/Makefile.am  |   16 
 mkfontdir/Makefile.in  |  135 --
 mkfontdir/aclocal.m4   |  183 
 mkfontdir/config.guess |   32 +
 mkfontdir/config.sub   |   52 ++
 mkfontdir/configure|  129 +++---
 mkfontdir/configure.ac |2 
 mkfontdir/install-sh   |  514 +
 mkfontdir/missing  |   61 +-
 mkfontdir/mkfontdir.man|   20 
 mkfontdir/mkinstalldirs|  158 ---
 17 files changed, 992 insertions(+), 598 deletions(-)

New commits:
commit 0aad0fe92cacab904817ec4ed28328db89796cc3
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 17:56:16 2008 +0100

debian/control updates

Bump Standards-Version to 3.7.3
Add Vcs-* fields

diff --git a/debian/changelog b/debian/changelog
index e9d973c..760eba1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ xfonts-utils (1:7.4+1) UNRELEASED; urgency=low
   * mkfontscale 1.0.4
   * mkfontdir 1.0.4
 + drop 001_mkfontdir_location_fix.diff, fixed upstream
+  * Bump Standards-Version to 3.7.3
+  * Add Vcs-* fields
 
  -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 07 Mar 2008 17:41:15 +0100
 
diff --git a/debian/control b/debian/control
index 6ca7b36..5bfce49 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,9 @@ Priority: optional
 Maintainer: Debian X Strike Force 
 Uploaders: David Nusinow <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL 
PROTECTED]>
 Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, libxfont-dev (>= 
1:1.0.0), libx11-dev (>= 2:1.0.0)
-Standards-Version: 3.7.2.0
+Standards-Version: 3.7.3
+Vcs-Git: git://git.debian.org/git/pkg-xorg/font/xfonts-utils
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/font/xfonts-utils.git
 
 Package: xfonts-utils
 Architecture: any

commit 7778c5a637cebeab4189119a22c1ebc835cd52cd
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 17:53:19 2008 +0100

mkfontdir 1.0.4

drop patch 001_mkfontdir_location_fix.diff, fixed upstream

diff --git a/debian/changelog b/debian/changelog
index 71190d4..e9d973c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ xfonts-utils (1:7.4+1) UNRELEASED; urgency=low
 
   * Change versioning to more or less match X.Org katamaris
   * mkfontscale 1.0.4
+  * mkfontdir 1.0.4
++ drop 001_mkfontdir_location_fix.diff, fixed upstream
 
  -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 07 Mar 2008 17:41:15 +0100
 
diff --git a/debian/patches/001_mkfontdir_location_fix.diff 
b/debian/patches/001_mkfontdir_location_fix.diff
deleted file mode 100644
index 5c8427f..000
--- a/debian/patches/001_mkfontdir_location_fix.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: xfonts-utils/mkfontdir/Makefile.am
-===
 xfonts-utils.orig/mkfontdir/Makefile.am2006-05-08 23:13:04.0 
-0400
-+++ xfonts-utils/mkfontdir/Makefile.am 2006-06-12 22:45:15.0 -0400
-@@ -24,7 +24,7 @@
- appman_PRE = mkfontdir.man
- 
- mkfontdir: mkfontdir.cpp
--  $(SED) s,BINDIR,`echo @bindir@/mkfontscale | $(SED) s,/[^/]*$$,,`, < 
mkfontdir.cpp | $(SED) s/XCOMM/\#/ > $@
-+  $(SED) s,BINDIR,`echo @bindir@/mkfontscale | $(SED) s,/[^/]*$$,,`, < 
${srcdir}/mkfontdir.cpp | $(SED) s/XCOMM/\#/ > $@
- 
- EXTRA_DIST = mkfontdir.cpp
- CLEANFILES = $(bin_SCRIPTS)
diff --git a/debian/patches/series b/debian/patches/series
index 4d4f0eb..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-001_mkfontdir_location_fix.diff
diff --git a/mkfontdir/COPYING b/mkfontdir/COPYING
index 7f33cbf..17251ea 100644
--- a/mkfontdir/COPYING
+++ b/mkfontdir/COPYING
@@ -1,12 +1,45 @@
-This is a stub file.  This package has not yet had its complete licensing
-information compiled.  Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright 1993, 1994, 1998  The Open Group
 
-Please submit updated COPYING files to the Xorg bugzilla:
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
 
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice and this permission notice shall be included
+in all copies or su

xfonts-utils: Changes to 'debian-unstable'

2008-03-07 Thread Julien Cristau 
 debian/changelog|7 
 debian/xsfbs/xsfbs.mk   |   76 
 debian/xsfbs/xsfbs.sh   |7 
 mkfontscale/COPYING |   25 +
 mkfontscale/ChangeLog   |  272 +++--
 mkfontscale/Makefile.am |   10 
 mkfontscale/Makefile.in |  188 ++-
 mkfontscale/aclocal.m4  |  238 --
 mkfontscale/compile |   99 --
 mkfontscale/config.guess|  701 +---
 mkfontscale/config.h.in |9 
 mkfontscale/config.sub  |  278 +
 mkfontscale/configure   |  268 +---
 mkfontscale/configure.ac|4 
 mkfontscale/depcomp |  188 +--
 mkfontscale/hash.c  |   42 --
 mkfontscale/install-sh  |  659 +++--
 mkfontscale/missing |  193 +++-
 mkfontscale/mkfontscale.c   |4 
 mkfontscale/mkfontscale.man |   19 -
 mkfontscale/mkinstalldirs   |  111 --
 21 files changed, 2045 insertions(+), 1353 deletions(-)

New commits:
commit 0fee501d57ec3e2a2992f5aa6fd6e8c653cb2a43
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 7 17:43:01 2008 +0100

mkfontscale 1.0.4

diff --git a/debian/changelog b/debian/changelog
index d099cbd..71190d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xfonts-utils (1:7.4+1) UNRELEASED; urgency=low
+
+  * Change versioning to more or less match X.Org katamaris
+  * mkfontscale 1.0.4
+
+ -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 07 Mar 2008 17:41:15 +0100
+
 xfonts-utils (1:1.0.1-2) unstable; urgency=low
 
   * update-fonts-{alias,dir,scale}: stop messing with X11R6 dirs
diff --git a/mkfontscale/COPYING b/mkfontscale/COPYING
index 7f33cbf..31965e8 100644
--- a/mkfontscale/COPYING
+++ b/mkfontscale/COPYING
@@ -1,12 +1,19 @@
-This is a stub file.  This package has not yet had its complete licensing
-information compiled.  Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright (c) 2002-2003 by Juliusz Chroboczek
 
-Please submit updated COPYING files to the Xorg bugzilla:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
-
-http://lists.freedesktop.org/mailman/listinfo/xorg
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/mkfontscale/ChangeLog b/mkfontscale/ChangeLog
index 4498be4..c6f8dfb 100644
--- a/mkfontscale/ChangeLog
+++ b/mkfontscale/ChangeLog
@@ -1,31 +1,265 @@
-2005-12-20  Kevin E. Martin  
+commit 1cb9c0074c5075bbce63ff3601712f34bbb74ca1
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date:   Sun Feb 24 21:34:00 2008 -0500
 
-   * configure.ac:
-   Update package version for X11R7 release.
+Bug #11337: Use strcasecmp() instead of broken open-coded version.
+
+Also, use tolower() instead of broken open-coded version.
 
-2005-12-14  Kevin E. Martin  
+commit 11651914cb1700528524bd3aabe2372629ce86c8
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date:   Mon Jan 7 14:28:30 2008 -0800
 
-   * configure.ac:
-   Update package version number for final X11R7 release candidate.
+Fix typo in man page
 
-2005-12-06  Kevin E. Martin  
+commit 963552c24bf90610f2b3e2e77277ad77e2b21210
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date:   Mon Jan 7 14:26:56 2008 -0800
 
-   * Makefile.am:
-   Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+Convert (1) to (__appmansuffix__) in man page
 
-2005-12-03  Kevin E. Martin  
+commit 3e8bfcc4d87cd26b9426be1ab8941e1a8d709d3c
+Author: James Cloos <[EMAIL PROTECTED]>
+Date:   Thu Dec 6 16:37:03 2007 -0500
 
-   * configure.ac:
-   Update package version number for X11R7 RC3 release.
+Replace static ChangeLog with dist-hook to generate from git log
 
-2005-11-19  Kevin E. Martin  
+commit d59c58bc3e09fd4adf773cd2e0a8c8c0e6018b08
+Author: James Cloos <[EMAIL PROTECTED]>
+Date:   Mon Sep 3 05:51:05 2

xfonts-utils: Changes to 'debian-unstable'

2007-07-27 Thread Julien Cristau 
 debian/changelog|5 
 debian/control  |2 
 mkfontdir/Makefile.in   |2 
 mkfontdir/aclocal.m4|   22 +
 mkfontdir/config.guess  |  685 +++-
 mkfontdir/config.sub|  240 
 mkfontdir/configure |   23 +
 mkfontdir/install-sh|  477 +
 mkfontdir/missing   |  142 +
 mkfontdir/mkinstalldirs |   89 --
 10 files changed, 1028 insertions(+), 659 deletions(-)

New commits:
commit dfe37492aa49a1bc0db167f502fa275b12974387
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Jul 27 17:33:12 2007 +0200

Prepare changelog for upload, update Uploaders.

Add myself to Uploaders, remove Branden and Fabio with their permission.

diff --git a/debian/changelog b/debian/changelog
index 552d6ff..d099cbd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-xfonts-utils (1:1.0.1-2) UNRELEASED; urgency=low
+xfonts-utils (1:1.0.1-2) unstable; urgency=low
 
   * update-fonts-{alias,dir,scale}: stop messing with X11R6 dirs
 (closes: #389085).
   * Add upstream URL to debian/copyright (closes: #434289).  Thanks, Josip
 Rodin!
+  * Add myself to uploaders, remove Branden and Fabio with their permission.
 
- -- Julien Cristau <[EMAIL PROTECTED]>  Wed, 25 Jul 2007 01:41:41 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 27 Jul 2007 17:39:43 +0200
 
 xfonts-utils (1:1.0.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 2656896..6ca7b36 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xfonts-utils
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
-Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL 
PROTECTED]>, Fabio M. Di Nitto <[EMAIL PROTECTED]>
+Uploaders: David Nusinow <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL 
PROTECTED]>
 Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, libxfont-dev (>= 
1:1.0.0), libx11-dev (>= 2:1.0.0)
 Standards-Version: 3.7.2.0
 

commit 3af987307d7f28b4d9bb2fd6a36bc46d295ad58d
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Jul 27 17:30:31 2007 +0200

Run autoreconf in mkfontdir with patch applied.

mkfontdir.cpp was not found in the build dir, so we installed an empty
/usr/bin/mkfontdir.

diff --git a/mkfontdir/Makefile.in b/mkfontdir/Makefile.in
index ad98a64..b37f257 100644
--- a/mkfontdir/Makefile.in
+++ b/mkfontdir/Makefile.in
@@ -506,7 +506,7 @@ uninstall-am: uninstall-appmanDATA uninstall-binSCRIPTS \
 
 
 mkfontdir: mkfontdir.cpp
-   $(SED) s,BINDIR,`echo @bindir@/mkfontscale | $(SED) s,/[^/]*$$,,`, < 
mkfontdir.cpp | $(SED) s/XCOMM/\#/ > $@
+   $(SED) s,BINDIR,`echo @bindir@/mkfontscale | $(SED) s,/[^/]*$$,,`, < 
${srcdir}/mkfontdir.cpp | $(SED) s/XCOMM/\#/ > $@
 
 .man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
diff --git a/mkfontdir/aclocal.m4 b/mkfontdir/aclocal.m4
index 4c3f42f..107c1d2 100644
--- a/mkfontdir/aclocal.m4
+++ b/mkfontdir/aclocal.m4
@@ -58,7 +58,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 
's/\..*$//'`
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 
's/^[0-9]*\.//' -e 's/\..*$//'`]
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least 
${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
-   [XORG_MACROS_version=1.1.2
+   [XORG_MACROS_version=1.1.5
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' 
-e 's/\..*$//'`]
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
@@ -462,7 +462,8 @@ dnl
 # 
 # Adds --with/without-release-string and changes the PACKAGE and
 # PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION".  If
-# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged.
+# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged.  Also
+# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
  
 AC_DEFUN([XORG_RELEASE_VERSION],[
AC_ARG_WITH(release-version,
@@ -475,6 +476,23 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
AC_MSG_NOTICE([Building with package name set to $PACKAGE])
fi
+   AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
+   [`echo $PACKAGE_VERSION | cut -d . -f 1`],
+   [Major version of this package])
+   PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+   if test "x$PVM" = "x"; then
+   PVM="0"
+   fi
+   AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
+   [$PVM],
+   [Minor version of this package])
+   PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+   if test "x$PVP" = "x"; then
+   PVP="0"
+   fi
+   AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVE

xfonts-utils: Changes to 'debian-unstable'

2007-07-24 Thread Julien Cristau 
 debian/changelog |4 
 debian/copyright |4 
 debian/local/update-fonts-alias  |   37 -
 debian/local/update-fonts-scale  |   52 --
 debian/xsfbs/xsfbs-autoreconf.mk |  150 ++
 debian/xsfbs/xsfbs.mk|  388 
 debian/xsfbs/xsfbs.sh|  907 +++
 7 files changed, 1488 insertions(+), 54 deletions(-)

New commits:
commit 5334becaa7a698061af67f705210fa310386bc97
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Wed Jul 25 02:05:29 2007 +0200

Further cleanup of update-fonts-alias and update-fonts-scale.

Unroll some loops which only ran once since the transition code
for /usr/X11R6 was dropped.

diff --git a/debian/local/update-fonts-alias b/debian/local/update-fonts-alias
index baf6159..508e313 100644
--- a/debian/local/update-fonts-alias
+++ b/debian/local/update-fonts-alias
@@ -119,14 +119,11 @@ while [ -n "$1" ]; do
 fi
 
 VALIDDEST=
-for DIR in "$X11R7DIR"; do
-[ -n "$DIR" ] || continue
-if [ -d "$DIR" ]; then
+if [ -d "$X11R7DIR" ]; then
 VALIDDEST=yes
-else
-warn "$DIR does not exist or is not a directory"
-fi
-done
+else
+warn "$X11R7DIR does not exist or is not a directory"
+fi
 
 if [ -z "$VALIDSRC" ] || [ -z "$VALIDDEST" ]; then
 continue
@@ -135,34 +132,28 @@ while [ -n "$1" ]; do
 # Are there any files to process?
 if [ "$(echo "$ETCDIR"/*.alias "$ETC7DIR"/*.alias)" != "$ETCDIR/*.alias 
$ETC7DIR/*.alias" ]
 then
-for XDIR in "$X11R7DIR"; do
-if [ -z "$XDIR" ] || ! [ -d "$XDIR" ]; then
-continue
-fi
+if [ -n "$X11R7DIR" ] && [ -d "$X11R7DIR" ]; then
 # Write the new alias file in a temporary location in case we are
 # interrupted.
-cat >"$XDIR/fonts.alias.update-new" <"$X11R7DIR/fonts.alias.update-new" <>"$XDIR/fonts.alias.update-new"
-cat "$FILE" >>"$XDIR/fonts.alias.update-new"
+echo "!! $FILE" >>"$X11R7DIR/fonts.alias.update-new"
+cat "$FILE" >>"$X11R7DIR/fonts.alias.update-new"
 done
-mv "$XDIR/fonts.alias.update-new" "$XDIR/fonts.alias"
-done
+mv "$X11R7DIR/fonts.alias.update-new" "$X11R7DIR/fonts.alias"
+fi
 else
-for XDIR in "$X11R7DIR"; do
-if [ -z "$XDIR" ] || ! [ -d "$XDIR" ]; then
-continue
-fi
+if [ -n "$X11R7DIR" ] && [ -d "$X11R7DIR" ]; then
 # There are no files to process; remove any alias file already in
 # the font directory.
-rm -f "$XDIR/fonts.alias"
+rm -f "$X11R7DIR/fonts.alias"
 # Remove the font directory if it is empty.
-rmdir "$XDIR" >/dev/null 2>&1 || true
-done
+rmdir "$X11R7DIR" >/dev/null 2>&1 || true
+fi
 fi
 done
 
diff --git a/debian/local/update-fonts-scale b/debian/local/update-fonts-scale
index 01f861c..163d550 100644
--- a/debian/local/update-fonts-scale
+++ b/debian/local/update-fonts-scale
@@ -126,14 +126,11 @@ while [ -n "$1" ]; do
 fi
 
 VALIDDEST=
-for DIR in "$X11R7DIR"; do
-[ -n "$DIR" ] || continue
-if [ -d "$DIR" ]; then
-VALIDDEST=yes
-else
-warn "$DIR does not exist or is not a directory"
-fi
-done
+if [ -d "$X11R7DIR" ]; then
+VALIDDEST=yes
+else
+warn "$X11R7DIR does not exist or is not a directory"
+fi
 
 if [ -z "$VALIDSRC" ] || [ -z "$VALIDDEST" ]; then
 continue
@@ -142,10 +139,7 @@ while [ -n "$1" ]; do
 # Are there any files to process?
 if [ "$(echo "$ETCDIR"/*.scale "$ETC7DIR"/*.scale)" != "$ETCDIR/*.scale 
$ETC7DIR/*.scale" ]
 then
-for XDIR in "$X11R7DIR"; do
-if [ -z "$XDIR" ] || ! [ -d "$XDIR" ]; then
-continue
-fi
+if [ -n "$X11R7DIR" ] && [ -d "$X11R7DIR" ]; then
 for SCALEFILE in "$ETCDIR"/*.scale "$ETC7DIR"/*.scale; do
 [ -e "$SCALEFILE" ] || continue
 # Only write fonts to the .scale file that actually exist, so
@@ -156,42 +150,40 @@ while [ -n "$1" ]; do
 # XXX: This technique will be tricked into yielding false
 # negatives if the font filename has whitespace in it.
 while read FONTFILE FONTNAME; do
-if [ -f "$XDIR/$FONTFILE" ]; then
+if [ -f "$X11R7DIR/$FONTFILE" ]; then
 echo "$FONTFILE $FONTNAME" \
-  >>"$XDIR/fonts.scale.update-tmp"
+  >>"$X11R7DIR/fonts.scale.update-tmp"
 else
 trace "$SCALEFILE references nonexistent font file" \
   "$FONTFILE; skipping"
 fi

xfonts-utils: Changes to 'debian-unstable'

2007-03-30 Thread Julien Cristau 
 debian/changelog|7 +++
 debian/local/update-fonts-alias |7 +++
 debian/local/update-fonts-dir   |2 +-
 debian/local/update-fonts-scale |7 +++
 4 files changed, 14 insertions(+), 9 deletions(-)

New commits:
commit 0c226357e648fbace0cd85daadfbe5577c74e2e8
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 30 16:09:22 2007 +0200

* update-fonts-{alias,dir,scale}: stop messing with X11R6 dirs
  (closes: #389085).

diff --git a/debian/changelog b/debian/changelog
index 094654e..6c6262a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xfonts-utils (1:1.0.1-2) UNRELEASED; urgency=low
+
+  * update-fonts-{alias,dir,scale}: stop messing with X11R6 dirs
+(closes: #389085).
+
+ -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 30 Mar 2007 16:08:45 +0200
+
 xfonts-utils (1:1.0.1-1) unstable; urgency=low
 
   * Internal directory name cleanup. This requires a new .orig.tar.gz for
diff --git a/debian/local/update-fonts-alias b/debian/local/update-fonts-alias
index ad829df..baf6159 100644
--- a/debian/local/update-fonts-alias
+++ b/debian/local/update-fonts-alias
@@ -96,7 +96,6 @@ while [ -n "$1" ]; do
 else
 # No; a relative path was provided -- assume we were given just the
 # basename.
-X11R6DIR=/usr/lib/X11/fonts/$1
 X11R7DIR=/usr/share/fonts/X11/$1
 ETCDIR=/etc/X11/fonts/$1
 ETC7DIR=/etc/X11/fonts/X11R7/$1
@@ -120,7 +119,7 @@ while [ -n "$1" ]; do
 fi
 
 VALIDDEST=
-for DIR in "$X11R7DIR" "$X11R6DIR"; do
+for DIR in "$X11R7DIR"; do
 [ -n "$DIR" ] || continue
 if [ -d "$DIR" ]; then
 VALIDDEST=yes
@@ -136,7 +135,7 @@ while [ -n "$1" ]; do
 # Are there any files to process?
 if [ "$(echo "$ETCDIR"/*.alias "$ETC7DIR"/*.alias)" != "$ETCDIR/*.alias 
$ETC7DIR/*.alias" ]
 then
-for XDIR in "$X11R7DIR" "$X11R6DIR"; do
+for XDIR in "$X11R7DIR"; do
 if [ -z "$XDIR" ] || ! [ -d "$XDIR" ]; then
 continue
 fi
@@ -154,7 +153,7 @@ EOF
 mv "$XDIR/fonts.alias.update-new" "$XDIR/fonts.alias"
 done
 else
-for XDIR in "$X11R7DIR" "$X11R6DIR"; do
+for XDIR in "$X11R7DIR"; do
 if [ -z "$XDIR" ] || ! [ -d "$XDIR" ]; then
 continue
 fi
diff --git a/debian/local/update-fonts-dir b/debian/local/update-fonts-dir
index 7ccdd36..5a327e7 100644
--- a/debian/local/update-fonts-dir
+++ b/debian/local/update-fonts-dir
@@ -102,7 +102,7 @@ while [ -n "$1" ]; do
 else
 # No; a relative path was provided -- assume we were given just the
 # basename.
-   XDIRS="/usr/share/fonts/X11/$1 /usr/lib/X11/fonts/$1"
+   XDIRS="/usr/share/fonts/X11/$1"
 fi
 # Confirm that the directories to be operated on exist.
 for XDIR in $XDIRS; do
diff --git a/debian/local/update-fonts-scale b/debian/local/update-fonts-scale
index 8d6c6f1..01f861c 100644
--- a/debian/local/update-fonts-scale
+++ b/debian/local/update-fonts-scale
@@ -103,7 +103,6 @@ while [ -n "$1" ]; do
 else
 # No; a relative path was provided -- assume we were given just the
 # basename.
-X11R6DIR=/usr/lib/X11/fonts/$1
 X11R7DIR=/usr/share/fonts/X11/$1
 ETCDIR=/etc/X11/fonts/$1
 ETC7DIR=/etc/X11/fonts/X11R7/$1
@@ -127,7 +126,7 @@ while [ -n "$1" ]; do
 fi
 
 VALIDDEST=
-for DIR in "$X11R7DIR" "$X11R6DIR"; do
+for DIR in "$X11R7DIR"; do
 [ -n "$DIR" ] || continue
 if [ -d "$DIR" ]; then
 VALIDDEST=yes
@@ -143,7 +142,7 @@ while [ -n "$1" ]; do
 # Are there any files to process?
 if [ "$(echo "$ETCDIR"/*.scale "$ETC7DIR"/*.scale)" != "$ETCDIR/*.scale 
$ETC7DIR/*.scale" ]
 then
-for XDIR in "$X11R7DIR" "$X11R6DIR"; do
+for XDIR in "$X11R7DIR"; do
 if [ -z "$XDIR" ] || ! [ -d "$XDIR" ]; then
 continue
 fi
@@ -183,7 +182,7 @@ while [ -n "$1" ]; do
 fi
 done
 else
-for XDIR in "$X11R7DIR" "$X11R6DIR"; do
+for XDIR in "$X11R7DIR"; do
 if [ -z "$XDIR" ] || ! [ -d "$XDIR" ]; then
 continue
 fi


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

xfonts-utils: Changes to 'debian-unstable'

2007-02-06 Thread David Nusinow 
New branch 'debian-unstable' available with the following commits:
commit d3ad511cb3888487fd9ea526861167f1ed139286
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Tue Feb 6 21:16:46 2007 -0500

Autoreconf

commit f3eb60a846c0eae93522023ca6bad1f6d6fac791
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Tue Feb 6 21:14:54 2007 -0500

Add files that were lost in the conversion to git

commit c855cc050a58f5eee8c440c42124ccc29397cbfe
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Sat Oct 14 16:08:21 2006 +

* Internal directory name cleanup. This requires a new .orig.tar.gz for
  cleanliness, so version bump.
* Update patch 01 to only include Makefile.am, not Makefile.in patch.
  autoreconf with the patch applied.

commit 5d6c9e9fa144f88a5b1ec8730e100230b2756d3a
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Sat Oct 14 15:46:26 2006 +

Add closer

commit 11f6a44e1bf67a3a04c5c22bff3987f72b094d60
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Sat Oct 14 15:45:37 2006 +

* Internal directory name cleanup
* Autoreconf to fix manpage suffix issues. Should now build properly on
  hurd, kfreebsd, and friends. Thanks Samuel Thibault and Michael Bank.
  Closes: #358702

commit 45a00ddfb3310b311279da1f1a53260f3261e3b7
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Tue Jun 13 04:28:55 2006 +

* Put x11-common back to Depends and unversion it to avoid the unholy
  wrath of vorlon. Urgency still medium for the fixes in -5

commit a262f79779c10d1c88303f2e15bc9753c20dce7d
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Tue Jun 13 02:55:43 2006 +

Fix install file for manpage suffixes

commit 0dd9246d9550f5176688d238140ebe01eec77e60
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Tue Jun 13 02:49:10 2006 +

* Autoreconf all dirs to fix manpage suffix bug

commit 1bd907729492fd7c5d1fc43047c7c7989614adbd
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Tue Jun 13 02:37:03 2006 +

Typofix

commit e66d6431dce7fe7f1a17aa5191c4ae8a0dea187d
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Tue Jun 13 02:22:37 2006 +

* Version x11-common dep and move it to pre-dependency
* Bump standards version to 3.7.2.0
* Bump debhelper compat version to 5

commit f61d5acbff8bb6dfd567acf889715be27a410d9d
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Tue Jun 13 01:46:19 2006 +

Prepare changelog for release

commit 869e4dbf63a1bcaadc481b9ecb713e227da50e2a
Author: Steve Langasek <[EMAIL PROTECTED]>
Date:   Mon Jun 12 10:53:32 2006 +

minor fix-up of a shell syntax oops

commit 0784f0785c0afbddb84c2d18bb7ebade8b8b97f9
Author: Steve Langasek <[EMAIL PROTECTED]>
Date:   Mon Jun 12 09:09:28 2006 +

Update update-fonts-dir to operate on both the old and new font
paths, regardless of arguments passed, to allow automatic clean-up
of the old fonts.dir files.  Closes: #372858.

commit 0b68df1395cc33c1b98c2988a6dd4ef6e60ed210
Author: Steve Langasek <[EMAIL PROTECTED]>
Date:   Mon Jun 12 08:16:24 2006 +

Further fixes to update-fonts-scale to ensure we *remove* any
old files in the event that there are no longer fonts with which to
populate fonts.scale.

commit f5547606d98e1eede87a45b170a97b9a1a8cc134
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Tue May 9 04:53:27 2006 +

* Fix up update-fonts-alias and update-fonts-scale to cope with
  files in /etc/X11/fonts/$type/ pointing to font files in either
  /usr/share/fonts/X11 or /usr/X11R6/lib/X11/fonts, eliminating some
  unnecessary transition work for font package maintainers;
  update-fonts-{alias,scale} will in addition check
  /etc/X11/fonts/X11R7/$type/ when called with -7, for transitional
  purposes only.  Closes: #364530.

commit c6c15accbe85f6092572edbaeca656f73bb17d74
Author: Steve Langasek <[EMAIL PROTECTED]>
Date:   Sat May 6 05:58:29 2006 +

commit missing changelog entry...

commit 7b7b1b58621d029d676a1ba8930756d32760b3b8
Author: Steve Langasek <[EMAIL PROTECTED]>
Date:   Sat May 6 05:52:20 2006 +

clean up package directory names in the 'font' heirarchy


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]