r53353 - in /desktop/unstable/gnome-power-manager/debian: changelog control control.in rules

[jbicha at users.alioth.debian.org]

Author: jbicha
Date: Sat Sep  2 00:54:13 2017
New Revision: 53353

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=53353
Log:
Depend on gnome-settings-daemon-schemas on Ubuntu

Modified:
    desktop/unstable/gnome-power-manager/debian/changelog
    desktop/unstable/gnome-power-manager/debian/control
    desktop/unstable/gnome-power-manager/debian/control.in
    desktop/unstable/gnome-power-manager/debian/rules

Modified: desktop/unstable/gnome-power-manager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/debian/changelog?rev=53353&op=diff
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-power-manager/debian/changelog	[utf-8] Sat Sep  2 00:54:13 2017
@@ -4,6 +4,8 @@
   * Switch to meson
   * debian/rules:
     - Add workaround for Ubuntu translations issue
+  * Depend on gnome-settings-daemon-schemas instead of
+    gnome-settings-daemon on Ubuntu
   * Drop 0001-Rename-the-application-id-passed-to-the-gtk_applicat.patch:
     - Applied in new release
   * Add ctrl-q-quit.patch from Ubuntu

Modified: desktop/unstable/gnome-power-manager/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/debian/control?rev=53353&op=diff
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/control	[utf-8] (original)
+++ desktop/unstable/gnome-power-manager/debian/control	[utf-8] Sat Sep  2 00:54:13 2017
@@ -6,17 +6,16 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>
-Build-Depends: debhelper (>= 10),
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Jeremy Bicha <jbicha at debian.org>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>
+Build-Depends: debhelper (>= 10.3~),
                gnome-pkg-tools (>= 0.10),
-               autoconf-archive,
                libglib2.0-dev (>= 2.45.8),
                libgtk-3-dev (>= 3.4.0),
                libcairo2-dev (>= 1.0.0),
                libupower-glib-dev (>= 0.99),
                docbook-to-man,
-               intltool (>= 0.50.0),
                docbook-utils,
+               meson (>= 0.37.0),
                pkg-config,
                appstream-util
 Standards-Version: 3.9.8
@@ -29,9 +28,9 @@
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
+         ${gnome-settings-daemon:Depends},
          default-dbus-session-bus | dbus-session-bus,
-         upower (>= 0.99),
-         gnome-settings-daemon (>= 3.2)
+         upower (>= 0.99)
 Description: power management tool for the GNOME desktop
  GNOME Power Manager is a session daemon for the GNOME desktop
  that takes care of system or desktop events related to power, and

Modified: desktop/unstable/gnome-power-manager/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/debian/control.in?rev=53353&op=diff
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gnome-power-manager/debian/control.in	[utf-8] Sat Sep  2 00:54:13 2017
@@ -24,9 +24,9 @@
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
+         ${gnome-settings-daemon:Depends},
          default-dbus-session-bus | dbus-session-bus,
-         upower (>= 0.99),
-         gnome-settings-daemon (>= 3.2)
+         upower (>= 0.99)
 Description: power management tool for the GNOME desktop
  GNOME Power Manager is a session daemon for the GNOME desktop
  that takes care of system or desktop events related to power, and

Modified: desktop/unstable/gnome-power-manager/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/debian/rules?rev=53353&op=diff
==============================================================================
--- desktop/unstable/gnome-power-manager/debian/rules	[utf-8] (original)
+++ desktop/unstable/gnome-power-manager/debian/rules	[utf-8] Sat Sep  2 00:54:13 2017
@@ -11,3 +11,10 @@
 override_dh_translations:
 	dh_translations
 	ninja -C obj-$(DEB_HOST_GNU_TYPE) gnome-power-manager-pot
+
+override_dh_gencontrol:
+ifeq ($(shell dpkg-vendor --query vendor),Ubuntu)
+	dh_gencontrol -- -Vgnome-settings-daemon:Depends='gnome-settings-daemon-schemas (>= 3.2)'
+else
+	dh_gencontrol -- -Vgnome-settings-daemon:Depends='gnome-settings-daemon (>= 3.2)'
+endif