From 33059e912b9d0d87ad6ef9365e8de68b6fd30baf Mon Sep 17 00:00:00 2001 From: Martin Wimpress Date: Tue, 15 Aug 2017 18:49:54 +0100 Subject: [PATCH] Update vala-panel-appmenu packaging to 0.5.3 (#19) * Move GTK_MODULES from Xsession.d to profile.d. * Enable bold appname. * Dropped budgie-appmenu-applet.gsettings-override, this should be a distro override and not shipped in the package. * Add maintscript remove obsolete configuration. * upload to artful (ubuntu/0.5.3-0ubuntu1) --- .../vala-panel-appmenu/debian/96vala-panel-appmenu | 12 ------------ .../debian/budgie-appmenu-applet.gsettings-override | 2 -- debian/vala-panel-appmenu/debian/changelog | 6 ++++++ debian/vala-panel-appmenu/debian/rules | 1 + .../debian/vala-panel-appmenu-common.install | 2 +- .../debian/vala-panel-appmenu-common.maintscript | 1 + .../vala-panel-appmenu/debian/vala-panel-appmenu.sh | 9 +++++++++ 7 files changed, 18 insertions(+), 15 deletions(-) delete mode 100644 debian/vala-panel-appmenu/debian/96vala-panel-appmenu delete mode 100644 debian/vala-panel-appmenu/debian/budgie-appmenu-applet.gsettings-override create mode 100644 debian/vala-panel-appmenu/debian/vala-panel-appmenu-common.maintscript create mode 100644 debian/vala-panel-appmenu/debian/vala-panel-appmenu.sh diff --git a/debian/vala-panel-appmenu/debian/96vala-panel-appmenu b/debian/vala-panel-appmenu/debian/96vala-panel-appmenu deleted file mode 100644 index 23f2bff..0000000 --- a/debian/vala-panel-appmenu/debian/96vala-panel-appmenu +++ /dev/null @@ -1,12 +0,0 @@ -# Xsession.d script to set the GTK_MODULES env variable to load unity-gtk-module -# This need to be sourced after dbus-daemon puts Xsession's environment -# in activated services' environments. -# -# This file is sourced by Xsession(5), not executed. -if [ -z "$GTK_MODULES" ]; then - GTK_MODULES="unity-gtk-module" -else - GTK_MODULES="$GTK_MODULES:unity-gtk-module" -fi -export GTK_MODULES -export UBUNTU_MENUPROXY=1 diff --git a/debian/vala-panel-appmenu/debian/budgie-appmenu-applet.gsettings-override b/debian/vala-panel-appmenu/debian/budgie-appmenu-applet.gsettings-override deleted file mode 100644 index 6860e69..0000000 --- a/debian/vala-panel-appmenu/debian/budgie-appmenu-applet.gsettings-override +++ /dev/null @@ -1,2 +0,0 @@ -[com.canonical.unity-gtk-module] -blacklist=["acroread","emacs","emacs23","emacs23-lucid","emacs24","emacs24-lucid","budgie-panel"] diff --git a/debian/vala-panel-appmenu/debian/changelog b/debian/vala-panel-appmenu/debian/changelog index c822f52..75457c1 100644 --- a/debian/vala-panel-appmenu/debian/changelog +++ b/debian/vala-panel-appmenu/debian/changelog @@ -1,3 +1,9 @@ +vala-panel-appmenu (0.5.3-0ubuntu1) artful; urgency=medium + + * New upstream release. + + -- Martin Wimpress Mon, 14 Aug 2017 23:03:02 +0100 + vala-panel-appmenu (0.5.2-0ubuntu1) artful; urgency=medium * Initial upload. (LP: #1699334) diff --git a/debian/vala-panel-appmenu/debian/rules b/debian/vala-panel-appmenu/debian/rules index c22ca4a..efa8a80 100755 --- a/debian/vala-panel-appmenu/debian/rules +++ b/debian/vala-panel-appmenu/debian/rules @@ -19,6 +19,7 @@ override_dh_auto_configure: -DENABLE_MATE=ON \ -DENABLE_VALAPANEL=ON \ -DENABLE_XFCE=ON \ + -DMAKE_BOLD_APPNAME=ON \ -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib override_dh_auto_install: diff --git a/debian/vala-panel-appmenu/debian/vala-panel-appmenu-common.install b/debian/vala-panel-appmenu/debian/vala-panel-appmenu-common.install index a5ba5a7..dd75ce2 100644 --- a/debian/vala-panel-appmenu/debian/vala-panel-appmenu-common.install +++ b/debian/vala-panel-appmenu/debian/vala-panel-appmenu-common.install @@ -1,2 +1,2 @@ -debian/96vala-panel-appmenu etc/X11/Xsession.d/ +debian/vala-panel-appmenu.sh etc/profile.d/ usr/share/locale/* diff --git a/debian/vala-panel-appmenu/debian/vala-panel-appmenu-common.maintscript b/debian/vala-panel-appmenu/debian/vala-panel-appmenu-common.maintscript new file mode 100644 index 0000000..50864a4 --- /dev/null +++ b/debian/vala-panel-appmenu/debian/vala-panel-appmenu-common.maintscript @@ -0,0 +1 @@ +rm_conffile /etc/X11/Xsession.d/96vala-panel-appmenu \ No newline at end of file diff --git a/debian/vala-panel-appmenu/debian/vala-panel-appmenu.sh b/debian/vala-panel-appmenu/debian/vala-panel-appmenu.sh new file mode 100644 index 0000000..88af206 --- /dev/null +++ b/debian/vala-panel-appmenu/debian/vala-panel-appmenu.sh @@ -0,0 +1,9 @@ +# Set the GTK_MODULES env variable to load unity-gtk-module + +if [ -z "$GTK_MODULES" ]; then + GTK_MODULES="unity-gtk-module" +else + GTK_MODULES="$GTK_MODULES:unity-gtk-module" +fi +export GTK_MODULES +export UBUNTU_MENUPROXY=1 \ No newline at end of file