r24285 - in /desktop/unstable/gnome-applets/debian: changelog control control.in gnome-applets.gconf-defaults rules

[joss at users.alioth.debian.org]

Author: joss
Date: Thu May  6 07:07:40 2010
New Revision: 24285

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24285
Log:
Disable HAL, APM, and the battstat applet. Closes: #580429.

Modified:
    desktop/unstable/gnome-applets/debian/changelog
    desktop/unstable/gnome-applets/debian/control
    desktop/unstable/gnome-applets/debian/control.in
    desktop/unstable/gnome-applets/debian/gnome-applets.gconf-defaults
    desktop/unstable/gnome-applets/debian/rules

Modified: desktop/unstable/gnome-applets/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/changelog?rev=24285&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/changelog [utf-8] Thu May  6 07:07:40 2010
@@ -1,3 +1,9 @@
+gnome-applets (2.30.0-2) UNRELEASED; urgency=low
+
+  * Disable HAL, APM, and the battstat applet. Closes: #580429.
+
+ -- Josselin Mouette <joss at debian.org>  Thu, 06 May 2010 09:06:57 +0200
+
 gnome-applets (2.30.0-1) unstable; urgency=low
 
   [ Josselin Mouette ]

Modified: desktop/unstable/gnome-applets/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/control?rev=24285&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/control [utf-8] Thu May  6 07:07:40 2010
@@ -25,7 +25,6 @@
                libwnck-dev (>= 2.9.3),
                libgnome-desktop-dev (>= 2.11.1),
                libnotify-dev (>= 0.3.2),
-               libhal-dev (>= 0.5.3) | hurd,
                libdbus-1-dev (>= 1.1.2),
                libdbus-glib-1-dev (>= 0.74),
                python-gtk2-dev (>= 2.6),
@@ -46,7 +45,6 @@
                docbook-to-man,
                docbook-utils,
                gnome-doc-utils (>= 0.3.2),
-               libapm-dev | not+linux-gnu,
                network-manager-dev (>= 0.7) | not+linux-gnu,
                libgstreamer0.10-dev (>= 0.10.2),
                libgstreamer-plugins-base0.10-dev (>= 0.10.2),
@@ -94,8 +92,7 @@
             python-gtk2,
             cpufrequtils,
             policykit-1-gnome
-Suggests: acpid,
-          tomboy
+Suggests: tomboy
 Description: Various applets for the GNOME panel - binary files
  accessx-status: indicates keyboard accessibility settings, including
  the current state of the keyboard, if those features are in use.

Modified: desktop/unstable/gnome-applets/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/control.in?rev=24285&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/control.in [utf-8] Thu May  6 07:07:40 2010
@@ -20,7 +20,6 @@
                libwnck-dev (>= 2.9.3),
                libgnome-desktop-dev (>= 2.11.1),
                libnotify-dev (>= 0.3.2),
-               libhal-dev (>= 0.5.3) | hurd,
                libdbus-1-dev (>= 1.1.2),
                libdbus-glib-1-dev (>= 0.74),
                python-gtk2-dev (>= 2.6),
@@ -41,7 +40,6 @@
                docbook-to-man,
                docbook-utils,
                gnome-doc-utils (>= 0.3.2),
-               libapm-dev | not+linux-gnu,
                network-manager-dev (>= 0.7) | not+linux-gnu,
                libgstreamer0.10-dev (>= 0.10.2),
                libgstreamer-plugins-base0.10-dev (>= 0.10.2),
@@ -89,8 +87,7 @@
             python-gtk2,
             cpufrequtils,
             policykit-1-gnome
-Suggests: acpid,
-          tomboy
+Suggests: tomboy
 Description: Various applets for the GNOME panel - binary files
  accessx-status: indicates keyboard accessibility settings, including
  the current state of the keyboard, if those features are in use.

Modified: desktop/unstable/gnome-applets/debian/gnome-applets.gconf-defaults
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/gnome-applets.gconf-defaults?rev=24285&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/gnome-applets.gconf-defaults [utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/gnome-applets.gconf-defaults [utf-8] Thu May  6 07:07:40 2010
@@ -1,2 +1,1 @@
-/apps/battstat-applet/prefs/show_battery	false
 /apps/drivemount-applet/prefs/mount_point	/media/floppy

Modified: desktop/unstable/gnome-applets/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/rules?rev=24285&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/rules [utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/rules [utf-8] Thu May  6 07:07:40 2010
@@ -9,11 +9,13 @@
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-gtk-doc --disable-scrollkeeper --enable-ipv6 --enable-suid=no --enable-mixer-applet
-
-ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-battstat
-endif
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-gtk-doc \
+	--disable-scrollkeeper \
+	--enable-ipv6 \
+	--enable-suid=no \
+	--enable-mixer-applet \
+	--disable-battstat \
+	--without-hal
 
 DEB_MAKE_ENVVARS += echo=/bin/echo