Author: dnusinow
Date: 2006-09-30 17:06:14 -0400 (Sat, 30 Sep 2006)
New Revision: 3577
Added:
trunk/font/xfonts-cyrillic/debian/xfonts-cyrillic.preinst.in
Modified:
trunk/font/xfonts-cyrillic/debian/changelog
trunk/font/xfonts-cyrillic/debian/compat
trunk/font/xfonts-cyrillic/debian/control
trunk/font/xfonts-cyrillic/debian/copyright
trunk/font/xfonts-cyrillic/debian/rules
trunk/font/xfonts-cyrillic/debian/xfonts-cyrillic.install
trunk/font/xfonts-cyrillic/debian/xfonts-cyrillic.postinst.in
trunk/font/xfonts-cyrillic/debian/xfonts-cyrillic.postrm.in
Log:
* Drop X11R7 from aliases install path.
* Switch to dh_installxfonts.
* Drop fonts.scale and fonts.dir from binary package. This is serious
policy violation, thus raised urgency.
* Correct description of xfonts-cyrillic.
* Bump policy to 3.7.2 (now we are compliant).
* Remove unused debhelper helpers.
* Build package in binary-indep, not in binary-arch.
* Add quilt to build-depends.
* Bump debhelper compat to 5 and build-dep on debhelper to >= 5.0.31
* Remove Fabio from uploaders with his permission. He's always welcome back.
* Capitalize "Russian" in debian/copyright. Thlintian.
* Upload to unstable
Modified: trunk/font/xfonts-cyrillic/debian/changelog
===================================================================
--- trunk/font/xfonts-cyrillic/debian/changelog 2006-09-30 21:06:07 UTC (rev
3576)
+++ trunk/font/xfonts-cyrillic/debian/changelog 2006-09-30 21:06:14 UTC (rev
3577)
@@ -1,3 +1,29 @@
+xfonts-cyrillic (1:1.0.0-4) unstable; urgency=medium
+
+ [ Eugene Konev ]
+ * Drop X11R7 from aliases install path.
+ * Switch to dh_installxfonts.
+ * Drop fonts.scale and fonts.dir from binary package. This is serious
+ policy violation, thus raised urgency.
+ * Correct description of xfonts-cyrillic.
+ * Bump policy to 3.7.2 (now we are compliant).
+ * Remove unused debhelper helpers.
+ * Build package in binary-indep, not in binary-arch.
+ * Add quilt to build-depends.
+
+ [ David Nusinow ]
+ * Bump debhelper compat to 5 and build-dep on debhelper to >= 5.0.31
+ * Remove Fabio from uploaders with his permission. He's always welcome back.
+ * Capitalize "Russian" in debian/copyright. Thlintian.
+
+ -- David Nusinow <[EMAIL PROTECTED]> Sat, 30 Sep 2006 17:00:27 -0400
+
+xfonts-cyrillic (1:1.0.0-3) unstable; urgency=low
+
+ * Upload to unstable
+
+ -- David Nusinow <[EMAIL PROTECTED]> Mon, 10 Apr 2006 23:36:12 -0400
+
xfonts-cyrillic (1:1.0.0-2) experimental; urgency=low
* Port patches from trunk
Modified: trunk/font/xfonts-cyrillic/debian/compat
===================================================================
--- trunk/font/xfonts-cyrillic/debian/compat 2006-09-30 21:06:07 UTC (rev
3576)
+++ trunk/font/xfonts-cyrillic/debian/compat 2006-09-30 21:06:14 UTC (rev
3577)
@@ -1 +1 @@
-4
+5
Modified: trunk/font/xfonts-cyrillic/debian/control
===================================================================
--- trunk/font/xfonts-cyrillic/debian/control 2006-09-30 21:06:07 UTC (rev
3576)
+++ trunk/font/xfonts-cyrillic/debian/control 2006-09-30 21:06:14 UTC (rev
3577)
@@ -2,18 +2,15 @@
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
-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, quilt
+Standards-Version: 3.7.2
Package: xfonts-cyrillic
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, xutils, xfonts-utils
+Depends: ${misc:Depends}
Suggests: xfs | xserver
Description: Cyrillic fonts for X
xfonts-cyrillic provides a set of fonts using the Cyrillic alphabet for X
servers. In most cases it is desirable to have the X font server (xfs)
and/or an X server installed to make the fonts available to X clients.
- .
- This package requires the xutils package to prepare the font directories
- for use by an X server or X font server.
Modified: trunk/font/xfonts-cyrillic/debian/copyright
===================================================================
--- trunk/font/xfonts-cyrillic/debian/copyright 2006-09-30 21:06:07 UTC (rev
3576)
+++ trunk/font/xfonts-cyrillic/debian/copyright 2006-09-30 21:06:14 UTC (rev
3577)
@@ -1,4 +1,4 @@
-This package contains the set of russian fonts for X11 Release 6.
+This package contains the set of Russian fonts for X11 Release 6.
Copyright (C) 1994-1995 Cronyx Ltd.
Changes Copyright (C) 1996 by Andrey A. Chernov, Moscow, Russia.
Modified: trunk/font/xfonts-cyrillic/debian/rules
===================================================================
--- trunk/font/xfonts-cyrillic/debian/rules 2006-09-30 21:06:07 UTC (rev
3576)
+++ trunk/font/xfonts-cyrillic/debian/rules 2006-09-30 21:06:14 UTC (rev
3577)
@@ -76,30 +76,27 @@
cd ..; \
done
install -D -m644 debian/fonts.alias \
- debian/tmp/etc/X11/fonts/X11R7/cyrillic/xfonts-cyrillic.alias
+ debian/tmp/etc/X11/fonts/cyrillic/xfonts-cyrillic.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-cyrillic/debian/xfonts-cyrillic.install
===================================================================
--- trunk/font/xfonts-cyrillic/debian/xfonts-cyrillic.install 2006-09-30
21:06:07 UTC (rev 3576)
+++ trunk/font/xfonts-cyrillic/debian/xfonts-cyrillic.install 2006-09-30
21:06:14 UTC (rev 3577)
@@ -1,4 +1,4 @@
-etc/X11/fonts/X11R7/cyrillic/xfonts-cyrillic.alias
+etc/X11/fonts/cyrillic/xfonts-cyrillic.alias
usr/share/fonts/X11/cyrillic/crox1cb.pcf.gz
usr/share/fonts/X11/cyrillic/crox1c.pcf.gz
usr/share/fonts/X11/cyrillic/crox1cbo.pcf.gz
@@ -63,8 +63,6 @@
usr/share/fonts/X11/cyrillic/koi10x20.pcf.gz
usr/share/fonts/X11/cyrillic/koi6x10.pcf.gz
usr/share/fonts/X11/cyrillic/koinil2.pcf.gz
-usr/share/fonts/X11/cyrillic/fonts.scale
-usr/share/fonts/X11/cyrillic/fonts.dir
usr/share/fonts/X11/cyrillic/koi12x24b.pcf.gz
usr/share/fonts/X11/cyrillic/koi12x24.pcf.gz
usr/share/fonts/X11/cyrillic/koi5x8.pcf.gz
Modified: trunk/font/xfonts-cyrillic/debian/xfonts-cyrillic.postinst.in
===================================================================
--- trunk/font/xfonts-cyrillic/debian/xfonts-cyrillic.postinst.in
2006-09-30 21:06:07 UTC (rev 3576)
+++ trunk/font/xfonts-cyrillic/debian/xfonts-cyrillic.postinst.in
2006-09-30 21:06:14 UTC (rev 3577)
@@ -14,12 +14,10 @@
#INCLUDE_SHELL_LIB#
+remove_conffile_commit /etc/X11/fonts/X11R7/cyrillic/xfonts-cyrillic.alias
+
#DEBHELPER#
-FONTDIRS="cyrillic"
-UPDATECMDS="update-fonts-dir update-fonts-alias"
-font_update
-
exit 0
# vim:ai:et:sts=2:sw=2:tw=0:
Modified: trunk/font/xfonts-cyrillic/debian/xfonts-cyrillic.postrm.in
===================================================================
--- trunk/font/xfonts-cyrillic/debian/xfonts-cyrillic.postrm.in 2006-09-30
21:06:07 UTC (rev 3576)
+++ trunk/font/xfonts-cyrillic/debian/xfonts-cyrillic.postrm.in 2006-09-30
21:06:14 UTC (rev 3577)
@@ -16,14 +16,12 @@
#DEBHELPER#
-if [ "$1" = "purge" ] || [ "$1" = "remove" ] || [ "$1" = "disappear" ]; then
- FONTDIRS="cyrillic"
- UPDATECMDS="update-fonts-dir update-fonts-alias"
- font_update
+if [ "$1" = "abort-install" ] || [ "$1" = "abort-upgrade" ]; then
+ remove_conffile_rollback /etc/X11/fonts/X11R7/cyrillic/xfonts-cyrillic.alias
fi
if [ "$1" = "purge" ]; then
- for DIR in /etc/X11/fonts/cyrillic /etc/X11/fonts /etc/X11; do
+ for DIR in /etc/X11/fonts/X11R7/cyrillic /etc/X11/fonts/X11R7
/etc/X11/fonts/cyrillic /etc/X11/fonts /etc/X11; do
rmdir $DIR 2> /dev/null || true
done
fi
Added: trunk/font/xfonts-cyrillic/debian/xfonts-cyrillic.preinst.in
===================================================================
--- trunk/font/xfonts-cyrillic/debian/xfonts-cyrillic.preinst.in
(rev 0)
+++ trunk/font/xfonts-cyrillic/debian/xfonts-cyrillic.preinst.in
2006-09-30 21:06:14 UTC (rev 3577)
@@ -0,0 +1,22 @@
+#!/bin/sh
+# Debian xfonts-cyrillic package pre-installation script
+
+# $Id$
+
+set -e
+
+THIS_PACKAGE=xfonts-cyrillic
+THIS_SCRIPT=preinst
+
+#INCLUDE_SHELL_LIB#
+
+if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
+ if dpkg --compare-versions "$2" lt "1:1.0.0-4"; then
+ remove_conffile_prepare
/etc/X11/fonts/X11R7/cyrillic/xfonts-cyrillic.alias \
+ 5aa8ad9c9681a4c5dc2be8045c76132a
+ 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]
