diff -pruN 0.15.20-6/debian/changelog 0.15.20-6ubuntu1/debian/changelog --- 0.15.20-6/debian/changelog 2009-07-05 21:19:16.000000000 +0100 +++ 0.15.20-6ubuntu1/debian/changelog 2009-07-05 21:15:57.000000000 +0100 @@ -1,3 +1,18 @@ +powersave (0.15.20-6ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: LP: #395640 + - Add Replaces/Provides for powernowd and apmd, to allow installation + with *ubuntu-desktop meta packages. + - Drop changes for powerdev group used for dbus access on Debian: + + Drop debian/patches/man_powerdev_group.patch. + + Drop debian/patches/fix_script_message_handling.patch + + Drop debian/powersaved.postinst. + + Do not depend on adduser package. + - Remove (0.12.0-1) from debian/NEWS which doesn't apply to Ubuntu. + - Remove debian/README.Debian which doesn't apply to Ubuntu as well. + + -- Bhavani Shankar Sun, 05 Jul 2009 05:56:05 +0530 + powersave (0.15.20-6) unstable; urgency=low * debian/copyright @@ -20,6 +35,22 @@ powersave (0.15.20-6) unstable; urgency= -- Michael Biebl Wed, 01 Jul 2009 18:56:37 +0200 +powersave (0.15.20-5ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: LP: #326114 + - Add Replaces/Provides for powernowd and apmd, to allow installation + with *ubuntu-desktop meta packages. + - Drop changes for powerdev group used for dbus access on Debian: + + Drop debian/patches/man_powerdev_group.patch. + + Drop debian/patches/fix_script_message_handling.patch + + Drop debian/powersaved.postinst. + + Do not depend on adduser package. + - Remove (0.12.0-1) from debian/NEWS which doesn't apply to Ubuntu. + - Remove debian/README.Debian which doesn't apply to Ubuntu as well. + * Closes LP: #318759 + + -- Bhavani Shankar Fri, 06 Feb 2009 16:21:01 +0530 + powersave (0.15.20-5) unstable; urgency=low * debian/patches/01-dbus_access.patch @@ -31,6 +62,21 @@ powersave (0.15.20-5) unstable; urgency= -- Michael Biebl Thu, 05 Feb 2009 21:29:19 +0100 +powersave (0.15.20-4ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: LP: #312846 + - Add Replaces/Provides for powernowd and apmd, to allow installation + with *ubuntu-desktop meta packages. + - Drop changes for powerdev group used for dbus access on Debian: + + Drop debian/patches/dbus_access.patch. + + Drop debian/patches/man_powerdev_group.patch. + + Drop debian/powersaved.postinst. + + Do not depend on adduser package. + - Remove (0.12.0-1) from debian/NEWS which doesn't apply to Ubuntu. + - Remove debian/README.Debian which doesn't apply to Ubuntu as well. + + -- Bhavani Shankar Thu, 01 Jan 2009 15:27:26 +0530 + powersave (0.15.20-4) unstable; urgency=low * debian/patches/24-fix_script_message_handling.patch @@ -41,6 +87,21 @@ powersave (0.15.20-4) unstable; urgency= -- Michael Biebl Wed, 31 Dec 2008 00:05:55 +0100 +powersave (0.15.20-3ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #296726), remaining changes: + - Add Replaces/Provides for powernowd and apmd, to allow installation + with *ubuntu-desktop meta packages. + - Drop changes for powerdev group used for dbus access on Debian: + + Drop debian/patches/dbus_access.patch. + + Drop debian/patches/man_powerdev_group.patch. + + Drop debian/powersaved.postinst. + + Do not depend on adduser package. + * Remove (0.12.0-1) from debian/NEWS which doesn't apply to Ubuntu. + * Remove debian/README.Debian which doesn't apply to Ubuntu as well. + + -- Iulian Udrea Wed, 18 Nov 2008 17:01:01 +0000 + powersave (0.15.20-3) unstable; urgency=low * Switch patch system to quilt. @@ -139,6 +200,21 @@ powersave (0.15.20-1) unstable; urgency= -- Michael Biebl Sat, 05 Apr 2008 15:54:54 +0200 +powersave (0.14.0-8ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - Add Replaces/Provides for powernowd and apmd, to allow installation + with *ubuntu-desktop meta packages. + - Drop changes for powerdev group used for dbus access on Debian: + + Drop debian/patches/dbus_access.patch. + + Drop debian/patches/man_powerdev_group.patch. + + Drop debian/NEWS. + + Drop debian/powersaved.postinst. + + Do not depend on adduser package. + + Remove Security section from README.Debian. + + -- William Grant Tue, 13 Nov 2007 21:17:22 +1100 + powersave (0.14.0-8) unstable; urgency=low * debian/patches/08-uswsusp.patch @@ -149,6 +225,22 @@ powersave (0.14.0-8) unstable; urgency=l -- Michael Biebl Thu, 20 Sep 2007 15:04:54 +0200 +powersave (0.14.0-7ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - Add Replaces/Provides for powernowd and apmd, to allow installation + with *ubuntu-desktop meta packages. + - Drop changes for powerdev group used for dbus access on Debian: + + Drop debian/patches/dbus_access.patch. + + Drop debian/patches/man_powerdev_group.patch. + + Drop debian/NEWS. + + Drop debian/powersaved.postinst. + + Do not depend on adduser package. + + Remove Security section from README.Debian. + * Replace Maintainer field. + + -- William Grant Sun, 06 May 2007 14:11:06 +1000 + powersave (0.14.0-7) unstable; urgency=low * debian/patches/14-gcc4.3_missing_includes.patch @@ -163,6 +255,21 @@ powersave (0.14.0-7) unstable; urgency=l -- Michael Biebl Tue, 03 Apr 2007 01:00:38 +0200 +powersave (0.14.0-6ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - Add Replaces/Provides for powernowd and apmd, to allow installation + with *ubuntu-desktop meta packages. + - Drop changes for powerdev group used for dbus access on Debian: + + Drop debian/patches/dbus_access.patch. + + Drop debian/patches/man_powerdev_group.patch. + + Drop debian/NEWS. + + Drop debian/powersaved.postinst. + + Do not depend on adduser package. + + Remove Security section from README.Debian. + + -- William Alexander Grant Thu, 7 Dec 2006 20:44:40 +1100 + powersave (0.14.0-6) unstable; urgency=low * Prepend a sequence number to all patches. @@ -180,6 +287,21 @@ powersave (0.14.0-6) unstable; urgency=l -- Michael Biebl Fri, 1 Dec 2006 20:12:28 +0100 +powersave (0.14.0-5ubuntu1) feisty; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Add Replaces/Provides for powernowd and apmd, to allow installation + with *ubuntu-desktop meta packages. + - Drop changes for powerdev group used for dbus access on Debian: + + Drop debian/patches/dbus_access.patch. + + Drop debian/patches/man_powerdev_group.patch. + + Drop debian/NEWS. + + Drop debian/powersaved.postinst. + + Do not depend on adduser package. + + Remove Security section from README.Debian. + + -- William Alexander Grant Sat, 11 Nov 2006 10:08:11 +1100 + powersave (0.14.0-5) unstable; urgency=low * The changes to video_bios_intel.patch in 0.14.0-4 to support MODE=auto @@ -200,6 +322,21 @@ powersave (0.14.0-4) unstable; urgency=l -- Michael Biebl Wed, 8 Nov 2006 23:43:02 +0100 +powersave (0.14.0-3ubuntu1) feisty; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Add Replaces/Provides for powernowd and apmd, to allow installation + with *ubuntu-desktop meta packages. + - Drop changes for powerdev group used for dbus access on Debian: + + Drop debian/patches/dbus_access.patch. + + Drop debian/patches/man_powerdev_group.patch. + + Drop debian/NEWS. + + Drop debian/powersaved.postinst. + + Do not depend on adduser package. + + Remove Security section from README.Debian. + + -- William Alexander Grant Thu, 9 Nov 2006 22:38:30 +1100 + powersave (0.14.0-3) unstable; urgency=low * Update maintainer email address to biebl@debian.org. @@ -219,12 +356,42 @@ powersave (0.14.0-3) unstable; urgency=l -- Michael Biebl Wed, 25 Oct 2006 01:02:01 +0200 +powersave (0.14.0-2ubuntu1) edgy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Add Replaces/Provides for powernowd and apmd, to allow installation + with *ubuntu-desktop meta packages. + - Drop changes for powerdev group used for dbus access on Debian: + + Drop debian/patches/dbus_access.patch. + + Drop debian/patches/man_powerdev_group.patch. + + Drop debian/NEWS. + + Drop debian/powersaved.postinst. + + Do not depend on adduser package. + + Remove Security section from README.Debian. + + -- William Alexander Grant Wed, 13 Sep 2006 18:16:31 +1000 + powersave (0.14.0-2) unstable; urgency=medium * Fix the check for the build architecture in configure.ac. Closes: #386937 -- Michael Biebl Mon, 11 Sep 2006 13:00:23 +0200 +powersave (0.14.0-1ubuntu1) edgy; urgency=low + + * Merge from debian unstable. Remaining changes: + - Add Replaces/Provides for powernowd and apmd, to allow installation + with *ubuntu-desktop meta packages. + - Drop changes for powerdev group used for dbus access on Debian: + + Drop debian/patches/dbus_access.patch. + + Drop debian/patches/man_powerdev_group.patch. + + Drop debian/NEWS. + + Drop debian/powersaved.postinst. + + Do not depend on adduser package. + + Remove Security section from README.Debian. + + -- William Alexander Grant Mon, 11 Sep 2006 20:23:32 +1000 + powersave (0.14.0-1) unstable; urgency=low * New upstream release. @@ -239,6 +406,27 @@ powersave (0.12.20-2) unstable; urgency= -- Michael Biebl Tue, 4 Jul 2006 02:04:01 +0200 +powersave (0.12.20-1ubuntu2) edgy; urgency=low + + * Rebuild against dbus 0.90 + + -- Sebastian Dröge Wed, 30 Aug 2006 22:11:24 +0200 + +powersave (0.12.20-1ubuntu1) edgy; urgency=low + + * Add back Conflicts/Provides for powernowd and apmd to allow install + with *ubuntu-desktop meta package + * Drop changes for powerdev group used for dbus access on Debian. + dbus access is controlled via pam_console (libpam_foreground) in Ubuntu. + * Drop debian/patches/dbus_access.patch + * Drop debian/patches/man_powerdev_group.patch + * Drop debian/NEWS + * Drop debian/powersaved.postinst + * Do not depend on adduser package + * Remove Security section from README.Debian + + -- Luka Renko Sat, 12 Aug 2006 16:47:36 +0200 + powersave (0.12.20-1) unstable; urgency=low * New upstream release. @@ -281,6 +469,62 @@ powersave (0.12.15-1) unstable; urgency= -- Michael Biebl Fri, 5 May 2006 19:33:48 +0200 +powersave (0.12.15-0ubuntu1) dapper; urgency=low + + * New upstream release + * Added init_script_status.patch to not call /etc/init.d scripts + with "status" that is not available on debian systems (Malone #40262) + + -- Luka Renko Sun, 30 Apr 2006 16:14:34 +0200 + +powersave (0.12.11-1ubuntu2) dapper; urgency=low + + * Added grub_default_file_removed.diff to fix grub issue (savedefault) + + -- Luka Renko Thu, 13 Apr 2006 22:49:25 +0200 + +powersave (0.12.11-1ubuntu1) dapper; urgency=low + + * New upstream release. + * Load apm module in powersaved script. Closes: Malone #37512 + + -- Luka Renko Mon, 10 Apr 2006 20:32:35 +0200 + +powersave (0.12.11-1) unstable; urgency=low + + * New upstream release. + * Updated README.Debian. Dbus does not cache the credentials so aggressively + anymore. A "reload" is sufficient now to make dbus reread the new group + memberships. + + -- Michael Biebl Sun, 9 Apr 2006 04:29:13 +0200 + +powersave (0.12.7-1ubuntu1) dapper; urgency=low + + * New upstream release. + * Removed diversion for /usr/sbin/acpid to play nicer with ubuntu-desktop. + + -- Luka Renko Sun, 26 Mar 2006 18:28:51 +0200 + +powersave (0.12.7-1) unstable; urgency=low + + * New upstream release. + * This release has been marked as stable by upstream. + + -- Michael Biebl Thu, 23 Mar 2006 09:49:49 +0100 + +powersave (0.12.2-1ubuntu1) dapper; urgency=low + + * Removed dbus_access.diff patch and dependency on adduser. dbus access is + controlled via pam_console (libpam_foreground) in Ubuntu. + * Added Replaces/Provides: apmd, powernowd to allow the installation of + powersaved without removal of (k)ubuntu-desktop. + * Install diversion for /usr/sbin/acpid. All event processing is handled by + powersaved so start acpid with an empty events dir + (/etc/acpi/events.ignore). + + -- Michael Biebl Thu, 9 Mar 2006 22:53:31 +0100 + powersave (0.12.11-1) unstable; urgency=low * New upstream release. diff -pruN 0.15.20-6/debian/control 0.15.20-6ubuntu1/debian/control --- 0.15.20-6/debian/control 2009-07-05 21:19:16.000000000 +0100 +++ 0.15.20-6ubuntu1/debian/control 2009-07-05 21:15:57.000000000 +0100 @@ -1,7 +1,8 @@ Source: powersave Section: admin Priority: optional -Maintainer: Michael Biebl +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Michael Biebl Build-Depends: cdbs, debhelper (>= 7), autotools-dev, pkg-config, libdbus-1-dev (>= 0.30), libdbus-glib-1-dev (>= 0.30), liblazy-dev (>= 0.2-3), texinfo, lynx, quilt Standards-Version: 3.8.2 Vcs-Git: git://git.debian.org/git/users/biebl/powersave.git @@ -11,8 +12,10 @@ Homepage: http://sourceforge.net/project Package: powersaved Architecture: any Section: admin -Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, lsb-base (>= 3.2-14), hal (>= 0.5.0), dbus (>= 0.30) +Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.2-14), hal (>= 0.5.0), dbus (>= 0.30) Conflicts: powernowd, cpudyn, cpufreqd, apmd +Replaces: powernowd, apmd +Provides: powernowd, apmd Recommends: acpid, cpufrequtils Suggests: zenity, kpowersave Description: power management daemon diff -pruN 0.15.20-6/debian/NEWS 0.15.20-6ubuntu1/debian/NEWS --- 0.15.20-6/debian/NEWS 2009-07-05 21:19:16.000000000 +0100 +++ 0.15.20-6ubuntu1/debian/NEWS 2009-07-05 21:15:57.000000000 +0100 @@ -6,14 +6,3 @@ powersave (0.15.20-1) unstable; urgency= over to pm-utils. -- Michael Biebl Sat, 05 Apr 2008 18:26:43 +0200 - -powersave (0.12.0-1) unstable; urgency=low - - Previous versions of the powersave package used the group "plugdev" to - control the access to the powersaved daemon. With this version on an new - group, that only deals with power management related functionality, called - "powerdev" is used. Please update your user accounts correspondingly. For - more information please read the README.Debian file shipped with this - package. - - -- Michael Biebl Tue, 28 Feb 2006 17:20:09 +0100 diff -pruN 0.15.20-6/debian/patches/03-man_powerdev_group.patch 0.15.20-6ubuntu1/debian/patches/03-man_powerdev_group.patch --- 0.15.20-6/debian/patches/03-man_powerdev_group.patch 2009-07-05 21:19:16.000000000 +0100 +++ 0.15.20-6ubuntu1/debian/patches/03-man_powerdev_group.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ -Index: powersave/docs/powersave.8.in -=================================================================== ---- powersave.orig/docs/powersave.8.in 2008-04-21 14:33:50.000000000 +0200 -+++ powersave/docs/powersave.8.in 2008-07-18 17:46:03.000000000 +0200 -@@ -23,6 +23,11 @@ - - .SH OPTIONS THAT NEED A RUNNING HAL DAEMON - -+Be aware that the powerdev system group exists and that -+users allowed to use these functions are part of the powerdev group. After -+adding users to the powerdev group you should reload the system message bus -+with "/etc/init.d/dbus reload" to pick up the new group memberships. -+ - .TP - .I --suspend-to-disk -U - Sends a hibernate (suspend to disk) request to HAL diff -pruN 0.15.20-6/debian/patches/24-fix_script_message_handling.patch 0.15.20-6ubuntu1/debian/patches/24-fix_script_message_handling.patch --- 0.15.20-6/debian/patches/24-fix_script_message_handling.patch 2009-07-05 21:19:16.000000000 +0100 +++ 0.15.20-6ubuntu1/debian/patches/24-fix_script_message_handling.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ -Index: powersave/daemon/pm_interface.cpp -=================================================================== ---- powersave.orig/daemon/pm_interface.cpp 2008-12-30 23:51:02.000000000 +0100 -+++ powersave/daemon/pm_interface.cpp 2008-12-30 23:51:02.000000000 +0100 -@@ -602,7 +602,7 @@ - - DBUS_ERROR PM_Interface::handleScriptsMessage(DBusMessage *msg, const string &msg_member) - { -- char dummy[] = ""; -+ char *dummy = ""; - - pDebug (DBG_DIAG, "Handling Scripts request"); - if (msg_member == "ScriptReturn") { -@@ -614,15 +614,15 @@ - return REPLY_INVALID_PARAM; - } - // get the so called mode ( notify, progress, true, false ) -- if (!liblazy_dbus_message_get_basic_arg(msg, DBUS_TYPE_INT32, &request, 1) < 0) { -+ if (liblazy_dbus_message_get_basic_arg(msg, DBUS_TYPE_INT32, &request, 1) < 0) { - pDebug(DBG_WARN, "Script returned but we could not to get the request"); - return REPLY_INVALID_PARAM; - } - // get the message -- if (!liblazy_dbus_message_get_basic_arg(msg, DBUS_TYPE_STRING, &dummy, 0) < 0) { -+ if (liblazy_dbus_message_get_basic_arg(msg, DBUS_TYPE_STRING, &dummy, 0) < 0) { - pDebug(DBG_INFO, "Script returned but we could not to get the message." - " Continuing anyway..."); -- strcpy(dummy, ""); -+ dummy = ""; - } - - pDebug(DBG_DEBUG, "Script returned: event id: %d, request: %d, message: '%s'", diff -pruN 0.15.20-6/debian/patches/series 0.15.20-6ubuntu1/debian/patches/series --- 0.15.20-6/debian/patches/series 2009-07-05 21:19:16.000000000 +0100 +++ 0.15.20-6ubuntu1/debian/patches/series 2009-07-05 21:15:57.000000000 +0100 @@ -1,5 +1,4 @@ 01-dbus_access.patch -03-man_powerdev_group.patch 04-documentation_path.patch 05-man_page_format.patch 06-hal_deprecated_keys.patch @@ -9,4 +8,3 @@ 21-no_usleep.patch 22-no_script_rcpowersaved.patch 23-link_liblazy.patch -24-fix_script_message_handling.patch diff -pruN 0.15.20-6/debian/powersaved.postinst 0.15.20-6ubuntu1/debian/powersaved.postinst --- 0.15.20-6/debian/powersaved.postinst 2009-07-05 21:19:16.000000000 +0100 +++ 0.15.20-6ubuntu1/debian/powersaved.postinst 1970-01-01 01:00:00.000000000 +0100 @@ -1,46 +0,0 @@ -#! /bin/sh -# postinst script for powersaved - -set -e - -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - -check_return_code() { - RETVAL=$? - # Do not fail installation if acpid is not running - [ $RETVAL -eq 7 ] && return 0 - - exit $RETVAL -} - -case "$1" in - configure) - if ! getent group powerdev > /dev/null ; then - addgroup --quiet --system powerdev || true - fi - - # Ask dbus to reload the config file - if [ -x "/etc/init.d/dbus" ]; then - invoke-rc.d dbus force-reload || true - fi - ;; - abort-upgrade|abort-remove|abort-deconfigure) - ;; - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 diff -pruN 0.15.20-6/debian/README.Debian 0.15.20-6ubuntu1/debian/README.Debian --- 0.15.20-6/debian/README.Debian 2009-07-05 21:19:16.000000000 +0100 +++ 0.15.20-6ubuntu1/debian/README.Debian 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -powersave for Debian -~~~~~~~~~~~~~~~~~~~~ - -security -~~~~~~~~ -User management is handled by dbus policies. See the configuration file -/etc/dbus-1/system.d/powersave.conf for more details. The default setting is -that users have to be in the group "powerdev" in order to be able to connect -to the powersave daemon. -If you want to add a user to the group "powerdev", execute the command -"adduser username powerdev" as root and after that tell dbus to use the new -group memberships with "/etc/init.d/dbus reload". - - -- Michael Biebl Fri, 13 Jan 2006 20:09:09 +0100