diff -Nru gnome-main-menu-1.8.0/debian/changelog gnome-main-menu-1.8.0/debian/changelog --- gnome-main-menu-1.8.0/debian/changelog 2014-07-22 22:35:01.000000000 +0000 +++ gnome-main-menu-1.8.0/debian/changelog 2015-01-20 11:43:39.000000000 +0000 @@ -1,9 +1,23 @@ -gnome-main-menu (1.8.0-2~ppa1~trusty1) trusty; urgency=low +gnome-main-menu (1.8.0-4~trusty1) trusty; urgency=medium - * Back ported from http://ftp.de.debian.org/debian/pool/main/g/gnome- - main-menu/gnome-main-menu_1.8.0-2.dsc + * Follow-up fix for #769418: Install main-menu to + /usr/lib/gnome-main-menu, not directly into /usr/lib. - -- Martin Wimpress Tue, 22 Jul 2014 23:35:01 +0100 + -- Mike Gabriel Fri, 12 Dec 2014 10:33:09 +0100 + +gnome-main-menu (1.8.0-3) unstable; urgency=medium + + * debian/rules: + + Install main-menu executable to non-multi-arch libexecdir. (Closes: + #769418). + + Use upstream's NEWS file as upstream ChangeLog. + * debian/control: + + Bump Standards: to 3.9.6. No changes needed. + * debian/copyright: + + Really mention all upstream files. Fixes several lintian warnings + (file-without-copyright-information). + + -- Mike Gabriel Fri, 12 Dec 2014 09:53:41 +0100 gnome-main-menu (1.8.0-2) unstable; urgency=low diff -Nru gnome-main-menu-1.8.0/debian/control gnome-main-menu-1.8.0/debian/control --- gnome-main-menu-1.8.0/debian/control 2014-06-12 06:25:06.000000000 +0000 +++ gnome-main-menu-1.8.0/debian/control 2014-12-12 08:54:14.000000000 +0000 @@ -27,7 +27,7 @@ mate-common, libdconf-dev, libstartup-notification0-dev, -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Homepage: http://www.mate-desktop.org/ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-mate/gnome-main-menu.git;a=summary Vcs-Git: git://anonscm.debian.org/pkg-mate/gnome-main-menu.git diff -Nru gnome-main-menu-1.8.0/debian/copyright gnome-main-menu-1.8.0/debian/copyright --- gnome-main-menu-1.8.0/debian/copyright 2014-05-02 21:46:47.000000000 +0000 +++ gnome-main-menu-1.8.0/debian/copyright 2014-12-12 09:14:39.000000000 +0000 @@ -39,11 +39,15 @@ 2006, Novell, Inc. License: LGPL-2+ -Files: application-browser/etc/Makefile.am +Files: application-browser/etc/.cvsignore + application-browser/etc/Makefile.am application-browser/etc/*.1 application-browser/etc/*.in + application-browser/src/.cvsignore application-browser/src/Makefile.am + caja-main-menu/.cvsignore caja-main-menu/Makefile.am + main-menu/etc/.cvsignore main-menu/etc/Makefile.am main-menu/etc/*.xbel main-menu/etc/*.ots @@ -51,13 +55,23 @@ main-menu/etc/*.desktop main-menu/etc/*.in main-menu/etc/*.xml + main-menu/src/.cvsignore main-menu/src/Makefile.am main-menu/src/*.ui main-menu/src/trigger-panel-run-dialog.c patch/* + po/.cvsignore po/LINGUAS po/POTFILES.* + .cvsignore + AUTHORS + COPYING + ChangeLog + INSTALL + MAINTAINERS Makefile.am + NEWS + README autogen.sh configure.ac gnome-main-menu.doap @@ -67,6 +81,7 @@ Using license from COPYING file. Files: po/*.po + po/ChangeLog Copyright: THE PACKAGE'S COPYRIGHT HOLDER 1999-2001, SuSE GmbH 2001-2013, Free Software Foundation, Inc. diff -Nru gnome-main-menu-1.8.0/debian/rules gnome-main-menu-1.8.0/debian/rules --- gnome-main-menu-1.8.0/debian/rules 2014-06-12 06:24:56.000000000 +0000 +++ gnome-main-menu-1.8.0/debian/rules 2014-12-12 09:26:04.000000000 +0000 @@ -5,6 +5,9 @@ %: dh $@ $(DHFLAGS) +override_dh_installchangelogs: + dh_installchangelogs NEWS + override_dh_install: rm -rfv debian/tmp/usr/lib/*/*.la rm -rfv debian/tmp/usr/lib/*/caja/extensions-2.0/*.la @@ -13,6 +16,7 @@ override_dh_auto_configure: NOCONFIGURE=1 ./autogen.sh dh_auto_configure $(DHFLAGS) -- \ + --libexecdir=/usr/lib/gnome-main-menu \ --enable-caja-extension \ --with-gtk=2.0