[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force X.Org X11 SVN commit: r3575 - trunk/font/xfonts-base/debian



Author: dnusinow
Date: 2006-09-30 17:05:52 -0400 (Sat, 30 Sep 2006)
New Revision: 3575

Added:
   trunk/font/xfonts-base/debian/xfonts-base.preinst.in
Modified:
   trunk/font/xfonts-base/debian/changelog
   trunk/font/xfonts-base/debian/compat
   trunk/font/xfonts-base/debian/control
   trunk/font/xfonts-base/debian/rules
   trunk/font/xfonts-base/debian/xfonts-base.install
   trunk/font/xfonts-base/debian/xfonts-base.postinst.in
   trunk/font/xfonts-base/debian/xfonts-base.postrm.in
Log:
* Drop X11R7 from aliases install path.
* Switch to dh_installxfonts.
* 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 version build-dep to >= 5.0.31
* Remove Fabio from uploaders with his permission. He's always welcome back.
* Upload to unstable

Modified: trunk/font/xfonts-base/debian/changelog
===================================================================
--- trunk/font/xfonts-base/debian/changelog	2006-09-30 21:04:53 UTC (rev 3574)
+++ trunk/font/xfonts-base/debian/changelog	2006-09-30 21:05:52 UTC (rev 3575)
@@ -1,3 +1,24 @@
+xfonts-base (1:1.0.0-4) unstable; urgency=low
+
+  [ Eugene Konev ]
+  * Drop X11R7 from aliases install path.
+  * Switch to dh_installxfonts.
+  * 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 version build-dep to >= 5.0.31
+  * Remove Fabio from uploaders with his permission. He's always welcome back.
+
+ -- David Nusinow <dnusinow@debian.org>  Sat, 30 Sep 2006 16:34:42 -0400
+
+xfonts-base (1:1.0.0-3) unstable; urgency=low
+
+  * Upload to unstable
+
+ -- David Nusinow <dnusinow@debian.org>  Mon, 10 Apr 2006 23:36:11 -0400
+
 xfonts-base (1:1.0.0-2) experimental; urgency=low
 
   [ David Nusinow ]

Modified: trunk/font/xfonts-base/debian/compat
===================================================================
--- trunk/font/xfonts-base/debian/compat	2006-09-30 21:04:53 UTC (rev 3574)
+++ trunk/font/xfonts-base/debian/compat	2006-09-30 21:05:52 UTC (rev 3575)
@@ -1 +1 @@
-4
+5

Modified: trunk/font/xfonts-base/debian/control
===================================================================
--- trunk/font/xfonts-base/debian/control	2006-09-30 21:04:53 UTC (rev 3574)
+++ trunk/font/xfonts-base/debian/control	2006-09-30 21:05:52 UTC (rev 3575)
@@ -2,13 +2,13 @@
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
-Build-Depends: debhelper (>= 4.0.0), pkg-config, xfonts-utils
-Standards-Version: 3.6.1.0
+Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>
+Build-Depends: debhelper (>= 5.0.31), pkg-config, xfonts-utils
+Standards-Version: 3.7.2
 
 Package: xfonts-base
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, xfonts-utils
+Depends: ${misc:Depends}
 Replaces: xfonts-misc
 Suggests: xfs | xserver
 Description: standard fonts for X

Modified: trunk/font/xfonts-base/debian/rules
===================================================================
--- trunk/font/xfonts-base/debian/rules	2006-09-30 21:04:53 UTC (rev 3574)
+++ trunk/font/xfonts-base/debian/rules	2006-09-30 21:05:52 UTC (rev 3575)
@@ -76,30 +76,27 @@
 		cd ..; \
 	done
 	install -D -m644 debian/fonts.alias \
-		debian/tmp/etc/X11/fonts/X11R7/misc/xfonts-base.alias
+		debian/tmp/etc/X11/fonts/misc/xfonts-base.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 --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-base/debian/xfonts-base.install
===================================================================
--- trunk/font/xfonts-base/debian/xfonts-base.install	2006-09-30 21:04:53 UTC (rev 3574)
+++ trunk/font/xfonts-base/debian/xfonts-base.install	2006-09-30 21:05:52 UTC (rev 3575)
@@ -1,4 +1,4 @@
-etc/X11/fonts/X11R7/misc/xfonts-base.alias
+etc/X11/fonts/misc/xfonts-base.alias
 usr/share/fonts/X11/misc/arabic24.pcf.gz
 usr/share/fonts/X11/misc/cursor.pcf.gz
 usr/share/fonts/X11/misc/hanglg16.pcf.gz

Modified: trunk/font/xfonts-base/debian/xfonts-base.postinst.in
===================================================================
--- trunk/font/xfonts-base/debian/xfonts-base.postinst.in	2006-09-30 21:04:53 UTC (rev 3574)
+++ trunk/font/xfonts-base/debian/xfonts-base.postinst.in	2006-09-30 21:05:52 UTC (rev 3575)
@@ -14,12 +14,10 @@
 
 #INCLUDE_SHELL_LIB#
 
+remove_conffile_commit /etc/X11/fonts/X11R7/misc/xfonts-base.alias
+
 #DEBHELPER#
 
-FONTDIRS="misc"
-UPDATECMDS="update-fonts-dir update-fonts-alias"
-font_update
-
 exit 0
 
 # vim:ai:et:sts=2:sw=2:tw=0:

Modified: trunk/font/xfonts-base/debian/xfonts-base.postrm.in
===================================================================
--- trunk/font/xfonts-base/debian/xfonts-base.postrm.in	2006-09-30 21:04:53 UTC (rev 3574)
+++ trunk/font/xfonts-base/debian/xfonts-base.postrm.in	2006-09-30 21:05:52 UTC (rev 3575)
@@ -16,14 +16,12 @@
 
 #DEBHELPER#
 
-if [ "$1" = "purge" ] || [ "$1" = "remove" ] || [ "$1" = "disappear" ]; then
-  FONTDIRS="misc"
-  UPDATECMDS="update-fonts-dir update-fonts-alias"
-  font_update
+if [ "$1" = "abort-install" ] || [ "$1" = "abort-upgrade" ]; then
+  remove_conffile_rollback /etc/X11/fonts/X11R7/misc/xfonts-base.alias
 fi
 
 if [ "$1" = "purge" ]; then
-  for DIR in /etc/X11/fonts/misc /etc/X11/fonts /etc/X11; do
+  for DIR in /etc/X11/fonts/X11R7/misc /etc/X11/fonts/X11R7 /etc/X11/fonts/misc /etc/X11/fonts /etc/X11; do
     rmdir $DIR 2> /dev/null || true
   done
 fi

Added: trunk/font/xfonts-base/debian/xfonts-base.preinst.in
===================================================================
--- trunk/font/xfonts-base/debian/xfonts-base.preinst.in	                        (rev 0)
+++ trunk/font/xfonts-base/debian/xfonts-base.preinst.in	2006-09-30 21:05:52 UTC (rev 3575)
@@ -0,0 +1,22 @@
+#!/bin/sh
+# Debian xfonts-base package pre-installation script
+
+# $Id$
+
+set -e
+
+THIS_PACKAGE=xfonts-base
+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/misc/xfonts-base.alias \
+      a8ec05d528431d4c9703b55a7efd67a8
+  fi
+fi
+      
+exit 0
+
+# vim:ai:et:sts=2:sw=2:tw=0:



Reply to: