Author: dnusinow
Date: 2006-09-30 17:04:25 -0400 (Sat, 30 Sep 2006)
New Revision: 3572
Added:
trunk/font/xfonts-100dpi/debian/xfonts-100dpi.preinst.in
Modified:
trunk/font/xfonts-100dpi/debian/changelog
trunk/font/xfonts-100dpi/debian/compat
trunk/font/xfonts-100dpi/debian/control
trunk/font/xfonts-100dpi/debian/rules
trunk/font/xfonts-100dpi/debian/xfonts-100dpi-transcoded.install
trunk/font/xfonts-100dpi/debian/xfonts-100dpi-transcoded.postinst.in
trunk/font/xfonts-100dpi/debian/xfonts-100dpi-transcoded.postrm.in
trunk/font/xfonts-100dpi/debian/xfonts-100dpi.install
trunk/font/xfonts-100dpi/debian/xfonts-100dpi.postinst.in
trunk/font/xfonts-100dpi/debian/xfonts-100dpi.postrm.in
Log:
* Drop X11R7 from aliases install path.
* Switch to dh_installxfonts.
* Drop fonts.scale from xfonts-100dpi-transcoded. This is serious policy
violation, thus raised urgency.
* 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-dep on it to >= 5.0.31.
* Remove Fabio from uploaders with his permission. He's always welcome back.
Modified: trunk/font/xfonts-100dpi/debian/changelog
===================================================================
--- trunk/font/xfonts-100dpi/debian/changelog 2006-09-30 18:42:10 UTC (rev
3571)
+++ trunk/font/xfonts-100dpi/debian/changelog 2006-09-30 21:04:25 UTC (rev
3572)
@@ -1,3 +1,20 @@
+xfonts-100dpi (1:1.0.0-3) unstable; urgency=medium
+
+ [ Eugene Konev ]
+ * Drop X11R7 from aliases install path.
+ * Switch to dh_installxfonts.
+ * Drop fonts.scale from xfonts-100dpi-transcoded. This is serious policy
+ violation, thus raised urgency.
+ * 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-dep on it 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:33:39 -0400
+
xfonts-100dpi (1:1.0.0-2) experimental; urgency=low
* Add versioned xfonts-utils build-depend. Thanks Daniel Schepler.
Modified: trunk/font/xfonts-100dpi/debian/compat
===================================================================
--- trunk/font/xfonts-100dpi/debian/compat 2006-09-30 18:42:10 UTC (rev
3571)
+++ trunk/font/xfonts-100dpi/debian/compat 2006-09-30 21:04:25 UTC (rev
3572)
@@ -1 +1 @@
-4
+5
Modified: trunk/font/xfonts-100dpi/debian/control
===================================================================
--- trunk/font/xfonts-100dpi/debian/control 2006-09-30 18:42:10 UTC (rev
3571)
+++ trunk/font/xfonts-100dpi/debian/control 2006-09-30 21:04:25 UTC (rev
3572)
@@ -2,13 +2,13 @@
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 (>=
1:1.0.0-3)
-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 (>=
1:1.0.0-3)
+Standards-Version: 3.7.2
Package: xfonts-100dpi
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, xfonts-utils
+Depends: ${misc:Depends}
Suggests: xfs | xserver
Description: 100 dpi fonts for X
xfonts-100dpi provides a set of bitmapped fonts at 100 dots per inch. In
@@ -29,7 +29,7 @@
Package: xfonts-100dpi-transcoded
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, xfonts-utils
+Depends: ${misc:Depends}
Suggests: xfs | xserver
Description: 100 dpi fonts for X (transcoded from ISO 10646-1)
xfonts-100dpi-transcoded provides a set of bitmapped fonts at 100 dots per
Modified: trunk/font/xfonts-100dpi/debian/rules
===================================================================
--- trunk/font/xfonts-100dpi/debian/rules 2006-09-30 18:42:10 UTC (rev
3571)
+++ trunk/font/xfonts-100dpi/debian/rules 2006-09-30 21:04:25 UTC (rev
3572)
@@ -76,30 +76,27 @@
cd ..; \
done
install -D -m644 debian/fonts.alias \
- debian/tmp/etc/X11/fonts/X11R7/100dpi/xfonts-100dpi.alias
+ debian/tmp/etc/X11/fonts/100dpi/xfonts-100dpi.alias
# 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 --fail-missing --exclude fonts.dir
+ dh_install --sourcedir=debian/tmp --fail-missing --exclude fonts.dir
--exclude fonts.scale
+ dh_installxfonts
dh_installchangelogs
- dh_link
- dh_strip --dbg-package=$(PACKAGE)
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-100dpi/debian/xfonts-100dpi-transcoded.install
===================================================================
--- trunk/font/xfonts-100dpi/debian/xfonts-100dpi-transcoded.install
2006-09-30 18:42:10 UTC (rev 3571)
+++ trunk/font/xfonts-100dpi/debian/xfonts-100dpi-transcoded.install
2006-09-30 21:04:25 UTC (rev 3572)
@@ -325,7 +325,6 @@
usr/share/fonts/X11/100dpi/helvO08-ISO8859-9.pcf.gz
usr/share/fonts/X11/100dpi/helvO10-ISO8859-9.pcf.gz
usr/share/fonts/X11/100dpi/helvO12-ISO8859-9.pcf.gz
-usr/share/fonts/X11/100dpi/fonts.scale
usr/share/fonts/X11/100dpi/helvO14-ISO8859-9.pcf.gz
usr/share/fonts/X11/100dpi/helvO18-ISO8859-9.pcf.gz
usr/share/fonts/X11/100dpi/helvO24-ISO8859-9.pcf.gz
Modified: trunk/font/xfonts-100dpi/debian/xfonts-100dpi-transcoded.postinst.in
===================================================================
--- trunk/font/xfonts-100dpi/debian/xfonts-100dpi-transcoded.postinst.in
2006-09-30 18:42:10 UTC (rev 3571)
+++ trunk/font/xfonts-100dpi/debian/xfonts-100dpi-transcoded.postinst.in
2006-09-30 21:04:25 UTC (rev 3572)
@@ -16,10 +16,6 @@
#DEBHELPER#
-FONTDIRS="100dpi"
-UPDATECMDS="update-fonts-dir update-fonts-alias"
-font_update
-
exit 0
# vim:ai:et:sts=2:sw=2:tw=0:
Modified: trunk/font/xfonts-100dpi/debian/xfonts-100dpi-transcoded.postrm.in
===================================================================
--- trunk/font/xfonts-100dpi/debian/xfonts-100dpi-transcoded.postrm.in
2006-09-30 18:42:10 UTC (rev 3571)
+++ trunk/font/xfonts-100dpi/debian/xfonts-100dpi-transcoded.postrm.in
2006-09-30 21:04:25 UTC (rev 3572)
@@ -16,18 +16,6 @@
#DEBHELPER#
-if [ "$1" = "purge" ] || [ "$1" = "remove" ] || [ "$1" = "disappear" ]; then
- FONTDIRS="100dpi"
- UPDATECMDS="update-fonts-dir update-fonts-alias"
- font_update
-fi
-
-if [ "$1" = "purge" ]; then
- for DIR in /etc/X11/fonts/100dpi /etc/X11/fonts /etc/X11; do
- rmdir $DIR 2> /dev/null || true
- done
-fi
-
exit 0
# vim:ai:et:sts=2:sw=2:tw=0:
Modified: trunk/font/xfonts-100dpi/debian/xfonts-100dpi.install
===================================================================
--- trunk/font/xfonts-100dpi/debian/xfonts-100dpi.install 2006-09-30
18:42:10 UTC (rev 3571)
+++ trunk/font/xfonts-100dpi/debian/xfonts-100dpi.install 2006-09-30
21:04:25 UTC (rev 3572)
@@ -1,4 +1,4 @@
-etc/X11/fonts/X11R7/100dpi/xfonts-100dpi.alias
+etc/X11/fonts/100dpi/xfonts-100dpi.alias
usr/share/fonts/X11/100dpi/courB08.pcf.gz
usr/share/fonts/X11/100dpi/courB10.pcf.gz
usr/share/fonts/X11/100dpi/courB12.pcf.gz
Modified: trunk/font/xfonts-100dpi/debian/xfonts-100dpi.postinst.in
===================================================================
--- trunk/font/xfonts-100dpi/debian/xfonts-100dpi.postinst.in 2006-09-30
18:42:10 UTC (rev 3571)
+++ trunk/font/xfonts-100dpi/debian/xfonts-100dpi.postinst.in 2006-09-30
21:04:25 UTC (rev 3572)
@@ -14,12 +14,10 @@
#INCLUDE_SHELL_LIB#
+remove_conffile_commit /etc/X11/fonts/X11R7/100dpi/xfonts-100dpi.alias
+
#DEBHELPER#
-FONTDIRS="100dpi"
-UPDATECMDS="update-fonts-dir update-fonts-alias"
-font_update
-
exit 0
# vim:ai:et:sts=2:sw=2:tw=0:
Modified: trunk/font/xfonts-100dpi/debian/xfonts-100dpi.postrm.in
===================================================================
--- trunk/font/xfonts-100dpi/debian/xfonts-100dpi.postrm.in 2006-09-30
18:42:10 UTC (rev 3571)
+++ trunk/font/xfonts-100dpi/debian/xfonts-100dpi.postrm.in 2006-09-30
21:04:25 UTC (rev 3572)
@@ -16,14 +16,12 @@
#DEBHELPER#
-if [ "$1" = "purge" ] || [ "$1" = "remove" ] || [ "$1" = "disappear" ]; then
- FONTDIRS="100dpi"
- UPDATECMDS="update-fonts-dir update-fonts-alias"
- font_update
+if [ "$1" = "abort-install" ] || [ "$1" = "abort-upgrade" ]; then
+ remove_conffile_rollback /etc/X11/fonts/X11R7/100dpi/xfonts-100dpi.alias
fi
if [ "$1" = "purge" ]; then
- for DIR in /etc/X11/fonts/100dpi /etc/X11/fonts /etc/X11; do
+ for DIR in /etc/X11/fonts/X11R7/100dpi /etc/X11/fonts/X11R7
/etc/X11/fonts/100dpi /etc/X11/fonts /etc/X11; do
rmdir $DIR 2> /dev/null || true
done
fi
Added: trunk/font/xfonts-100dpi/debian/xfonts-100dpi.preinst.in
===================================================================
--- trunk/font/xfonts-100dpi/debian/xfonts-100dpi.preinst.in
(rev 0)
+++ trunk/font/xfonts-100dpi/debian/xfonts-100dpi.preinst.in 2006-09-30
21:04:25 UTC (rev 3572)
@@ -0,0 +1,22 @@
+#!/bin/sh
+# Debian xfonts-100dpi package pre-installation script
+
+# $Id$
+
+set -e
+
+THIS_PACKAGE=xfonts-100dpi
+THIS_SCRIPT=preinst
+
+#INCLUDE_SHELL_LIB#
+
+if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
+ if dpkg --compare-versions "$2" lt "1:1.0.0-3"; then
+ remove_conffile_prepare /etc/X11/fonts/X11R7/100dpi/xfonts-100dpi.alias \
+ 85bebd6ca213aa656c301a72eb4397cb
+ 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]
