Merge lp:~noskcaj/ubuntu/utopic/xfce4-power-manager/merge into lp:ubuntu/utopic/xfce4-power-manager

[Jackson Doak]

Merge from debian

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

review: Approve

Unmerged revisions

41. By Jackson Doak on 2014-06-12

* Merge from debian. Remaining changes:
  - 06_fix-suspend-auth-check.patch: added, correctly check for suspend
    permissions before disabling the corresponding drop-down menu item.
    lp #929537
  - 08_show_preferences_lxde.patch: Hide settings menu only on desktop
    environment which have another power manager.
  - Switch to using logind for session tracking. Depend on systemd-services
    instead of consolekit recommends, and add libsystemd-login-dev build
    dependency.
  - 05_dont-allow-systemd-to-handle-suspend-hibernate-events.patch
  - 06_add-shutdown-reboot-functionality-for-systemd.patch
  - 07_fix-screen-dimming.patch
  - 09_sync_session_xfpm_lock_setting.patch
  - 10_inhibit_logind.patch

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-02 08:07:35 +0000
+++ debian/changelog	2014-06-12 21:09:28 +0000
@@ -1,3 +1,33 @@
+xfce4-power-manager (1.2.0-4ubuntu1) utopic; urgency=medium
+
+  * Merge from debian. Remaining changes:
+    - 06_fix-suspend-auth-check.patch: added, correctly check for suspend
+      permissions before disabling the corresponding drop-down menu item.
+      lp #929537
+    - 08_show_preferences_lxde.patch: Hide settings menu only on desktop
+      environment which have another power manager.
+    - Switch to using logind for session tracking. Depend on systemd-services
+      instead of consolekit recommends, and add libsystemd-login-dev build
+      dependency.
+    - 05_dont-allow-systemd-to-handle-suspend-hibernate-events.patch
+    - 06_add-shutdown-reboot-functionality-for-systemd.patch
+    - 07_fix-screen-dimming.patch
+    - 09_sync_session_xfpm_lock_setting.patch
+    - 10_inhibit_logind.patch
+
+ -- Jackson Doak <[e-mail]>  Fri, 13 Jun 2014 06:43:15 +1000
+
+xfce4-power-manager (1.2.0-4) unstable; urgency=medium
+
+  * debian/control:
+    - replace consolekit recommends by libpam-systemd, and add systemd-shim |
+      system-sysv as well in order to not force systemd as init to users for
+      now.
+  * debian/control:
+    - update standards version to 3.9.5.
+
+ -- Yves-Alexis Perez <[e-mail]>  Wed, 11 Jun 2014 21:22:22 +0200
+
 xfce4-power-manager (1.2.0-3ubuntu6) utopic; urgency=medium
 
   * Actually use the 10_inhibit_logind.patch

=== modified file 'debian/control'
--- debian/control	2013-12-11 18:22:21 +0000
+++ debian/control	2014-06-12 21:09:28 +0000
@@ -10,7 +10,7 @@
  libxfce4ui-1-dev (>= 4.10.0), libnotify-dev, xfce4-panel-dev (>= 4.10.0),
  libpolkit-gobject-1-dev, libxext-dev, libx11-dev, dpkg-dev (>= 1.16.1),
  xfce4-dev-tools, libtool, dh-autoreconf, libsystemd-login-dev
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Vcs-Svn: svn://anonscm.debian.org/pkg-xfce/goodies/trunk/xfce4-power-manager/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-xfce/goodies/trunk/xfce4-power-manager/
 Homepage: http://goodies.xfce.org/projects/applications/xfce4-power-manager
@@ -18,7 +18,8 @@
 Package: xfce4-power-manager
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, upower,
- xfce4-power-manager-data (=${source:Version}), systemd-services
+ xfce4-power-manager-data (=${source:Version})
+Recommends: libpam-systemd [linux-any], systemd-shim | systemd-sysv [linux-any], systemd-services
 Suggests: xfce4-power-manager-plugins, udisks
 Description: power manager for Xfce desktop
  This power manager for the Xfce desktop enables laptop users to set up