Bug#649145: [Pkg-fonts-devel] Bug#649145: msttcorefonts: Please drop defoma support

2011-11-21 Thread Christian PERRIER 
Quoting Thijs Kinkhorst (th...@debian.org):

  An now the version with defoma-font run in preinst..:)
 
 Thanks both for laying this groundwork. I'll make an upload today.


It has been a pleasure. I actually learned (and read) a lot of things
while looking at these bugs and trying to solve issues raised by Picky
Paul...:-)




signature.asc
Description: Digital signature

Bug#649145: [Pkg-fonts-devel] Bug#649145: msttcorefonts: Please drop defoma support

2011-11-19 Thread Christian PERRIER 
Quoting Paul Wise (p...@debian.org):
 On Fri, Nov 18, 2011 at 2:47 PM, Christian Perrier bubu...@debian.org wrote:
 
  If you were using defoma in your maintainer scripts (postrm, postinst
  etc, dh_installdefoma usually handles them) then on upgrade from a
  version before the one that dropped you need to run defoma-app purge
  $PACKAGE, but only if the defoma-app binary is available and
  executable.
 
 This is actually incorrect, this should be run instead:
 
 defoma-font purge-all /etc/defoma/hints/$PACKAGE.hints


And therefore be run in the preinst (before the hints file is
removed), I guess.






signature.asc
Description: Digital signature

Bug#649145: [Pkg-fonts-devel] Bug#649145: msttcorefonts: Please drop defoma support

2011-11-19 Thread Christian PERRIER 
Quoting Paul Wise (p...@debian.org):
 On Fri, Nov 18, 2011 at 2:47 PM, Christian Perrier bubu...@debian.org wrote:
 
  If you were using defoma in your maintainer scripts (postrm, postinst
  etc, dh_installdefoma usually handles them) then on upgrade from a
  version before the one that dropped you need to run defoma-app purge
  $PACKAGE, but only if the defoma-app binary is available and
  executable.
 
 This is actually incorrect, this should be run instead:
 
 defoma-font purge-all /etc/defoma/hints/$PACKAGE.hints


...and should happen before the hints file removal, therefore in
prerm.

Fixed patch attached.


diff -Nru msttcorefonts-3.3.old/debian/changelog msttcorefonts-3.3/debian/changelog
--- msttcorefonts-3.3.old/debian/changelog	2011-11-18 07:29:01.091038237 +0100
+++ msttcorefonts-3.3/debian/changelog	2011-11-18 07:29:16.415192897 +0100
@@ -1,3 +1,9 @@
+msttcorefonts (3.4) UNRELEASED; urgency=low
+
+  * Drop defoma support
+
+ -- Christian Perrier bubu...@debian.org  Fri, 18 Nov 2011 07:29:10 +0100
+
 msttcorefonts (3.3) unstable; urgency=low
 
   * Add Slovak debconf translation, thanks Slavko Pozdravom
diff -Nru msttcorefonts-3.3.old/debian/control msttcorefonts-3.3/debian/control
--- msttcorefonts-3.3.old/debian/control	2011-11-18 07:29:01.091038237 +0100
+++ msttcorefonts-3.3/debian/control	2011-11-18 07:29:37.011400888 +0100
@@ -4,13 +4,12 @@
 Maintainer: Thijs Kinkhorst th...@debian.org
 Standards-Version: 3.8.4
 Build-Depends: debhelper (= 7)
-Build-Depends-Indep: defoma
 Vcs-Svn: https://svn.kinkhorst.nl/svn/debian/msttcorefonts/trunk
 Vcs-Browser: https://aphrodite.kinkhorst.nl/wsvn/debian/msttcorefonts/
 
 Package: ttf-mscorefonts-installer
 Architecture: all
-Depends: wget, cabextract, xfonts-utils, defoma, ${misc:Depends}
+Depends: wget, cabextract, xfonts-utils, ${misc:Depends}
 Recommends: ttf-liberation, x-ttcidfont-conf
 Provides: msttcorefonts
 Replaces: msttcorefonts ( 2.6)
diff -Nru msttcorefonts-3.3.old/debian/dirs msttcorefonts-3.3/debian/dirs
--- msttcorefonts-3.3.old/debian/dirs	2011-11-18 07:29:01.091038237 +0100
+++ msttcorefonts-3.3/debian/dirs	2011-11-18 07:43:48.043510831 +0100
@@ -1,3 +1,2 @@
 var/lib/msttcorefonts
-etc/defoma/hints
 usr/share/fonts/truetype
diff -Nru msttcorefonts-3.3.old/debian/postinst.in msttcorefonts-3.3/debian/postinst.in
--- msttcorefonts-3.3.old/debian/postinst.in	2011-11-18 07:29:01.083038160 +0100
+++ msttcorefonts-3.3/debian/postinst.in	2011-11-19 14:36:42.682066107 +0100
@@ -25,5 +25,9 @@
 http_proxy=$RET
 done
 
+if dpkg-maintscript-helper supports rm_conffile 2/dev/null; then
+  dpkg-maintscript-helper rm_conffile /etc/defoma/hints/ttf-mscorefonts-installer.hints 3.4 -- $@
+fi
+  
 ## Content of update-ms-fonts will be concatenated below
 
diff -Nru msttcorefonts-3.3.old/debian/postrm msttcorefonts-3.3/debian/postrm
--- msttcorefonts-3.3.old/debian/postrm	1970-01-01 01:00:00.0 +0100
+++ msttcorefonts-3.3/debian/postrm	2011-11-18 07:42:31.342736565 +0100
@@ -0,0 +1,7 @@
+#! /bin/sh
+
+set -e
+
+if dpkg-maintscript-helper supports rm_conffile 2/dev/null; then
+  dpkg-maintscript-helper rm_conffile /etc/defoma/hints/ttf-mscorefonts-installer.hints 3.4 -- $@
+fi
diff -Nru msttcorefonts-3.3.old/debian/preinst msttcorefonts-3.3/debian/preinst
--- msttcorefonts-3.3.old/debian/preinst	1970-01-01 01:00:00.0 +0100
+++ msttcorefonts-3.3/debian/preinst	2011-11-19 14:36:44.514116637 +0100
@@ -0,0 +1,7 @@
+#! /bin/sh
+
+set -e
+
+if dpkg-maintscript-helper supports rm_conffile 2/dev/null; then
+  dpkg-maintscript-helper rm_conffile /etc/defoma/hints/ttf-mscorefonts-installer.hints 3.4 -- $@
+fi
diff -Nru msttcorefonts-3.3.old/debian/prerm msttcorefonts-3.3/debian/prerm
--- msttcorefonts-3.3.old/debian/prerm	2011-11-18 07:29:01.083038160 +0100
+++ msttcorefonts-3.3/debian/prerm	2011-11-19 14:36:34.437838733 +0100
@@ -6,6 +6,13 @@
 # but we're still successfully uninstalled.
 set -e
 
+if dpkg --compare-versions $2 lt 3.4; then
+	if [ -x which defoma-font 2/dev/null ]; then
+		defoma-font purge /etc/defoma/hints/ttf-mscorefonts-installer.hints
+	fi
+fi
+
+
 if [ $1 = remove ]  [ -e /var/lib/msttcorefonts/ms-fonts ]; then
 	cd /usr/share/fonts/truetype/msttcorefonts  \
 		rm -f `cat /var/lib/msttcorefonts/ms-fonts`
diff -Nru msttcorefonts-3.3.old/debian/README.comic-font msttcorefonts-3.3/debian/README.comic-font
--- msttcorefonts-3.3.old/debian/README.comic-font	2011-11-18 07:29:01.095038279 +0100
+++ msttcorefonts-3.3/debian/README.comic-font	1970-01-01 01:00:00.0 +0100
@@ -1,49 +0,0 @@
-Some users have reported that after installing the ttf-mscorefonts-installer
-package many older X clients (such as xmessage, xfontsel, etc) display text
-using the 'Comic Sans MS' font, that looks... somewhat strange.
-
-This is caused by the following:
-- users have /var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType as the first
-  element in X font path;
-- ttf-mscorefonts-installer is the only truetype font package installed;
--

Bug#649145: [Pkg-fonts-devel] Bug#649145: msttcorefonts: Please drop defoma support

2011-11-19 Thread Paul Wise 
On Sat, 2011-11-19 at 14:37 +0100, Christian PERRIER wrote:

 ...and should happen before the hints file removal, therefore in
 prerm.

I don't think prerm is run on upgrade:

http://wiki.debian.org/MaintainerScripts

-- 
bye,
pabs

http://wiki.debian.org/PaulWise


signature.asc
Description: This is a digitally signed message part

Bug#649145: [Pkg-fonts-devel] Bug#649145: msttcorefonts: Please drop defoma support

2011-11-19 Thread Christian PERRIER 
Quoting Paul Wise (p...@debian.org):
 On Sat, 2011-11-19 at 14:37 +0100, Christian PERRIER wrote:
 
  ...and should happen before the hints file removal, therefore in
  prerm.
 
 I don't think prerm is run on upgrade:
 
 http://wiki.debian.org/MaintainerScripts


Oh, doh, right. That should be preinst, then.

re-re-re-correcting my patches...:)




signature.asc
Description: Digital signature

Bug#649145: [Pkg-fonts-devel] Bug#649145: msttcorefonts: Please drop defoma support

2011-11-19 Thread Christian PERRIER 
Quoting Paul Wise (p...@debian.org):
 On Sat, 2011-11-19 at 14:37 +0100, Christian PERRIER wrote:
 
  ...and should happen before the hints file removal, therefore in
  prerm.
 
 I don't think prerm is run on upgrade:
 
 http://wiki.debian.org/MaintainerScripts


An now the version with defoma-font run in preinst..:)


diff -Nru msttcorefonts-3.3.old/debian/changelog msttcorefonts-3.3/debian/changelog
--- msttcorefonts-3.3.old/debian/changelog	2011-11-18 07:29:01.091038237 +0100
+++ msttcorefonts-3.3/debian/changelog	2011-11-18 07:29:16.415192897 +0100
@@ -1,3 +1,9 @@
+msttcorefonts (3.4) UNRELEASED; urgency=low
+
+  * Drop defoma support
+
+ -- Christian Perrier bubu...@debian.org  Fri, 18 Nov 2011 07:29:10 +0100
+
 msttcorefonts (3.3) unstable; urgency=low
 
   * Add Slovak debconf translation, thanks Slavko Pozdravom
diff -Nru msttcorefonts-3.3.old/debian/control msttcorefonts-3.3/debian/control
--- msttcorefonts-3.3.old/debian/control	2011-11-18 07:29:01.091038237 +0100
+++ msttcorefonts-3.3/debian/control	2011-11-18 07:29:37.011400888 +0100
@@ -4,13 +4,12 @@
 Maintainer: Thijs Kinkhorst th...@debian.org
 Standards-Version: 3.8.4
 Build-Depends: debhelper (= 7)
-Build-Depends-Indep: defoma
 Vcs-Svn: https://svn.kinkhorst.nl/svn/debian/msttcorefonts/trunk
 Vcs-Browser: https://aphrodite.kinkhorst.nl/wsvn/debian/msttcorefonts/
 
 Package: ttf-mscorefonts-installer
 Architecture: all
-Depends: wget, cabextract, xfonts-utils, defoma, ${misc:Depends}
+Depends: wget, cabextract, xfonts-utils, ${misc:Depends}
 Recommends: ttf-liberation, x-ttcidfont-conf
 Provides: msttcorefonts
 Replaces: msttcorefonts ( 2.6)
diff -Nru msttcorefonts-3.3.old/debian/dirs msttcorefonts-3.3/debian/dirs
--- msttcorefonts-3.3.old/debian/dirs	2011-11-18 07:29:01.091038237 +0100
+++ msttcorefonts-3.3/debian/dirs	2011-11-18 07:43:48.043510831 +0100
@@ -1,3 +1,2 @@
 var/lib/msttcorefonts
-etc/defoma/hints
 usr/share/fonts/truetype
diff -Nru msttcorefonts-3.3.old/debian/postinst.in msttcorefonts-3.3/debian/postinst.in
--- msttcorefonts-3.3.old/debian/postinst.in	2011-11-18 07:29:01.083038160 +0100
+++ msttcorefonts-3.3/debian/postinst.in	2011-11-19 14:36:42.682066107 +0100
@@ -25,5 +25,9 @@
 http_proxy=$RET
 done
 
+if dpkg-maintscript-helper supports rm_conffile 2/dev/null; then
+  dpkg-maintscript-helper rm_conffile /etc/defoma/hints/ttf-mscorefonts-installer.hints 3.4 -- $@
+fi
+  
 ## Content of update-ms-fonts will be concatenated below
 
diff -Nru msttcorefonts-3.3.old/debian/postrm msttcorefonts-3.3/debian/postrm
--- msttcorefonts-3.3.old/debian/postrm	1970-01-01 01:00:00.0 +0100
+++ msttcorefonts-3.3/debian/postrm	2011-11-18 07:42:31.342736565 +0100
@@ -0,0 +1,7 @@
+#! /bin/sh
+
+set -e
+
+if dpkg-maintscript-helper supports rm_conffile 2/dev/null; then
+  dpkg-maintscript-helper rm_conffile /etc/defoma/hints/ttf-mscorefonts-installer.hints 3.4 -- $@
+fi
diff -Nru msttcorefonts-3.3.old/debian/preinst msttcorefonts-3.3/debian/preinst
--- msttcorefonts-3.3.old/debian/preinst	1970-01-01 01:00:00.0 +0100
+++ msttcorefonts-3.3/debian/preinst	2011-11-19 16:24:42.913711341 +0100
@@ -0,0 +1,14 @@
+#! /bin/sh
+
+set -e
+
+if dpkg --compare-versions $2 lt 3.4; then
+	if [ -x which defoma-font 2/dev/null ]; then
+		defoma-font purge /etc/defoma/hints/ttf-mscorefonts-installer.hints
+	fi
+fi
+
+
+if dpkg-maintscript-helper supports rm_conffile 2/dev/null; then
+  dpkg-maintscript-helper rm_conffile /etc/defoma/hints/ttf-mscorefonts-installer.hints 3.4 -- $@
+fi
diff -Nru msttcorefonts-3.3.old/debian/prerm msttcorefonts-3.3/debian/prerm
--- msttcorefonts-3.3.old/debian/prerm	2011-11-18 07:29:01.083038160 +0100
+++ msttcorefonts-3.3/debian/prerm	2011-11-19 16:24:47.453838694 +0100
@@ -6,6 +6,7 @@
 # but we're still successfully uninstalled.
 set -e
 
+
 if [ $1 = remove ]  [ -e /var/lib/msttcorefonts/ms-fonts ]; then
 	cd /usr/share/fonts/truetype/msttcorefonts  \
 		rm -f `cat /var/lib/msttcorefonts/ms-fonts`
diff -Nru msttcorefonts-3.3.old/debian/README.comic-font msttcorefonts-3.3/debian/README.comic-font
--- msttcorefonts-3.3.old/debian/README.comic-font	2011-11-18 07:29:01.095038279 +0100
+++ msttcorefonts-3.3/debian/README.comic-font	1970-01-01 01:00:00.0 +0100
@@ -1,49 +0,0 @@
-Some users have reported that after installing the ttf-mscorefonts-installer
-package many older X clients (such as xmessage, xfontsel, etc) display text
-using the 'Comic Sans MS' font, that looks... somewhat strange.
-
-This is caused by the following:
-- users have /var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType as the first
-  element in X font path;
-- ttf-mscorefonts-installer is the only truetype font package installed;
-- '-microsoft-comic sans ms-...' happens to be alphabetically first font
-  provided by ttf-mscorefonts-installer;
-- older applications request any font that matches a generic pattern, and get
-  the comic font.
-
-This may be worked around in several ways.
-
-1. Install other font packages, and/or make

Bug#649145: [Pkg-fonts-devel] Bug#649145: msttcorefonts: Please drop defoma support

2011-11-19 Thread Thijs Kinkhorst 
On Sat, November 19, 2011 16:25, Christian PERRIER wrote:
 Quoting Paul Wise (p...@debian.org):
 On Sat, 2011-11-19 at 14:37 +0100, Christian PERRIER wrote:

  ...and should happen before the hints file removal, therefore in
  prerm.

 I don't think prerm is run on upgrade:

 http://wiki.debian.org/MaintainerScripts


 An now the version with defoma-font run in preinst..:)

Thanks both for laying this groundwork. I'll make an upload today.


Thijs



--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#649145: [Pkg-fonts-devel] Bug#649145: msttcorefonts: Please drop defoma support

2011-11-18 Thread Paul Wise 
On Fri, Nov 18, 2011 at 2:47 PM, Christian Perrier bubu...@debian.org wrote:

 If you were using defoma in your maintainer scripts (postrm, postinst
 etc, dh_installdefoma usually handles them) then on upgrade from a
 version before the one that dropped you need to run defoma-app purge
 $PACKAGE, but only if the defoma-app binary is available and
 executable.

This is actually incorrect, this should be run instead:

defoma-font purge-all /etc/defoma/hints/$PACKAGE.hints

-- 
bye,
pabs

http://wiki.debian.org/PaulWise



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org