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

[Pkg-fonts-devel] Bug#700058: fonts-hanazono: does not remove ttf-japanese-mincho.ttf alternative on upgrades from squeeze



Followup-For: Bug #700058

Attaching the patch. This patch uses versions for a maintainer upload of
20120421-2, for a NMU I'd do s/20120421-2/20120421-1.1/.


Andreas
diffstat for fonts-hanazono-20120421 fonts-hanazono-20120421

 changelog              |   13 +++++++++++++
 fonts-hanazono.preinst |    9 +++++++++
 ttf-hanazono.preinst   |   13 +++++++++++++
 3 files changed, 35 insertions(+)

diff -Nru fonts-hanazono-20120421/debian/changelog fonts-hanazono-20120421/debian/changelog
--- fonts-hanazono-20120421/debian/changelog	2012-05-29 10:59:35.000000000 +0200
+++ fonts-hanazono-20120421/debian/changelog	2013-02-08 00:35:14.000000000 +0100
@@ -1,3 +1,16 @@
+fonts-hanazono (20120421-2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * ttf-hanazono.preinst: Unregister the ttf-japanese-mincho.ttf alternative.
+  * fonts-hanazono.preinst: Clean up the ttf-japanese-mincho.ttf alternative
+    set up by ttf-hanazono in squeeze. This needs to be done in fonts-hanazono
+    as well since there is no guarantee that the transitional ttf-hanazono
+    package was installed and did clean this up. Since new installations of
+    fonts-hanazono cannot be distinguished from "upgrades" from ttf-hanazono
+    this needs to be run on new installations, too.  (Closes: #700058)
+
+ -- Andreas Beckmann <anbe@debian.org>  Fri, 08 Feb 2013 00:32:23 +0100
+
 fonts-hanazono (20120421-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru fonts-hanazono-20120421/debian/fonts-hanazono.preinst fonts-hanazono-20120421/debian/fonts-hanazono.preinst
--- fonts-hanazono-20120421/debian/fonts-hanazono.preinst	2012-03-06 00:23:39.000000000 +0100
+++ fonts-hanazono-20120421/debian/fonts-hanazono.preinst	2013-02-08 00:38:16.000000000 +0100
@@ -2,6 +2,9 @@
 
 set -e
 
+OLD_ALT_NAME="ttf-japanese-mincho"
+OLD_FONT_ENTRY="/usr/share/fonts/truetype/hanazono/hanazono.ttf"
+
 PKG="ttf-hanazono"
 PKG_VERSION_DEFOMA="20090909-1"
 
@@ -34,6 +37,12 @@
     rm_conffile $PKG $FILE
   fi
 
+	# do this on new installations, too, as these could be "upgrades"
+	# from ttf-hanazono
+	if dpkg --compare-versions "$2" lt "20120421-2~"; then
+		update-alternatives --remove $OLD_ALT_NAME.ttf $OLD_FONT_ENTRY
+	fi
+
 esac
 
 #DEBHELPER#
diff -Nru fonts-hanazono-20120421/debian/ttf-hanazono.preinst fonts-hanazono-20120421/debian/ttf-hanazono.preinst
--- fonts-hanazono-20120421/debian/ttf-hanazono.preinst	1970-01-01 01:00:00.000000000 +0100
+++ fonts-hanazono-20120421/debian/ttf-hanazono.preinst	2013-02-08 00:38:30.000000000 +0100
@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+
+OLD_ALT_NAME="ttf-japanese-mincho"
+OLD_FONT_ENTRY="/usr/share/fonts/truetype/hanazono/hanazono.ttf"
+
+if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
+	if dpkg --compare-versions "$2" lt-nl "20120421-2~"; then
+		update-alternatives --remove $OLD_ALT_NAME.ttf $OLD_FONT_ENTRY
+	fi
+fi
+
+#DEBHELPER#

Reply to: