X Strike Force X.Org X11 SVN commit: r1274 - in branches/modular/font: xfonts-100dpi/debian xfonts-75dpi/debian xfonts-base/debian xfonts-cyrillic/debian
Author: dnusinow
Date: 2006-02-21 20:32:49 -0500 (Tue, 21 Feb 2006)
New Revision: 1274
Added:
branches/modular/font/xfonts-75dpi/debian/xfonts-75dpi.postrm.in
Modified:
branches/modular/font/xfonts-100dpi/debian/rules
branches/modular/font/xfonts-75dpi/debian/rules
branches/modular/font/xfonts-base/debian/rules
branches/modular/font/xfonts-cyrillic/debian/rules
Log:
Fix chmod on fonts.alias install and add -75dpi.postrm.in that I'd missed previously
Modified: branches/modular/font/xfonts-100dpi/debian/rules
===================================================================
--- branches/modular/font/xfonts-100dpi/debian/rules 2006-02-21 10:58:12 UTC (rev 1273)
+++ branches/modular/font/xfonts-100dpi/debian/rules 2006-02-22 01:32:49 UTC (rev 1274)
@@ -75,7 +75,7 @@
cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install ; \
cd ..; \
done
- install -D debian/fonts.alias \
+ install -D -m644 debian/fonts.alias \
debian/tmp/etc/X11/fonts/X11R7/100dpi/xfonts-100dpi.alias
# Build architecture-dependent files here.
Modified: branches/modular/font/xfonts-75dpi/debian/rules
===================================================================
--- branches/modular/font/xfonts-75dpi/debian/rules 2006-02-21 10:58:12 UTC (rev 1273)
+++ branches/modular/font/xfonts-75dpi/debian/rules 2006-02-22 01:32:49 UTC (rev 1274)
@@ -75,7 +75,7 @@
cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install ; \
cd ..; \
done
- install -D debian/fonts.alias \
+ install -D -m644 debian/fonts.alias \
debian/tmp/etc/X11/fonts/X11R7/75dpi/xfonts-75dpi.alias
# Build architecture-dependent files here.
Added: branches/modular/font/xfonts-75dpi/debian/xfonts-75dpi.postrm.in
===================================================================
--- branches/modular/font/xfonts-75dpi/debian/xfonts-75dpi.postrm.in 2006-02-21 10:58:12 UTC (rev 1273)
+++ branches/modular/font/xfonts-75dpi/debian/xfonts-75dpi.postrm.in 2006-02-22 01:32:49 UTC (rev 1274)
@@ -0,0 +1,33 @@
+#!/bin/sh
+# Debian xfonts-75dpi package post-removal script
+# Copyright 1998-2001, 2004 Branden Robinson.
+# Licensed under the GNU General Public License, version 2. See the file
+# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
+# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
+
+# $Id: xfonts-75dpi.postrm.in 189 2005-06-11 00:04:27Z branden $
+
+set -e
+
+THIS_PACKAGE=xfonts-75dpi
+THIS_SCRIPT=postrm
+
+#INCLUDE_SHELL_LIB#
+
+#DEBHELPER#
+
+if [ "$1" = "purge" ] || [ "$1" = "remove" ] || [ "$1" = "disappear" ]; then
+ FONTDIRS="75dpi"
+ UPDATECMDS="update-fonts-dir update-fonts-alias"
+ font_update
+fi
+
+if [ "$1" = "purge" ]; then
+ for DIR in /etc/X11/fonts/75dpi /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: branches/modular/font/xfonts-base/debian/rules
===================================================================
--- branches/modular/font/xfonts-base/debian/rules 2006-02-21 10:58:12 UTC (rev 1273)
+++ branches/modular/font/xfonts-base/debian/rules 2006-02-22 01:32:49 UTC (rev 1274)
@@ -75,7 +75,7 @@
cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install ; \
cd ..; \
done
- install -D debian/fonts.alias \
+ install -D -m644 debian/fonts.alias \
debian/tmp/etc/X11/fonts/X11R7/misc/xfonts-base.alias
# Build architecture-dependent files here.
Modified: branches/modular/font/xfonts-cyrillic/debian/rules
===================================================================
--- branches/modular/font/xfonts-cyrillic/debian/rules 2006-02-21 10:58:12 UTC (rev 1273)
+++ branches/modular/font/xfonts-cyrillic/debian/rules 2006-02-22 01:32:49 UTC (rev 1274)
@@ -75,7 +75,7 @@
cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install ; \
cd ..; \
done
- install -D debian/fonts.alias \
+ install -D -m644 debian/fonts.alias \
debian/tmp/etc/X11/fonts/X11R7/cyrillic/xfonts-cyrillic.alias
# Build architecture-dependent files here.
Reply to: