Author: dnusinow
Date: 2006-09-30 17:06:35 -0400 (Sat, 30 Sep 2006)
New Revision: 3579
Added:
trunk/font/xfonts-scalable/debian/xfonts-scalable.preinst.in
Modified:
trunk/font/xfonts-scalable/debian/changelog
trunk/font/xfonts-scalable/debian/compat
trunk/font/xfonts-scalable/debian/control
trunk/font/xfonts-scalable/debian/rules
trunk/font/xfonts-scalable/debian/xfonts-scalable.install
trunk/font/xfonts-scalable/debian/xfonts-scalable.postinst.in
trunk/font/xfonts-scalable/debian/xfonts-scalable.postrm.in
Log:
* Drop X11R7 from scale file install path.
* Build with --with-fontdir.
* Drop fonts.scale and fonts.dir from binary package. This is serious
policy violation, thus raised urgency. (Closes: #389808).
* Bump policy to 3.7.2 (now we are compliant).
* Remove unused debhelper helpers.
* Build package in binary-indep, not in binary-arch.
* Bump debhelper compat to 5 and build-depends to >= 5.0.31
* Remove Fabio from uploaders with his permission. He's always welcome back.
Modified: trunk/font/xfonts-scalable/debian/changelog
===================================================================
--- trunk/font/xfonts-scalable/debian/changelog 2006-09-30 21:06:23 UTC (rev
3578)
+++ trunk/font/xfonts-scalable/debian/changelog 2006-09-30 21:06:35 UTC (rev
3579)
@@ -1,3 +1,20 @@
+xfonts-scalable (1:1.0.0-5) unstable; urgency=medium
+
+ [ Eugene Konev ]
+ * Drop X11R7 from scale file install path.
+ * Build with --with-fontdir.
+ * Drop fonts.scale and fonts.dir from binary package. This is serious
+ policy violation, thus raised urgency. (Closes: #389808).
+ * Bump policy to 3.7.2 (now we are compliant).
+ * Remove unused debhelper helpers.
+ * Build package in binary-indep, not in binary-arch.
+
+ [ David Nusinow ]
+ * Bump debhelper compat to 5 and build-depends to >= 5.0.31
+ * Remove Fabio from uploaders with his permission. He's always welcome back.
+
+ -- David Nusinow <[EMAIL PROTECTED]> Sat, 30 Sep 2006 16:48:47 -0400
+
xfonts-scalable (1:1.0.0-4) unstable; urgency=low
* Add xfonts-utils to build-depends. Thanks Daniel Schepler.
Modified: trunk/font/xfonts-scalable/debian/compat
===================================================================
--- trunk/font/xfonts-scalable/debian/compat 2006-09-30 21:06:23 UTC (rev
3578)
+++ trunk/font/xfonts-scalable/debian/compat 2006-09-30 21:06:35 UTC (rev
3579)
@@ -1 +1 @@
-4
+5
Modified: trunk/font/xfonts-scalable/debian/control
===================================================================
--- trunk/font/xfonts-scalable/debian/control 2006-09-30 21:06:23 UTC (rev
3578)
+++ trunk/font/xfonts-scalable/debian/control 2006-09-30 21:06:35 UTC (rev
3579)
@@ -2,9 +2,9 @@
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL
PROTECTED]>, Fabio M. Di Nitto <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), pkg-config, xutils, xfonts-utils,
fontconfig
-Standards-Version: 3.6.1.0
+Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL
PROTECTED]>
+Build-Depends: debhelper (>= 5.0.31), pkg-config, xutils, xfonts-utils,
fontconfig
+Standards-Version: 3.7.2
Package: xfonts-scalable
Architecture: all
Modified: trunk/font/xfonts-scalable/debian/rules
===================================================================
--- trunk/font/xfonts-scalable/debian/rules 2006-09-30 21:06:23 UTC (rev
3578)
+++ trunk/font/xfonts-scalable/debian/rules 2006-09-30 21:06:35 UTC (rev
3579)
@@ -40,6 +40,7 @@
cd obj-$(DEB_BUILD_GNU_TYPE) && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
+ --with-fontdir=/usr/share/fonts/X11/Type1 \
CFLAGS="$(CFLAGS)"
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
@@ -66,29 +67,26 @@
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp
install
install -D -m644 debian/fonts.scale \
- debian/tmp/etc/X11/fonts/X11R7/Type1/xfonts-scalable.scale
+ debian/tmp/etc/X11/fonts/Type1/xfonts-scalable.scale
# Build architecture-dependent files here.
binary-arch: build install
+# Nothing to do
+
+# Build architecture-independent files here.
+binary-indep: build install
dh_testdir
dh_testroot
dh_installdocs
- dh_install --sourcedir=debian/tmp
+ dh_install --sourcedir=debian/tmp --fail-missing --exclude=fonts.dir
--exclude=fonts.scale
dh_installchangelogs
- dh_link
dh_compress
dh_fixperms
dh_installdeb
- dh_shlibdeps
- dh_makeshlibs
dh_gencontrol
dh_md5sums
dh_builddeb
-# Build architecture-independent files here.
-binary-indep: build install
-# Nothing to do
-
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
Modified: trunk/font/xfonts-scalable/debian/xfonts-scalable.install
===================================================================
--- trunk/font/xfonts-scalable/debian/xfonts-scalable.install 2006-09-30
21:06:23 UTC (rev 3578)
+++ trunk/font/xfonts-scalable/debian/xfonts-scalable.install 2006-09-30
21:06:35 UTC (rev 3579)
@@ -1,2 +1,17 @@
-etc/X11/fonts/X11R7/Type1/xfonts-scalable.scale
-usr/lib/X11/fonts/Type1/* usr/share/fonts/X11/Type1
+etc/X11/fonts/Type1/xfonts-scalable.scale
+usr/share/fonts/X11/Type1/c0649bt_.pfb
+usr/share/fonts/X11/Type1/c0419bt_.pfb
+usr/share/fonts/X11/Type1/c0649bt_.afm
+usr/share/fonts/X11/Type1/c0419bt_.afm
+usr/share/fonts/X11/Type1/c0633bt_.afm
+usr/share/fonts/X11/Type1/c0611bt_.pfb
+usr/share/fonts/X11/Type1/c0632bt_.pfb
+usr/share/fonts/X11/Type1/c0582bt_.afm
+usr/share/fonts/X11/Type1/c0648bt_.pfb
+usr/share/fonts/X11/Type1/c0648bt_.afm
+usr/share/fonts/X11/Type1/c0611bt_.afm
+usr/share/fonts/X11/Type1/c0632bt_.afm
+usr/share/fonts/X11/Type1/c0583bt_.pfb
+usr/share/fonts/X11/Type1/c0582bt_.pfb
+usr/share/fonts/X11/Type1/c0633bt_.pfb
+usr/share/fonts/X11/Type1/c0583bt_.afm
Modified: trunk/font/xfonts-scalable/debian/xfonts-scalable.postinst.in
===================================================================
--- trunk/font/xfonts-scalable/debian/xfonts-scalable.postinst.in
2006-09-30 21:06:23 UTC (rev 3578)
+++ trunk/font/xfonts-scalable/debian/xfonts-scalable.postinst.in
2006-09-30 21:06:35 UTC (rev 3579)
@@ -16,6 +16,8 @@
#DEBHELPER#
+remove_conffile_commit /etc/X11/fonts/X11R7/Type1/xfonts-scalable.scale
+
FONTDIRS="Type1"
UPDATECMDS="update-fonts-scale update-fonts-alias"
Modified: trunk/font/xfonts-scalable/debian/xfonts-scalable.postrm.in
===================================================================
--- trunk/font/xfonts-scalable/debian/xfonts-scalable.postrm.in 2006-09-30
21:06:23 UTC (rev 3578)
+++ trunk/font/xfonts-scalable/debian/xfonts-scalable.postrm.in 2006-09-30
21:06:35 UTC (rev 3579)
@@ -16,6 +16,10 @@
#DEBHELPER#
+if [ "$1" = "abort-install" ] || [ "$1" = "abort-upgrade" ]; then
+ remove_conffile_rollback /etc/X11/fonts/X11R7/Type1/xfonts-scalable.scale
+fi
+
if [ "$1" = "purge" ] || [ "$1" = "remove" ] || [ "$1" = "disappear" ]; then
FONTDIRS="Type1"
UPDATECMDS="update-fonts-scale update-fonts-alias"
Added: trunk/font/xfonts-scalable/debian/xfonts-scalable.preinst.in
===================================================================
--- trunk/font/xfonts-scalable/debian/xfonts-scalable.preinst.in
(rev 0)
+++ trunk/font/xfonts-scalable/debian/xfonts-scalable.preinst.in
2006-09-30 21:06:35 UTC (rev 3579)
@@ -0,0 +1,22 @@
+#!/bin/sh
+# Debian xfonts-scalable package pre-installation script
+
+# $Id$
+
+set -e
+
+THIS_PACKAGE=xfonts-scalable
+THIS_SCRIPT=preinst
+
+#INCLUDE_SHELL_LIB#
+
+if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
+ if dpkg --compare-versions "$2" lt "1:1.0.0-5"; then
+ remove_conffile_prepare /etc/X11/fonts/X11R7/Type1/xfonts-scalable.scale \
+ b579d5c7759383647c486da590d60815
+ fi
+fi
+
+exit 0
+
+# vim:ai:et:sts=2:sw=2:tw=0:
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
