diff -Nru gnome-power-manager-3.30.0/debian/changelog gnome-power-manager-3.30.0/debian/changelog --- gnome-power-manager-3.30.0/debian/changelog 2018-09-05 13:44:16.000000000 +0000 +++ gnome-power-manager-3.30.0/debian/changelog 2018-12-15 16:43:57.000000000 +0000 @@ -1,3 +1,11 @@ +gnome-power-manager (3.30.0-2) unstable; urgency=medium + + * Depend on gnome-settings-daemon-common instead of gnome-settings-daemon + * Drop obsolete dh_translations override + * Bump Standards-Version to 4.2.1 + + -- Jeremy Bicha Sat, 15 Dec 2018 11:43:57 -0500 + gnome-power-manager (3.30.0-1) unstable; urgency=medium * New upstream version @@ -305,7 +313,7 @@ gnome-power-manager (2.32.0-1) experimental; urgency=low [ Josselin Mouette ] - * Move autostart file to /usr/share/gnome/autostart since Xfce now has + * Move autostart file to /usr/share/gnome/autostart since Xfce now has its own power manager. Closes: #591776. [ Michael Biebl ] @@ -495,9 +503,9 @@ gnome-power-manager (2.24.4-3) unstable; urgency=low - * 02_autostart_init.patch: new patch. Set the autostart phase to - initialization, so that it is always started before the panel. This - is a problem particularly when restoring it from a saved session, in + * 02_autostart_init.patch: new patch. Set the autostart phase to + initialization, so that it is always started before the panel. This + is a problem particularly when restoring it from a saved session, in which case the panel doesn’t offer to shut down. -- Josselin Mouette Tue, 02 Jun 2009 22:37:51 +0200 @@ -509,7 +517,7 @@ Thanks Michael Biebl. Closes: #519502. [ Josselin Mouette ] - * Depend on consolekit, which is used to determine whether the user is + * Depend on consolekit, which is used to determine whether the user is logged on before showing the logout dialog. Closes: #519856. * Standards version is 3.8.1. @@ -520,17 +528,17 @@ [ Sam Morris ] * 09-sensible-backlight-delta.patch: cope with backlights that have a lot of backlight levels when dimming due to being on battery power. Taken from - upstream SVN revision 3142 (closes: #510268). + upstream SVN revision 3142 (closes: #510268). [ Josselin Mouette ] - * 04_cast-align.patch: new patch. Do not pass -Wcast-align, since - GStreamer does funny things that will confuse the Sparc compiler + * 04_cast-align.patch: new patch. Do not pass -Wcast-align, since + GStreamer does funny things that will confuse the Sparc compiler while there is actually no loss of alignment. Closes: #510397. * preinst: remove the obsolete conffile. Closes: #511050. * New upstream bugfix release. * 02_cast_align.patch: removed, merged upstream. * 09-sensible-backlight-delta.patch: dropped, merged upstream. - * 70_relibtoolize.patch: regenerated with an experimental libtool to + * 70_relibtoolize.patch: regenerated with an experimental libtool to avoid echo bug from hell. -- Josselin Mouette Thu, 12 Mar 2009 12:38:28 +0100 @@ -538,9 +546,9 @@ gnome-power-manager (2.24.2-2) experimental; urgency=low * Switch to quilt to manage patches; build-depend on quilt. - * 02_cast_align.patch: new patch. Use memcpy instead of casting + * 02_cast_align.patch: new patch. Use memcpy instead of casting pointers with incompatible alignments. Closes: #510011. - * 70_relibtoolize.patch: re-run the autotools on top of the source to + * 70_relibtoolize.patch: re-run the autotools on top of the source to avoid the rpath issue. * Pass -O1 -z defs --as-needed to the linker. @@ -567,14 +575,14 @@ gnome-power-manager (2.22.1-4) unstable; urgency=low * Rewrite description. Closes: #388109. - * 06-bugreport-debian.patch: make gnome-power-bugreport.sh output the + * 06-bugreport-debian.patch: make gnome-power-bugreport.sh output the correct Debian release. * 07-bugreport-shebang.patch: add a shebang to it. * debian/script: this is a bug script that executes g-p-bugreport. * Install the script to the correct place and make it executable. * Rename gnome-power-cmd.sh to gnome-power-cmd. * Move gnome-power-bugreport.sh to /usr/share/gnome-power-manager. - * 08-desktop-bugreport-path.patch: make bug-buddy use this new + * 08-desktop-bugreport-path.patch: make bug-buddy use this new location. * Standards version is 3.8.0. @@ -582,7 +590,7 @@ gnome-power-manager (2.22.1-3) unstable; urgency=low - * 05_translation_crash.patch: patch from upstream (SVN r2798 and + * 05_translation_crash.patch: patch from upstream (SVN r2798 and r2799). Fixes crashes when some translations exceed 100 characters. Closes: #495945. @@ -591,7 +599,7 @@ gnome-power-manager (2.22.1-2) unstable; urgency=low [ Josselin Mouette ] - * 02-ups-invalid-free.patch: patch from Avery Fay to fix invalid free + * 02-ups-invalid-free.patch: patch from Avery Fay to fix invalid free when the UPS level is too low. Closes: #482431. [ Sam Morris ] @@ -709,7 +717,7 @@ gnome-power-manager (2.18.1-1) experimental; urgency=low - * New upstream release. + * New upstream release. -- Riccardo Setti Sat, 24 Mar 2007 20:15:01 +0100 @@ -742,16 +750,16 @@ * New upstream release. * Rebuilt with latest libdbus (closes: 405941) - * Fixed a bug in g-p-m that prevents gnome-screensaver + * Fixed a bug in g-p-m that prevents gnome-screensaver from displaying any screensavers after g-p-m has put the display into power saving mode. (closes: 398143) - + -- Riccardo Setti Sun, 19 Nov 2006 14:19:55 +0100 gnome-power-manager (2.16.0-2) experimental; urgency=low * added 55-lid-state-tracking.patch taken from the ubuntu package - . + . -- Riccardo Setti Sun, 17 Sep 2006 16:50:05 +0200 @@ -778,14 +786,14 @@ * Gpm now can handle power button. (Closes: #366628) * Added support for StartupNotify in launcher (closes: #361522 * Updated pt_BR translation (thank you Goedson) (closes: #361287) - * Bumped to stadard version. No changes needed. + * Bumped to stadard version. No changes needed. -- Riccardo Setti Sun, 13 Aug 2006 21:12:08 +0200 gnome-power-manager (2.14.3-2) unstable; urgency=low * Pass --with-dbus-services option to configure so the services file is - installed in the right location (Closes: #369372) + installed in the right location (Closes: #369372) -- Sjoerd Simons Thu, 8 Jun 2006 21:19:54 +0200 @@ -797,7 +805,7 @@ gnome-power-manager (2.14.0-1) unstable; urgency=low - * New upstream version + * New upstream version -- Sjoerd Simons Sun, 2 Apr 2006 19:41:33 +0200 @@ -813,7 +821,7 @@ * debian/patches/02_gpm_struct_type.patch + Added. Fix compatibility with dbus 0.61 * Build-depend on libdbus-glib-1-dev (>= 0.61) - * Add myself to uploaders + * Add myself to uploaders -- Sjoerd Simons Fri, 3 Mar 2006 11:48:33 +0100 @@ -826,20 +834,20 @@ gnome-power-manager (2.13.91-2) experimental; urgency=low [Riccardo Setti] - + * fixed the installation of the gconf schemas. - thanks to Marco zufus Presi for provide a patch. - * added 01_fix_gpm_dbus_conf.patch which grants permissions to the + * added 01_fix_gpm_dbus_conf.patch which grants permissions to the group powerdev * gpm deps on the last hal in experimental - + [Michael Biebl] * added a watch file. * automatic autotools updated via DEB_AUTO_UPDATE_AUTOCONF flag. - added build-dep on autoconf * removed debian/dirs since it was useless. - + -- Riccardo Setti Thu, 23 Feb 2006 21:05:20 +0100 gnome-power-manager (2.13.91-1) experimental; urgency=low @@ -850,7 +858,7 @@ gnome-power-manager (2.13.90-1) experimental; urgency=low - * New upstream. + * New upstream. -- Riccardo Setti Thu, 16 Feb 2006 14:41:29 +0100 @@ -865,7 +873,7 @@ -- Riccardo Setti Sun, 12 Feb 2006 20:45:16 +0100 gnome-power-manager (0.3.1-1) unstable; urgency=low - + * First Debian release. * Initial upload to Debian (closes: #303600) * based on the ubuntu package. @@ -891,14 +899,14 @@ gnome-power-manager (0.3.1-0ubuntu2) dapper; urgency=low - * suspend by calling gdm-signal directly, rather than by going through + * suspend by calling gdm-signal directly, rather than by going through hal (allows suspend without requiring privilege escalation) -- Matthew Garrett Tue, 6 Dec 2005 05:43:33 +0000 gnome-power-manager (0.3.1-0ubuntu1) dapper; urgency=low - * new upstream release + * new upstream release -- Oliver Grawert Thu, 17 Nov 2005 02:42:49 +0100 diff -Nru gnome-power-manager-3.30.0/debian/control gnome-power-manager-3.30.0/debian/control --- gnome-power-manager-3.30.0/debian/control 2018-09-05 13:44:16.000000000 +0000 +++ gnome-power-manager-3.30.0/debian/control 2018-12-15 16:43:57.000000000 +0000 @@ -1,5 +1,5 @@ # This file is autogenerated. DO NOT EDIT! -# +# # Modifications should be made to debian/control.in instead. # This file is regenerated automatically in the clean target. Source: gnome-power-manager @@ -18,7 +18,7 @@ meson (>= 0.37.0), pkg-config, appstream-util -Standards-Version: 4.1.2 +Standards-Version: 4.2.1 Rules-Requires-Root: no Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-power-manager Vcs-Git: https://salsa.debian.org/gnome-team/gnome-power-manager.git @@ -29,8 +29,8 @@ Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, - ${gnome-settings-daemon:Depends}, default-dbus-session-bus | dbus-session-bus, + gnome-settings-daemon-common, upower (>= 0.99) Description: power management tool for the GNOME desktop GNOME Power Manager is a session daemon for the GNOME desktop diff -Nru gnome-power-manager-3.30.0/debian/control.in gnome-power-manager-3.30.0/debian/control.in --- gnome-power-manager-3.30.0/debian/control.in 2018-09-05 13:44:16.000000000 +0000 +++ gnome-power-manager-3.30.0/debian/control.in 2018-12-15 16:43:57.000000000 +0000 @@ -14,7 +14,7 @@ meson (>= 0.37.0), pkg-config, appstream-util -Standards-Version: 4.1.2 +Standards-Version: 4.2.1 Rules-Requires-Root: no Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-power-manager Vcs-Git: https://salsa.debian.org/gnome-team/gnome-power-manager.git @@ -25,8 +25,8 @@ Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, - ${gnome-settings-daemon:Depends}, default-dbus-session-bus | dbus-session-bus, + gnome-settings-daemon-common, upower (>= 0.99) Description: power management tool for the GNOME desktop GNOME Power Manager is a session daemon for the GNOME desktop diff -Nru gnome-power-manager-3.30.0/debian/rules gnome-power-manager-3.30.0/debian/rules --- gnome-power-manager-3.30.0/debian/rules 2018-09-05 13:44:16.000000000 +0000 +++ gnome-power-manager-3.30.0/debian/rules 2018-12-15 16:43:57.000000000 +0000 @@ -1,8 +1,7 @@ #!/usr/bin/make -f --include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk export DEB_BUILD_MAINT_OPTIONS = hardening=+all -export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,--as-needed +export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,-z,defs -Wl,--as-needed %: dh $@ --with gnome @@ -11,20 +10,4 @@ dh_installdocs mkdir -p debian/gnome-power-manager/usr/share/doc/gnome-power-manager appstream-util appdata-to-news $(CURDIR)/*/data/*/org.gnome.PowerStats.appdata.xml \ - > debian/gnome-power-manager/usr/share/doc/gnome-power-manager/NEWS - -# Needed for Ubuntu translation support -override_dh_translations: - dh_translations - ninja -C obj-$(DEB_HOST_GNU_TYPE) gnome-power-manager-pot - -override_dh_auto_clean: - dh_auto_clean - rm -f po/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 + > debian/gnome-power-manager/usr/share/doc/gnome-power-manager/NEWS