Dixi quod…
>Fix attached, will upload now.
Fix was not enough – if 3.7-2.1 was already installed, the fix
would not be triggered. Also, if either joe or jupp was ever
installed, then removed but not purged, and then the other of
the two would be installed, it was not triggered either, see
#644481 for that. Here’s the next debdiff for joe… I’m keeping
up (subscribed to joe’s bugmail).
bye,
//mirabilos
--
22:20⎜<asarch> The crazy that persists in his craziness becomes a master
22:21⎜<asarch> And the distance between the craziness and geniality is
only measured by the success 18:35⎜<asarch> "Psychotics are consistently
inconsistent. The essence of sanity is to be inconsistently inconsistent
diff -u joe-3.7/debian/changelog joe-3.7/debian/changelog
--- joe-3.7/debian/changelog
+++ joe-3.7/debian/changelog
@@ -1,3 +1,20 @@
+joe (3.7-2.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Also drop an old editorrc alternative if this package has never
+ been configured before (see #644481).
+ * Update version numbers for the joe/jupp conflicts.
+
+ -- Thorsten Glaser <t...@mirbsd.de> Thu, 06 Oct 2011 08:58:39 +0000
+
+joe (3.7-2.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Really install the preinst maintainer script this time.
+ closes: #644468
+
+ -- Thorsten Glaser <t...@mirbsd.de> Thu, 06 Oct 2011 08:06:10 +0000
+
joe (3.7-2.1) unstable; urgency=low
* Non-maintainer upload.
diff -u joe-3.7/debian/postinst joe-3.7/debian/postinst
--- joe-3.7/debian/postinst
+++ joe-3.7/debian/postinst
@@ -18,7 +18,7 @@
--slave /var/lib/misc/editorrc editorrc /etc/joe/rjoerc \
--slave /usr/share/man/man1/editor.1.gz editor.1.gz
/usr/share/man/man1/rjoe.1.gz
- if test -z "$2" || dpkg --compare-versions "$2" lt '3.7-2.1~'; then
+ if test -z "$2" || dpkg --compare-versions "$2" lt '3.7-2.3~'; then
rm -f /etc/joe/editorrc
ln -sf ../../var/lib/misc/editorrc /etc/joe/editorrc
fi
diff -u joe-3.7/debian/control joe-3.7/debian/control
--- joe-3.7/debian/control
+++ joe-3.7/debian/control
@@ -9,7 +9,7 @@
Package: joe
Architecture: any
Depends: ${shlibs:Depends}
-Breaks: jupp (<< 3.1.17-5~)
+Breaks: jupp (<< 3.1.18-2~)
Description: user friendly full screen text editor
Joe, the Joe's Own Editor, has the feel of most PC text editors: the key
sequences are reminiscent of WordStar and Turbo C editors, but the feature
diff -u joe-3.7/debian/rules joe-3.7/debian/rules
--- joe-3.7/debian/rules
+++ joe-3.7/debian/rules
@@ -50,7 +50,7 @@
install -m 644 debian/copyright debian/README.Debian
$(tmp)/usr/share/doc/joe
install -m 755 -d $(tmp)/DEBIAN
install -m 644 debian/conffiles $(tmp)/DEBIAN
- install -m 755 debian/postinst debian/prerm debian/postrm $(tmp)/DEBIAN
+ install -m 755 debian/preinst debian/postinst debian/prerm
debian/postrm $(tmp)/DEBIAN
install -m 755 -d $(tmp)/usr/share/menu
install -m 644 debian/menu $(tmp)/usr/share/menu/joe
dpkg-shlibdeps $(tmp)/usr/bin/joe
diff -u joe-3.7/debian/preinst joe-3.7/debian/preinst
--- joe-3.7/debian/preinst
+++ joe-3.7/debian/preinst
@@ -3,7 +3,11 @@
-# drop old editorrc (master alternative and symlink file both)
-if test x"$1" = x"upgrade" && test -n "$2" && \
- dpkg --compare-versions "$2" lt '3.7-2.1~'; then
- # this will noisily pass if editorrc was already removed,
- # but not remove a slave alternative
- (update-alternatives --remove-all editorrc 2>/dev/null || :)
-fi
+case $1 in
+install|upgrade)
+ # drop old editorrc (master alternative and symlink file both)
+ if test -z "$2" || \
+ dpkg --compare-versions "$2" lt '3.7-2.3~'; then
+ # this will noisily pass if editorrc was already removed,
+ # but not remove a slave alternative
+ (update-alternatives --remove-all editorrc 2>/dev/null || :)
+ fi
+ ;;
+esac
