Bug#774677: unblock (pre-approval): mate-terminal/1.8.1+dfsg1-4
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please consider unblocking planned upload of package mate-terminal.
This upload fixes how mate-terminal is used as xterm
(x-terminal-emulator) alternative:
* debian/control:
+ Make mate-terminal "Multi-Arch: foreign". (Closes: #774182).
-> On amd64 platforms, the above fix allows mate-terminal to be
co-installed with applications that are available for i386 only and that
depend on x-terminal emulator.
* debian/mate-terminal.{postinst,prerm):
+ Use mate-terminal.wrapper (instead of mater-terminal binary directly) as
alternative for x-terminal-emulator. (Closes: #773431).
-> Before this upload we erroneously used the mate-terminal executable
directly as xterm alternative. However, mate-terminal directly does not
provide the correct set of cmdline options. The mate-terminal.wrapper
script has been written for this purpose specifically and we should have
used it in the first place, but did not...
light+love,
Mike
unblock mate-terminal/1.8.1+dfsg1-4
-- System Information:
Debian Release: 8.0
APT prefers stable
APT policy: (990, 'stable'), (500, 'testing-updates'), (500, 'testing-proposed-updates'), (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru mate-terminal-1.8.1+dfsg1/debian/changelog mate-terminal-1.8.1+dfsg1/debian/changelog
--- mate-terminal-1.8.1+dfsg1/debian/changelog 2014-11-30 20:25:43.000000000 +0100
+++ mate-terminal-1.8.1+dfsg1/debian/changelog 2015-01-06 05:20:58.000000000 +0100
@@ -1,3 +1,13 @@
+mate-terminal (1.8.1+dfsg1-4) unstable; urgency=medium
+
+ * debian/control:
+ + Make mate-terminal "Multi-Arch: foreign". (Closes: #774182).
+ * debian/mate-terminal.{postinst,prerm):
+ + Use mate-terminal.wrapper (instead of mater-terminal binary directly) as
+ alternative for x-terminal-emulator. (Closes: #773431).
+
+ -- Mike Gabriel <sunweaver@debian.org> Tue, 06 Jan 2015 05:20:55 +0100
+
mate-terminal (1.8.1+dfsg1-3) unstable; urgency=medium
* debian/patches:
diff -Nru mate-terminal-1.8.1+dfsg1/debian/control mate-terminal-1.8.1+dfsg1/debian/control
--- mate-terminal-1.8.1+dfsg1/debian/control 2014-10-24 12:14:56.000000000 +0200
+++ mate-terminal-1.8.1+dfsg1/debian/control 2015-01-06 05:04:45.000000000 +0100
@@ -26,6 +26,7 @@
Vcs-Git: git://anonscm.debian.org/pkg-mate/mate-terminal.git
Package: mate-terminal
+Multi-Arch: foreign
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
diff -Nru mate-terminal-1.8.1+dfsg1/debian/mate-terminal.postinst mate-terminal-1.8.1+dfsg1/debian/mate-terminal.postinst
--- mate-terminal-1.8.1+dfsg1/debian/mate-terminal.postinst 2014-02-23 15:58:38.000000000 +0100
+++ mate-terminal-1.8.1+dfsg1/debian/mate-terminal.postinst 2015-01-06 05:15:25.000000000 +0100
@@ -4,8 +4,17 @@
#DEBHELPER#
-if [ "$1" = "configure" ]; then
- update-alternatives --install /usr/bin/x-terminal-emulator \
- x-terminal-emulator /usr/bin/mate-terminal 30
+# We erroneously ignored the mate-terminal.wrapper as x-terminal-emulator before 1.8.1+dfsg1-3
+# and used mate-terminal directly (which does not provide the correct command line options
+# natively, see Debain bug #773431).
+if [ "$1" = "configure" ] && dpkg --compare-versions "$2" le "1.8.1+dfsg1-3"; then
+ update-alternatives --remove x-terminal-emulator /usr/bin/mate-terminal
fi
+# use mate-terminal.wrapper as alternative for x-terminal-emulator
+if [ "$1" = "configure" ]; then
+ update-alternatives --install /usr/bin/x-terminal-emulator \
+ x-terminal-emulator /usr/bin/mate-terminal.wrapper 30 \
+ --slave /usr/share/man/man1/x-terminal-emulator.1.gz \
+ x-terminal-emulator.1.gz /usr/share/man/man1/mate-terminal.1.gz
+fi
diff -Nru mate-terminal-1.8.1+dfsg1/debian/mate-terminal.prerm mate-terminal-1.8.1+dfsg1/debian/mate-terminal.prerm
--- mate-terminal-1.8.1+dfsg1/debian/mate-terminal.prerm 2014-02-23 15:58:38.000000000 +0100
+++ mate-terminal-1.8.1+dfsg1/debian/mate-terminal.prerm 2015-01-06 05:13:44.000000000 +0100
@@ -5,6 +5,6 @@
#DEBHELPER#
if [ "$1" = "remove" ]; then
- update-alternatives --remove x-terminal-emulator /usr/bin/mate-terminal
+ update-alternatives --remove x-terminal-emulator /usr/bin/mate-terminal.wrapper
fi
Reply to: