debian/rules: Add Ubuntu specific UI patch so that indicator-power integrates neatly.

This commit is contained in:
Martin Wimpress
2019-05-05 09:50:12 +01:00
parent 1ef1b8eb50
commit 606e35327a
2 changed files with 21 additions and 2 deletions

View File

@ -0,0 +1,14 @@
Description: Disable the notification preferences so options are not presented that indicator-power handles.
Author: Martin Wimpress <code@flexion.org>
--- a/data/gpm-prefs.ui
+++ b/data/gpm-prefs.ui
@@ -895,7 +895,7 @@
</child>
<child>
<object class="GtkVBox" id="vbox_notification">
- <property name="visible">True</property>
+ <property name="visible">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>

9
debian/rules vendored
View File

@ -14,8 +14,8 @@ override_dh_missing:
override_dh_install: override_dh_install:
dh_install dh_install
# Override some mate-power-manager default because Ubuntu MATE has # Ubuntu MATE enables indicators by default which include indicator-power
# indicator-power enabled by default. # so override mate-power-manager defaults accordingly.
ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes),yes) ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes),yes)
dh_install -pmate-power-manager-common debian/25_mate-power-manager-ubuntu.gschema.override /usr/share/glib-2.0/schemas/ dh_install -pmate-power-manager-common debian/25_mate-power-manager-ubuntu.gschema.override /usr/share/glib-2.0/schemas/
endif endif
@ -24,6 +24,11 @@ override_dh_installchangelogs:
dh_installchangelogs NEWS dh_installchangelogs NEWS
override_dh_auto_configure: override_dh_auto_configure:
# Ubuntu MATE enables indicators by default which include indicator-power
# so patch disable some UI in mate-power-manager that is irrelevant
ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes),yes)
patch data/gpm-prefs.ui < debian/patches/2000_disable_notification_prefs_ui.patch
endif
# upstream is without configure. autogen.sh will create it # upstream is without configure. autogen.sh will create it
NOCONFIGURE=1 ./autogen.sh NOCONFIGURE=1 ./autogen.sh
dh_auto_configure $(DHFLAGS) -- \ dh_auto_configure $(DHFLAGS) -- \