diff -Nru mate-panel-1.8.1+dfsg1/debian/changelog mate-panel-1.8.1+dfsg1/debian/changelog --- mate-panel-1.8.1+dfsg1/debian/changelog 2014-10-31 13:04:10.000000000 +0000 +++ mate-panel-1.8.1+dfsg1/debian/changelog 2015-01-20 12:12:06.000000000 +0000 @@ -1,11 +1,10 @@ -mate-panel (1.8.1+dfsg1-2~trusty2) trusty; urgency=medium +mate-panel (1.8.1+dfsg1-3~trusty1) trusty; urgency=medium - * Back ported from http://ftp.de.debian.org/debian/pool/main/m/mate- - panel/mate-panel_1.8.1+dfsg1-2.dsc - * Revert to non-multiarch typelib location until the necessary - gobject-introspection changes have landed in Ubuntu. + * debian/rules: + - Install MATE panel applet executables to non-multi-arch libexecdir. + (Closes: #769422). - -- Ubuntu MATE Developers Fri, 31 Oct 2014 12:35:30 +0000 + -- Mike Gabriel Fri, 12 Dec 2014 11:33:42 +0100 mate-panel (1.8.1+dfsg1-2) unstable; urgency=medium diff -Nru mate-panel-1.8.1+dfsg1/debian/mate-panel.install mate-panel-1.8.1+dfsg1/debian/mate-panel.install --- mate-panel-1.8.1+dfsg1/debian/mate-panel.install 2014-02-14 20:56:49.000000000 +0000 +++ mate-panel-1.8.1+dfsg1/debian/mate-panel.install 2014-12-12 10:33:35.000000000 +0000 @@ -1,8 +1,8 @@ usr/bin/ -usr/lib/*/mate-panel/clock-applet -usr/lib/*/mate-panel/fish-applet -usr/lib/*/mate-panel/notification-area-applet -usr/lib/*/mate-panel/wnck-applet +usr/lib/mate-panel/clock-applet +usr/lib/mate-panel/fish-applet +usr/lib/mate-panel/notification-area-applet +usr/lib/mate-panel/wnck-applet usr/share/applications/ usr/share/dbus-1/ usr/share/glib-2.0/ diff -Nru mate-panel-1.8.1+dfsg1/debian/rules mate-panel-1.8.1+dfsg1/debian/rules --- mate-panel-1.8.1+dfsg1/debian/rules 2014-10-23 10:28:21.000000000 +0000 +++ mate-panel-1.8.1+dfsg1/debian/rules 2014-12-12 10:31:55.000000000 +0000 @@ -25,7 +25,7 @@ dh_auto_configure $(DHFLAGS) -- \ --disable-silent-rules \ --localstatedir=/var \ - --libexecdir=/usr/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)/mate-panel \ + --libexecdir=/usr/lib/mate-panel \ --disable-scrollkeeper \ --disable-static \ --enable-introspection \