r31167 - in /desktop/experimental/gnome-power-manager/debian: changelog control control.in docs patches/ rules script

sjoerd at users.alioth.debian.org sjoerd at users.alioth.debian.org
Wed Nov 2 22:12:33 UTC 2011


Author: sjoerd
Date: Wed Nov  2 22:12:32 2011
New Revision: 31167

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31167
Log:
* New upstream release
* debian/docs: Stop installing TODO
* Sync with ubuntu:
  - Remove obsolete patches:
     + 02_autostart_init.patch
     + 06-bugreport-debian.patch
     + 08-desktop-bugreport-path.patch
     + 09-query-gnome-screensaver-settings-with-GSettings.patch
  - Stop installing the g-p-m autostart xdg file, the daemon parts have been
    replaced by gnome-session
* debian/rules, debian/script: Stop install bugreport script

Removed:
    desktop/experimental/gnome-power-manager/debian/patches/
    desktop/experimental/gnome-power-manager/debian/script
Modified:
    desktop/experimental/gnome-power-manager/debian/changelog
    desktop/experimental/gnome-power-manager/debian/control
    desktop/experimental/gnome-power-manager/debian/control.in
    desktop/experimental/gnome-power-manager/debian/docs
    desktop/experimental/gnome-power-manager/debian/rules

Modified: desktop/experimental/gnome-power-manager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-power-manager/debian/changelog?rev=31167&op=diff
==============================================================================
--- desktop/experimental/gnome-power-manager/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-power-manager/debian/changelog [utf-8] Wed Nov  2 22:12:32 2011
@@ -1,3 +1,19 @@
+gnome-power-manager (3.2.1-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * debian/docs: Stop installing TODO
+  * Sync with ubuntu:
+    - Remove obsolete patches:
+       + 02_autostart_init.patch
+       + 06-bugreport-debian.patch
+       + 08-desktop-bugreport-path.patch
+       + 09-query-gnome-screensaver-settings-with-GSettings.patch
+    - Stop installing the g-p-m autostart xdg file, the daemon parts have been
+      replaced by gnome-session
+  * debian/rules, debian/script: Stop install bugreport script
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Wed, 02 Nov 2011 22:04:24 +0000
+
 gnome-power-manager (3.0.2-3) unstable; urgency=low
 
   * debian/patches/09-query-gnome-screensaver-settings-with-GSettings.patch:

Modified: desktop/experimental/gnome-power-manager/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-power-manager/debian/control?rev=31167&op=diff
==============================================================================
--- desktop/experimental/gnome-power-manager/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-power-manager/debian/control [utf-8] Wed Nov  2 22:12:32 2011
@@ -6,36 +6,25 @@
 Source: gnome-power-manager
 Section: gnome
 Priority: optional
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Frederic Peters <fpeters at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: debhelper (>= 8),
                cdbs,
                gnome-pkg-tools (>= 0.10),
                autotools-dev,
-               dh-autoreconf,
                libdbus-glib-1-dev (>= 0.70),
-               libxml-parser-perl,
-               libxext-dev,
-               libx11-dev,
                libglib2.0-dev (>= 2.25.9),
                libgtk-3-dev (>= 3.0.0),
-               libwnck-dev (>= 2.10.0),
                libcairo2-dev (>= 1.0.0),
                libupower-glib-dev (>= 0.9.1),
-               libcanberra-gtk3-dev (>= 0.10),
-               libgnome-keyring-dev (>= 0.6.0),
                docbook-to-man,
                intltool,
-               libnotify-dev (>= 0.7.0),
                docbook-utils,
-               libxrandr-dev (>= 1.2.0),
-               xmlto,
                gnome-doc-utils,
-               scrollkeeper,
                pkg-config
 Standards-Version: 3.9.2
-Vcs-Svn: svn://svn.debian.org/pkg-gnome/desktop/unstable/gnome-power-manager/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-power/ubuntu
 Homepage: http://www.gnome.org/projects/gnome-power-manager/
 
 Package: gnome-power-manager
@@ -45,19 +34,15 @@
          notification-daemon,
          dbus-x11,
          consolekit,
-         upower,
-         gnome-settings-daemon (>= 3.0),
-         gnome-screensaver (>= 3.0),
+         upower
 Breaks: gnome-session (<< 2.28)
-Recommends: udisks
-Suggests: policykit-1
 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
  triggers actions accordingly. Its philosophy is to completely hide
  these complex tasks and only show some settings important to the user.
  .
- GNOME power manager displays and manages battery status, power plug
+ The GNOME power manager displays and manages battery status, power plug
  events, display brightness, CPU, graphics card and hard disk drive
  power saving, and can trigger suspend-to-RAM, hibernate or shutdown
  events, all integrated to other components of the GNOME desktop.

Modified: desktop/experimental/gnome-power-manager/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-power-manager/debian/control.in?rev=31167&op=diff
==============================================================================
--- desktop/experimental/gnome-power-manager/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-power-manager/debian/control.in [utf-8] Wed Nov  2 22:12:32 2011
@@ -1,36 +1,25 @@
 Source: gnome-power-manager
 Section: gnome
 Priority: optional
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 8),
                cdbs,
                gnome-pkg-tools (>= 0.10),
                autotools-dev,
-               dh-autoreconf,
                libdbus-glib-1-dev (>= 0.70),
-               libxml-parser-perl,
-               libxext-dev,
-               libx11-dev,
                libglib2.0-dev (>= 2.25.9),
                libgtk-3-dev (>= 3.0.0),
-               libwnck-dev (>= 2.10.0),
                libcairo2-dev (>= 1.0.0),
                libupower-glib-dev (>= 0.9.1),
-               libcanberra-gtk3-dev (>= 0.10),
-               libgnome-keyring-dev (>= 0.6.0),
                docbook-to-man,
                intltool,
-               libnotify-dev (>= 0.7.0),
                docbook-utils,
-               libxrandr-dev (>= 1.2.0),
-               xmlto,
                gnome-doc-utils,
-               scrollkeeper,
                pkg-config
 Standards-Version: 3.9.2
-Vcs-Svn: svn://svn.debian.org/pkg-gnome/desktop/unstable/gnome-power-manager/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-power/ubuntu
 Homepage: http://www.gnome.org/projects/gnome-power-manager/
 
 Package: gnome-power-manager
@@ -40,19 +29,15 @@
          notification-daemon,
          dbus-x11,
          consolekit,
-         upower,
-         gnome-settings-daemon (>= 3.0),
-         gnome-screensaver (>= 3.0),
+         upower
 Breaks: gnome-session (<< 2.28)
-Recommends: udisks
-Suggests: policykit-1
 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
  triggers actions accordingly. Its philosophy is to completely hide
  these complex tasks and only show some settings important to the user.
  .
- GNOME power manager displays and manages battery status, power plug
+ The GNOME power manager displays and manages battery status, power plug
  events, display brightness, CPU, graphics card and hard disk drive
  power saving, and can trigger suspend-to-RAM, hibernate or shutdown
  events, all integrated to other components of the GNOME desktop.

Modified: desktop/experimental/gnome-power-manager/debian/docs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-power-manager/debian/docs?rev=31167&op=diff
==============================================================================
--- desktop/experimental/gnome-power-manager/debian/docs [utf-8] (original)
+++ desktop/experimental/gnome-power-manager/debian/docs [utf-8] Wed Nov  2 22:12:32 2011
@@ -1,3 +1,2 @@
 NEWS
 README
-TODO

Modified: desktop/experimental/gnome-power-manager/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-power-manager/debian/rules?rev=31167&op=diff
==============================================================================
--- desktop/experimental/gnome-power-manager/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-power-manager/debian/rules [utf-8] Wed Nov  2 22:12:32 2011
@@ -1,26 +1,15 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS += \
-			--with-dbus-services=/usr/share/dbus-1/services/ \
-			--disable-scrollkeeper \
-			--with-doc-dir=/usr/share/doc/gnome-power-manager/
+			--with-dbus-services=/usr/share/dbus-1/services/
 
 LDFLAGS += -Wl,-O1 -Wl,-z,defs -Wl,--as-needed
 
 clean::
 	rm -f po/*.gmo
-
-binary-install/gnome-power-manager::
-	mv debian/gnome-power-manager/usr/bin/gnome-power-bugreport.sh debian/gnome-power-manager/usr/share/gnome-power-manager/gnome-power-bugreport
-	chmod 755 debian/gnome-power-manager/usr/share/bug/gnome-power-manager/script
-	mkdir -p debian/gnome-power-manager/usr/share/gnome
-	mv debian/gnome-power-manager/etc/xdg/autostart debian/gnome-power-manager/usr/share/gnome/
-	rmdir debian/gnome-power-manager/etc/xdg
-	rmdir debian/gnome-power-manager/etc




More information about the pkg-gnome-commits mailing list