diff -Nru xfce4-power-manager-1.3.0/debian/changelog xfce4-power-manager-1.3.0/debian/changelog --- xfce4-power-manager-1.3.0/debian/changelog 2014-06-24 07:30:02.000000000 +1000 +++ xfce4-power-manager-1.3.0/debian/changelog 2014-06-25 19:16:54.000000000 +1000 @@ -1,3 +1,13 @@ +xfce4-power-manager (1.3.0-1ubuntu1) utopic; urgency=medium + + * Merge from debian. (LP: #1334185) Remaining changes: + - Switch to using logind for session tracking. Depend on systemd-services + and add libsystemd-login-dev build dependency. + * Use upower << 0.99 + * Drop all patches, fixed upstream + + -- Jackson Doak Wed, 25 Jun 2014 19:13:23 +1000 + xfce4-power-manager (1.3.0-1) experimental; urgency=low [ Evgeni Golov ] @@ -30,6 +39,126 @@ -- Yves-Alexis Perez Mon, 23 Jun 2014 23:26:09 +0200 +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 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 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 + + -- Jackson Doak Mon, 02 Jun 2014 08:07:35 +1000 + +xfce4-power-manager (1.2.0-3ubuntu5) utopic; urgency=medium + + * Add 10_inhibit_logind.patch (Fixes LP: #1303736, Closes LP: #1323367) + + -- Sean Davis Tue, 27 May 2014 00:03:16 -0400 + +xfce4-power-manager (1.2.0-3ubuntu4) trusty; urgency=medium + + * Add 09_sync_session_xfpm_lock_setting.patch (LP: #1101982) + + -- Sean Davis Mon, 07 Apr 2014 10:09:14 -0500 + +xfce4-power-manager (1.2.0-3ubuntu3) trusty; urgency=medium + + * Add 07_fix-screen-dimming.patch. LP: #1067749 + * Add DEP3 Header to 06_add-shutdown-reboot-functionality-for-systemd.patch + + -- Jackson Doak Wed, 22 Jan 2014 16:02:45 +1100 + +xfce4-power-manager (1.2.0-3ubuntu2) trusty; urgency=medium + + * Add patches from debian svn branch to fix systemd. LP: #1222021 + * Force run of xdt-autogen to continue to allow ppc64el to build + + -- Jackson Doak Mon, 20 Jan 2014 07:04:09 +1100 + +xfce4-power-manager (1.2.0-3ubuntu1) trusty; urgency=low + + [ Jackson Doak ] + * Merged from debian unstable. 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. + * Drop xubuntu_fix-status-icon-other-devices.patch, fixed in debian + + [ Logan Rosen ] + * Get rid of 09_fix_insert_battery.patch, an Ubuntu patch that was applied + in Debian. + + -- Jackson Doak Wed, 11 Dec 2013 18:22:21 +1100 + +xfce4-power-manager (1.2.0-3) unstable; urgency=medium + + [ Evgeni Golov ] + * Correct Vcs-* URLs to point to anonscm.debian.org + + [ Jackson Doak ] + * debian/control: + - Bump standards-version to 3.9.4 + - Build-depend on dh-autoreconf + - Drop redandant "Section" category + * debian/rules: --with autoreconf + * Created debian/source/options + * Create manpages for xfce4-power-information + and xfpm-power-backlight-helper + + [ Yves-Alexis Perez ] + * debian/patches: + - 04_fix-missing-icons-for-non-system-batteries added, fix icon missing in + the system tray for non system batteries. closes: #728257 + + -- Yves-Alexis Perez Mon, 09 Dec 2013 07:50:25 +0100 + +xfce4-power-manager (1.2.0-2ubuntu1) saucy; urgency=low + + * Merged from debian unstable. 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. + - xubuntu_fix-status-icon-other-devices.patch: fix broken status icons + for other devices (phone, wireless kbd, mouse, etc.). + - Switch to using logind for session tracking. Depend on systemd-services + instead of consolekit recommends, and add libsystemd-login-dev build + dependency. + + -- Jackson Doak Tue, 13 Aug 2013 06:56:35 +1000 + xfce4-power-manager (1.2.0-2) unstable; urgency=low [ Lionel Le Folgoc ] @@ -49,6 +178,37 @@ -- Lionel Le Folgoc Wed, 22 May 2013 00:46:08 +0200 +xfce4-power-manager (1.2.0-1ubuntu3) saucy; urgency=low + + * Switch to using logind for session tracking. Depend on systemd-services + instead of consolekit recommends, and add libsystemd-login-dev build + dependency. + + -- Benjamin Kerensa Mon, 11 Mar 2013 01:46:13 -0700 + +xfce4-power-manager (1.2.0-1ubuntu2) raring; urgency=low + + * debian/patches: + - 02_translations-fix-invalid-format-strings.patch: updated to fix + crashes because of en_GB.po and tr.po. lp: #1054907 + + -- Lionel Le Folgoc Mon, 29 Oct 2012 11:49:03 +0100 + +xfce4-power-manager (1.2.0-1ubuntu1) quantal; urgency=low + + * Merge from Debian experimental, remaining Ubuntu 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. + - 09_fix_insert_battery.patch: Another patch to fix empty icon when + removing a battery. Thanks Henry Gebhardt for the patch. + - xubuntu_fix-status-icon-other-devices.patch: fix broken status icons + for other devices (phone, wireless kbd, mouse, etc.). + + -- Lionel Le Folgoc Fri, 18 May 2012 21:50:54 +0200 + xfce4-power-manager (1.2.0-1) experimental; urgency=low * New upstream stable release. diff -Nru xfce4-power-manager-1.3.0/debian/control xfce4-power-manager-1.3.0/debian/control --- xfce4-power-manager-1.3.0/debian/control 2014-06-24 07:26:04.000000000 +1000 +++ xfce4-power-manager-1.3.0/debian/control 2014-06-25 19:19:06.000000000 +1000 @@ -1,14 +1,15 @@ Source: xfce4-power-manager Section: xfce Priority: optional -Maintainer: Debian Xfce Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Xfce Maintainers Uploaders: Yves-Alexis Perez , Lionel Le Folgoc Build-Depends: debhelper (>= 9), intltool, pkg-config, libgtk2.0-dev, libdbus-1-dev, libdbus-glib-1-dev, libxfconf-0-dev (>= 4.10.0), libxfce4ui-1-dev (>= 4.11.0), libnotify-dev, xfce4-panel-dev (>= 4.11.0), libpolkit-gobject-1-dev, libxext-dev, libx11-dev, dpkg-dev (>= 1.16.1), xfce4-dev-tools, libtool, dh-autoreconf, libsystemd-daemon-dev, - libupower-glib-dev (>= 0.99) + libupower-glib-dev (<< 0.99), libsystemd-login-dev Standards-Version: 3.9.5 Vcs-Svn: svn://anonscm.debian.org/pkg-xfce/desktop/trunk/xfce4-power-manager/ Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-xfce/desktop/trunk/xfce4-power-manager/ @@ -16,8 +17,8 @@ Package: xfce4-power-manager Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, upower (>= 0.99), - xfce4-power-manager-data (=${source:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, upower (<< 0.99), + xfce4-power-manager-data (=${source:Version}), systemd-services Recommends: libpam-systemd [linux-any], xfce4-power-manager-plugins Suggests: udisks Description: power manager for Xfce desktop