Hi Josip,
find the debdiff for the NMU version 3.7-2.1 attached,
as discussed.
bye,
//mirabilos
--
<ch> you introduced a merge commit │<mika> % g rebase -i HEAD^^
<mika> sorry, no idea and rebasing just fscked │<mika> Segmentation
<ch> should have cloned into a clean repo │ fault (core dumped)
<ch> if I rebase that now, it's really ugh │<mika:#grml> wuahhhhhh
diff -u joe-3.7/debian/control joe-3.7/debian/control
--- joe-3.7/debian/control
+++ joe-3.7/debian/control
@@ -9,6 +9,7 @@
Package: joe
Architecture: any
Depends: ${shlibs:Depends}
+Breaks: jupp (<< 3.1.17-5~)
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/postinst joe-3.7/debian/postinst
--- joe-3.7/debian/postinst
+++ joe-3.7/debian/postinst
@@ -3,20 +3,25 @@
if [ "$1" = "configure" ]; then
update-alternatives --install /usr/bin/editor editor /usr/bin/joe 70 \
+ --slave /var/lib/misc/editorrc editorrc /etc/joe/joerc \
--slave /usr/share/man/man1/editor.1.gz editor.1.gz
/usr/share/man/man1/joe.1.gz
- update-alternatives --install /etc/joe/editorrc editorrc /etc/joe/joerc 70
update-alternatives --install /usr/bin/editor editor /usr/bin/jmacs 50 \
+ --slave /var/lib/misc/editorrc editorrc /etc/joe/jmacsrc \
--slave /usr/share/man/man1/editor.1.gz editor.1.gz
/usr/share/man/man1/jmacs.1.gz
- update-alternatives --install /etc/joe/editorrc editorrc /etc/joe/jmacsrc 50
update-alternatives --install /usr/bin/editor editor /usr/bin/jstar 50 \
+ --slave /var/lib/misc/editorrc editorrc /etc/joe/jstarrc \
--slave /usr/share/man/man1/editor.1.gz editor.1.gz
/usr/share/man/man1/jstar.1.gz
- update-alternatives --install /etc/joe/editorrc editorrc /etc/joe/jstarrc 50
update-alternatives --install /usr/bin/editor editor /usr/bin/jpico 50 \
+ --slave /var/lib/misc/editorrc editorrc /etc/joe/jpicorc \
--slave /usr/share/man/man1/editor.1.gz editor.1.gz
/usr/share/man/man1/jpico.1.gz
- update-alternatives --install /etc/joe/editorrc editorrc /etc/joe/jpicorc 50
update-alternatives --install /usr/bin/editor editor /usr/bin/rjoe 25 \
+ --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
- update-alternatives --install /etc/joe/editorrc editorrc /etc/joe/rjoerc 25
+
+ if test -z "$2" || dpkg --compare-versions "$2" lt '3.7-2.1~'; then
+ rm -f /etc/joe/editorrc
+ ln -sf ../../var/lib/misc/editorrc /etc/joe/editorrc
+ fi
if [ -x "`which update-menus 2>/dev/null`" ]; then update-menus ; fi
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,13 @@
+joe (3.7-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Improve coexistence of joe and jupp: move the editorrc symlink
+ to /var/lib/misc/editorrc and make it an update-alternatives
+ slave to editor (agreed by Raphaël Hertzog, Josip Rodin).
+ closes: #644282
+
+ -- Thorsten Glaser <t...@mirbsd.de> Wed, 05 Oct 2011 20:29:50 +0000
+
joe (3.7-2) unstable; urgency=high
* Fix the crash when typing too many dashes on a line, d'oh,
diff -u joe-3.7/debian/prerm joe-3.7/debian/prerm
--- joe-3.7/debian/prerm
+++ joe-3.7/debian/prerm
@@ -4,11 +4,6 @@
update-alternatives --remove editor /usr/bin/joe
- update-alternatives --remove editorrc /etc/joe/joerc
update-alternatives --remove editor /usr/bin/jmacs
- update-alternatives --remove editorrc /etc/joe/jmacsrc
update-alternatives --remove editor /usr/bin/jstar
- update-alternatives --remove editorrc /etc/joe/jstarrc
update-alternatives --remove editor /usr/bin/jpico
- update-alternatives --remove editorrc /etc/joe/jpicorc
update-alternatives --remove editor /usr/bin/rjoe
- update-alternatives --remove editorrc /etc/joe/rjoerc
fi
only in patch2:
unchanged:
--- joe-3.7.orig/debian/preinst
+++ joe-3.7/debian/preinst
@@ -0,0 +1,9 @@
+#!/bin/sh -e
+
+# 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
