Bug#592616: pu: package bgoffice/3.0-9+lenny1
В 10:03 +0100 на 27.08.2010 (пт), Adam D. Barratt написа:
> On Fri, August 27, 2010 09:26, Yavor Doganov wrote:
> > Sure, does this mean that with this change the update is approved and
> > can be uploaded?
>
> I'd prefer a look at an updated debdiff first; I don't envisage there
> being any other issues though.
OK, here it is.
diff -u bgoffice-3.0/debian/changelog bgoffice-3.0/debian/changelog
--- bgoffice-3.0/debian/changelog
+++ bgoffice-3.0/debian/changelog
@@ -1,3 +1,15 @@
+bgoffice (3.0-9+lenny1) stable; urgency=low
+
+ * QA upload.
+ * debian/aspell-bg.postrm: Delete; harmful during upgrades or package
+ reinstallation (Closes: #589851).
+ * debian/aspell-bg.postinst: Recover from the old erroneous postrm and
+ touch bg{,-en}.rws and bg.compat if the files do not exist.
+ * debian/rules (install): Create an empty var/lib/aspell/bg-en.rws.
+ (binary-common): Pass -Xvar/lib/aspell to dh_md5sums.
+
+ -- Yavor Doganov <yavor@gnu.org> Fri, 27 Aug 2010 12:14:22 +0300
+
bgoffice (3.0-9) unstable; urgency=low
* QA upload.
diff -u bgoffice-3.0/debian/aspell-bg.postinst bgoffice-3.0/debian/aspell-bg.postinst
--- bgoffice-3.0/debian/aspell-bg.postinst
+++ bgoffice-3.0/debian/aspell-bg.postinst
@@ -9,6 +9,12 @@
bulgarian-aspell-dictionary $DIR/bg-w_english.multi 60
update-alternatives --install $DIR/bg.multi \
bulgarian-aspell-dictionary $DIR/bg-wo_english.multi 40
+ # Touch the files deleted by old postrm (#589851).
+ # FIXME: Remove this snippet post-squeeze.
+ DIRV="/var/lib/aspell"
+ for f in $DIRV/bg.rws $DIRV/bg-en.rws $DIRV/bg.compat; do
+ [ -f $f ] || touch $f;
+ done
;;
abort-upgrade|abort-remove|abort-deconfigure)
reverted:
--- bgoffice-3.0/debian/aspell-bg.postrm
+++ bgoffice-3.0.orig/debian/aspell-bg.postrm
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
- DIR=/var/lib/aspell
- rm -f $DIR/bg.compat $DIR/bg-en.rws $DIR/bg.rws
- ;;
-
-*)
- echo "postrm called with unknown argument '$1'" >&2
- exit 1
- ;;
-esac
-
-
-#DEBHELPER#
-
-exit 0
-
diff -u bgoffice-3.0/debian/rules bgoffice-3.0/debian/rules
--- bgoffice-3.0/debian/rules
+++ bgoffice-3.0/debian/rules
@@ -102,6 +102,9 @@
# $WORDLIST is the wordlist filename minus the .*wl.gz extension)
install -d debian/aspell-bg/var/lib/aspell/
>debian/aspell-bg/var/lib/aspell/bg.rws
+# Make sure dpkg knows about bg-en.rws too, otherwise the file is not
+# deleted upon remove/purge.
+ >debian/aspell-bg/var/lib/aspell/bg-en.rws
# Add a symlink /usr/lib/aspell/$WORDLIST.rws -> /var/lib/aspell/$WORDLIST.rws
install -d debian/aspell-bg/usr/lib/aspell/
ln -s /var/lib/aspell/bg.rws debian/aspell-bg/usr/lib/aspell/bg.rws
@@ -144,7 +147,7 @@
# dh_perl
dh_shlibdeps
dh_gencontrol
- dh_md5sums
+ dh_md5sums -Xvar/lib/aspell
dh_builddeb
# Build architecture independant packages using the common target.
Reply to: