tags 532271 +patch
thanks

It was a bit unclear to me in what conditions scrollkeeper leaves this
cruft as it sounds to be related to installation state of xml-core
package also, so I was not able to re-produce this on live.

However this patch adds to rarian-compat's postinst a code that removes
scrollkeeper's registered XML catalog in those cases (as suggested by
Josselin Mouette already on 15 June 2009). I've added version check
against last configured rarian-compat so that this code is evaluated
only once as that should be sufficient in all cases. This version check
assumes next version as NMU (but I'm not, at least yet, DD, so I'm not
able to upload this; I've just prepared NMU to my AM), but if not NMUed
then rarian-compat.postinst version number should be adjusted based on
real upload version number.

diff -urN rarian-0.8.1.original//debian/changelog rarian-0.8.1/debian/changelog
--- rarian-0.8.1.original//debian/changelog	2010-03-03 16:20:09.000000000 +0200
+++ rarian-0.8.1/debian/changelog	2010-03-03 15:30:39.000000000 +0200
@@ -1,3 +1,11 @@
+rarian (0.8.1-4.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Clean-up old scrollkeeper's XML catalog so that rarian-compat can
+    register its own catalog. Closes: #532271.
+
+ -- Tommi Vainikainen <thv+deb...@iki.fi>  Wed, 03 Mar 2010 15:23:45 +0200
+
 rarian (0.8.1-4) unstable; urgency=low
 
   * Build a dummy scrollkeeper package to facilitate upgrades.
diff -urN rarian-0.8.1.original//debian/rarian-compat.postinst rarian-0.8.1/debian/rarian-compat.postinst
--- rarian-0.8.1.original//debian/rarian-compat.postinst	1970-01-01 02:00:00.000000000 +0200
+++ rarian-0.8.1/debian/rarian-compat.postinst	2010-03-03 15:34:20.000000000 +0200
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+# In some cases old scrollkeeper left over its catalog. See #532271.
+if [ "$1" = "configure" ] && dpkg --compare-versions "$2" lt "0.8.1-4.1"; then
+	update-xmlcatalog --del --type uri --id "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/"; --package scrollkeeper >/dev/null 2>/dev/null || true
+fi
+
+#DEBHELPER#
-- 
Tommi Vainikainen

Reply via email to