r27013 - in /desktop/experimental/gnome-applets/debian: ./ patches/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Mon Mar 21 21:39:03 UTC 2011
Author: joss
Date: Mon Mar 21 21:39:02 2011
New Revision: 27013
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27013
Log:
* New upstream git snapshot compatible with gnome-panel 2.91.
* Require more recent panel.
* Drop all Python stuff, disable Invest applet.
* 01_battstat_upower.patch:
+ Small fixes for GTK+ 3.
+ Fix a very important bug in error handling.
* 09_modemlights_use_new_gst.patch, 10_network-manager.patch: dropped.
They needs porting and modemlights is disabled anyway.
* Disable 98_autoreconf.patch and 99_ltmain_as-needed.patch. Use
dh-autoreconf instead.
* 02_link_X11.patch: new patch. Correctly link applets to libX11.
* 03_mixer_gtk3.patch: new patch. Port the mixer applet to GTK+ 3.
Added:
desktop/experimental/gnome-applets/debian/patches/02_link_X11.patch
desktop/experimental/gnome-applets/debian/patches/03_mixer_gtk3.patch
Removed:
desktop/experimental/gnome-applets/debian/patches/09_modemlights_use_new_gst.patch
desktop/experimental/gnome-applets/debian/patches/10_network-manager.patch
desktop/experimental/gnome-applets/debian/patches/98_autoreconf.patch
desktop/experimental/gnome-applets/debian/patches/99_ltmain_as-needed.patch
desktop/experimental/gnome-applets/debian/pyversions
Modified:
desktop/experimental/gnome-applets/debian/changelog
desktop/experimental/gnome-applets/debian/control
desktop/experimental/gnome-applets/debian/control.in
desktop/experimental/gnome-applets/debian/gnome-applets-data.install
desktop/experimental/gnome-applets/debian/gnome-applets.install
desktop/experimental/gnome-applets/debian/patches/01_battstat_upower.patch
desktop/experimental/gnome-applets/debian/patches/series
desktop/experimental/gnome-applets/debian/rules
Modified: desktop/experimental/gnome-applets/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/changelog?rev=27013&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-applets/debian/changelog [utf-8] Mon Mar 21 21:39:02 2011
@@ -1,10 +1,22 @@
-gnome-applets (2.30.0-4) UNRELEASED; urgency=low
+gnome-applets (2.91.4~20110321-1) experimental; urgency=low
* Move .server files in the binary package, since the list is
architecture-dependent. Closes: #601901.
* Add appropriate Replaces.
-
- -- Josselin Mouette <joss at debian.org> Sun, 31 Oct 2010 12:25:35 +0100
+ * New upstream git snapshot compatible with gnome-panel 2.91.
+ * Require more recent panel.
+ * Drop all Python stuff, disable Invest applet.
+ * 01_battstat_upower.patch:
+ + Small fixes for GTK+ 3.
+ + Fix a very important bug in error handling.
+ * 09_modemlights_use_new_gst.patch, 10_network-manager.patch: dropped.
+ They needs porting and modemlights is disabled anyway.
+ * Disable 98_autoreconf.patch and 99_ltmain_as-needed.patch. Use
+ dh-autoreconf instead.
+ * 02_link_X11.patch: new patch. Correctly link applets to libX11.
+ * 03_mixer_gtk3.patch: new patch. Port the mixer applet to GTK+ 3.
+
+ -- Josselin Mouette <joss at debian.org> Mon, 21 Mar 2011 22:32:13 +0100
gnome-applets (2.30.0-3) unstable; urgency=low
Modified: desktop/experimental/gnome-applets/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/control?rev=27013&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-applets/debian/control [utf-8] Mon Mar 21 21:39:02 2011
@@ -10,30 +10,25 @@
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>
Standards-Version: 3.9.0
Build-Depends: cdbs (>= 0.4.41),
- autotools-dev,
+ dh-autoreconf,
debhelper (>= 5.0.13),
- libgtk2.0-dev (>= 2.13.0),
+ libgtk-3-dev (>= 3.0),
libglib2.0-dev (>= 2.22.0),
libgconf2-dev (>= 2.8.0),
scrollkeeper (>= 0.1.4) | rarian-compat,
- libpanel-applet2-dev (>= 2.13.4),
+ libpanel-applet-4-dev (>= 2.91.90),
libgtop2-dev (>= 2.11.92),
libxklavier-dev (>= 4.0),
- libwnck-dev (>= 2.9.3),
- libgnome-desktop-dev (>= 2.11.1),
- libnotify-dev (>= 0.3.2),
+ libwnck-3-dev (>= 2.91.0),
+ libnotify-dev (>= 0.7),
libdbus-1-dev (>= 1.1.2),
libdbus-glib-1-dev (>= 0.74),
- python-gtk2-dev (>= 2.6),
- python-gobject-dev (>= 2.6),
- python-gnome2-dev (>= 2.10),
gnome-icon-theme (>= 2.15.91),
libxml2-dev (>= 2.5.0),
- libgweather-dev (>= 2.22.1),
- libgucharmap2-dev (>= 1:2.23.0),
+ libgweather-3-dev (>= 2.91.0),
+ libgucharmap-2-90-dev (>= 1:2.23.0),
libpolkit-gobject-1-dev (>= 0.92),
intltool (>= 0.35.0),
- python-dev (>= 2.4),
libxt-dev,
libx11-dev,
gnome-settings-daemon-dev,
@@ -48,17 +43,13 @@
x11proto-kb-dev,
system-tools-backends-dev (>= 1.1.3),
libcpufreq-dev,
- python-gnome2-desktop-dev,
gnome-pkg-tools (>= 0.10),
sharutils,
- python-support (>= 0.4),
- liboobs-1-dev (>= 0.2.0),
libupower-glib-dev (>= 0.9.4)
Package: gnome-applets-data
Architecture: all
-Depends: ${misc:Depends},
- ${python:Depends}
+Depends: ${misc:Depends}
Replaces: trashapplet
Description: Various applets for the GNOME panel - data files
This package contains data files (pixmaps, icons, documentations) needed by
@@ -70,11 +61,10 @@
${misc:Depends},
gnome-applets-data (>= ${gnome:Version}),
gnome-applets-data (<< ${gnome:NextVersion}),
- gnome-panel (>= 2.13.4),
+ gnome-panel (>= 2.91.91),
gnome-icon-theme (>= 2.15.91),
gstreamer0.10-alsa [linux-any],
gstreamer0.10-plugins-good [kfreebsd-any],
- ${python:Depends},
gvfs
Conflicts: trashapplet
Replaces: trashapplet,
@@ -84,11 +74,6 @@
gnome-media,
gnome-netstatus-applet,
deskbar-applet,
- python-gconf,
- python-gnome2,
- python-gnomeapplet,
- python-gobject,
- python-gtk2,
cpufrequtils,
policykit-1-gnome
Suggests: tomboy
@@ -113,12 +98,6 @@
.
Mixer: volume control.
.
- Modem Monitor: monitors the modem.
- .
- Invest: downloads current stock quotes from the Internet and displays
- the quotes in a scrolling display in the applet. The applet downloads the
- stock information from Yahoo! Finance.
- .
System monitor: CPU, memory, network, swap file and resource.
.
Trash: lets you drag items to the trash folder.
Modified: desktop/experimental/gnome-applets/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/control.in?rev=27013&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-applets/debian/control.in [utf-8] Mon Mar 21 21:39:02 2011
@@ -5,30 +5,25 @@
Uploaders: @GNOME_TEAM@
Standards-Version: 3.9.0
Build-Depends: cdbs (>= 0.4.41),
- autotools-dev,
+ dh-autoreconf,
debhelper (>= 5.0.13),
- libgtk2.0-dev (>= 2.13.0),
+ libgtk-3-dev (>= 3.0),
libglib2.0-dev (>= 2.22.0),
libgconf2-dev (>= 2.8.0),
scrollkeeper (>= 0.1.4) | rarian-compat,
- libpanel-applet2-dev (>= 2.13.4),
+ libpanel-applet-4-dev (>= 2.91.90),
libgtop2-dev (>= 2.11.92),
libxklavier-dev (>= 4.0),
- libwnck-dev (>= 2.9.3),
- libgnome-desktop-dev (>= 2.11.1),
- libnotify-dev (>= 0.3.2),
+ libwnck-3-dev (>= 2.91.0),
+ libnotify-dev (>= 0.7),
libdbus-1-dev (>= 1.1.2),
libdbus-glib-1-dev (>= 0.74),
- python-gtk2-dev (>= 2.6),
- python-gobject-dev (>= 2.6),
- python-gnome2-dev (>= 2.10),
gnome-icon-theme (>= 2.15.91),
libxml2-dev (>= 2.5.0),
- libgweather-dev (>= 2.22.1),
- libgucharmap2-dev (>= 1:2.23.0),
+ libgweather-3-dev (>= 2.91.0),
+ libgucharmap-2-90-dev (>= 1:2.23.0),
libpolkit-gobject-1-dev (>= 0.92),
intltool (>= 0.35.0),
- python-dev (>= 2.4),
libxt-dev,
libx11-dev,
gnome-settings-daemon-dev,
@@ -43,17 +38,13 @@
x11proto-kb-dev,
system-tools-backends-dev (>= 1.1.3),
libcpufreq-dev,
- python-gnome2-desktop-dev,
gnome-pkg-tools (>= 0.10),
sharutils,
- python-support (>= 0.4),
- liboobs-1-dev (>= 0.2.0),
libupower-glib-dev (>= 0.9.4)
Package: gnome-applets-data
Architecture: all
-Depends: ${misc:Depends},
- ${python:Depends}
+Depends: ${misc:Depends}
Replaces: trashapplet
Description: Various applets for the GNOME panel - data files
This package contains data files (pixmaps, icons, documentations) needed by
@@ -65,11 +56,10 @@
${misc:Depends},
gnome-applets-data (>= ${gnome:Version}),
gnome-applets-data (<< ${gnome:NextVersion}),
- gnome-panel (>= 2.13.4),
+ gnome-panel (>= 2.91.91),
gnome-icon-theme (>= 2.15.91),
gstreamer0.10-alsa [linux-any],
gstreamer0.10-plugins-good [kfreebsd-any],
- ${python:Depends},
gvfs
Conflicts: trashapplet
Replaces: trashapplet,
@@ -79,11 +69,6 @@
gnome-media,
gnome-netstatus-applet,
deskbar-applet,
- python-gconf,
- python-gnome2,
- python-gnomeapplet,
- python-gobject,
- python-gtk2,
cpufrequtils,
policykit-1-gnome
Suggests: tomboy
@@ -108,12 +93,6 @@
.
Mixer: volume control.
.
- Modem Monitor: monitors the modem.
- .
- Invest: downloads current stock quotes from the Internet and displays
- the quotes in a scrolling display in the applet. The applet downloads the
- stock information from Yahoo! Finance.
- .
System monitor: CPU, memory, network, swap file and resource.
.
Trash: lets you drag items to the trash folder.
Modified: desktop/experimental/gnome-applets/debian/gnome-applets-data.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/gnome-applets-data.install?rev=27013&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/gnome-applets-data.install [utf-8] (original)
+++ desktop/experimental/gnome-applets/debian/gnome-applets-data.install [utf-8] Mon Mar 21 21:39:02 2011
@@ -1,3 +1,2 @@
debian/tmp/etc/
debian/tmp/usr/share/
-debian/tmp/usr/lib/python*
Modified: desktop/experimental/gnome-applets/debian/gnome-applets.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/gnome-applets.install?rev=27013&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/gnome-applets.install [utf-8] (original)
+++ desktop/experimental/gnome-applets/debian/gnome-applets.install [utf-8] Mon Mar 21 21:39:02 2011
@@ -1,3 +1,2 @@
debian/tmp/usr/bin/
debian/tmp/usr/lib/gnome-applets/
-debian/tmp/usr/lib/bonobo/
Modified: desktop/experimental/gnome-applets/debian/patches/01_battstat_upower.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/patches/01_battstat_upower.patch?rev=27013&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/patches/01_battstat_upower.patch [utf-8] (original)
+++ desktop/experimental/gnome-applets/debian/patches/01_battstat_upower.patch [utf-8] Mon Mar 21 21:39:02 2011
@@ -19,19 +19,19 @@
create mode 100644 battstat/battstat-upower.c
create mode 100644 battstat/battstat-upower.h
-Index: gnome-applets-2.30.0/battstat/Makefile.am
+Index: gnome-applets-2.91.4/battstat/Makefile.am
===================================================================
---- gnome-applets-2.30.0.orig/battstat/Makefile.am 2010-03-28 07:29:51.000000000 +0200
-+++ gnome-applets-2.30.0/battstat/Makefile.am 2010-07-07 21:20:44.390235925 +0200
-@@ -28,6 +28,7 @@ INCLUDES = \
- $(GNOME_LIBS2_CFLAGS) \
+--- gnome-applets-2.91.4.orig/battstat/Makefile.am 2011-03-21 20:34:19.739985001 +0100
++++ gnome-applets-2.91.4/battstat/Makefile.am 2011-03-21 20:34:21.407985000 +0100
+@@ -27,6 +27,7 @@ INCLUDES = \
+ $(GNOME_APPLETS_CFLAGS) \
$(LIBNOTIFY_CFLAGS) \
$(HAL_CFLAGS) \
+ $(UPOWER_CFLAGS) \
$(APMINC) \
$(ACPIINC) \
- -DG_LOG_DOMAIN=\"battstat_applet\"
-@@ -47,7 +48,9 @@ battstat_applet_2_SOURCES = \
+ $(WARN_CFLAGS) \
+@@ -48,13 +49,16 @@ battstat_applet_2_SOURCES = \
acpi-freebsd.c \
acpi-freebsd.h \
battstat-hal.c \
@@ -42,19 +42,18 @@
battstat_applet_2_LDADD = \
-@@ -55,6 +58,7 @@ battstat_applet_2_LDADD = \
- $(GNOME_LIBS2_LIBS) \
+ $(GNOME_APPLETS_LIBS) \
$(LIBNOTIFY_LIBS) \
$(HAL_LIBS) \
+ $(UPOWER_LIBS) \
$(APMLIB)
schemasdir = @GCONF_SCHEMA_FILE_DIR@
-Index: gnome-applets-2.30.0/battstat/battstat-upower.c
+Index: gnome-applets-2.91.4/battstat/battstat-upower.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gnome-applets-2.30.0/battstat/battstat-upower.c 2010-07-07 21:20:44.390235925 +0200
-@@ -0,0 +1,330 @@
++++ gnome-applets-2.91.4/battstat/battstat-upower.c 2011-03-21 21:15:20.259985001 +0100
+@@ -0,0 +1,301 @@
+/*
+ * Copyright (C) 2010 by Joachim Breitner <mail at joachim-breitner.de>
+ *
@@ -129,9 +128,6 @@
+char *
+battstat_upower_initialise (void (*callback) (void))
+{
-+ char *error_str;
-+ int i, num;
-+
+ status_updated_callback = callback;
+
+ if( upc != NULL )
@@ -140,11 +136,7 @@
+ if( (upc = up_client_new() ) == NULL )
+ goto error_out;
+
-+ GCancellable *cancellable = g_cancellable_new();
-+ GError *gerror;
-+
-+ if (! up_client_enumerate_devices_sync( upc, cancellable, &gerror ) ) {
-+ sprintf(error_str, "Unable to enumerate upower devices: %s\n", gerror->message);
++ if (! up_client_enumerate_devices_sync( upc, NULL, NULL ) ) {
+ goto error_shutdownclient;
+ }
+
@@ -233,9 +225,6 @@
+ * one of the actual batteries in the system is charging.
+ */
+ int charging = 0;
-+
-+ /* A list iterator. */
-+ GSList *item;
+
+ /* For each physical battery bay... */
+ int i;
@@ -365,30 +354,11 @@
+ g_ptr_array_unref( devices );
+}
+
-+void
-+error_dialog( const char *fmt , ...)
-+{
-+ va_list ap;
-+ va_start(ap, fmt);
-+ char str[1000];
-+ vsprintf(str, fmt, ap);
-+ GtkWidget *dialog;
-+
-+ dialog = gtk_message_dialog_new( NULL, 0, GTK_MESSAGE_ERROR,
-+ GTK_BUTTONS_OK, "%s", str);
-+
-+ g_signal_connect_swapped( GTK_OBJECT (dialog), "response",
-+ G_CALLBACK (gtk_widget_destroy),
-+ GTK_OBJECT (dialog) );
-+
-+ gtk_widget_show_all( dialog );
-+}
-+
+#endif /* HAVE_UPOWER */
-Index: gnome-applets-2.30.0/battstat/battstat-upower.h
+Index: gnome-applets-2.91.4/battstat/battstat-upower.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gnome-applets-2.30.0/battstat/battstat-upower.h 2010-07-07 21:20:44.390235925 +0200
++++ gnome-applets-2.91.4/battstat/battstat-upower.h 2011-03-21 20:34:21.411985000 +0100
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2010 by Joachim Breitner <mail at joachim-breitner.de>
@@ -423,11 +393,11 @@
+void battstat_upower_get_battery_info (BatteryStatus *status);
+
+#endif /* _battstat_upower_h_ */
-Index: gnome-applets-2.30.0/battstat/battstat_applet.c
+Index: gnome-applets-2.91.4/battstat/battstat_applet.c
===================================================================
---- gnome-applets-2.30.0.orig/battstat/battstat_applet.c 2010-03-28 07:29:51.000000000 +0200
-+++ gnome-applets-2.30.0/battstat/battstat_applet.c 2010-07-07 21:20:44.390235925 +0200
-@@ -1231,9 +1231,12 @@ about_cb( BonoboUIComponent *uic, Progre
+--- gnome-applets-2.91.4.orig/battstat/battstat_applet.c 2011-03-21 20:34:19.675985001 +0100
++++ gnome-applets-2.91.4/battstat/battstat_applet.c 2011-03-21 20:34:21.411985000 +0100
+@@ -1188,9 +1188,12 @@ about_cb( GtkAction *action, ProgressDat
char *comments = g_strdup_printf ("%s\n\n%s",
_("This utility shows the status of your laptop battery."),
@@ -442,10 +412,10 @@
gtk_show_about_dialog( NULL,
"version", VERSION,
-Index: gnome-applets-2.30.0/battstat/docs/C/battstat.xml
+Index: gnome-applets-2.91.4/battstat/docs/C/battstat.xml
===================================================================
---- gnome-applets-2.30.0.orig/battstat/docs/C/battstat.xml 2010-03-28 08:29:26.000000000 +0200
-+++ gnome-applets-2.30.0/battstat/docs/C/battstat.xml 2010-07-07 21:27:13.882238528 +0200
+--- gnome-applets-2.91.4.orig/battstat/docs/C/battstat.xml 2011-03-21 20:34:19.647985001 +0100
++++ gnome-applets-2.91.4/battstat/docs/C/battstat.xml 2011-03-21 20:34:21.411985000 +0100
@@ -226,10 +226,13 @@
<title>Power Management Backends</title>
@@ -479,10 +449,10 @@
<figure id="battstat-credits-hal">
<title>Check you're using the HAL backend</title>
<screenshot>
-Index: gnome-applets-2.30.0/battstat/power-management.c
+Index: gnome-applets-2.91.4/battstat/power-management.c
===================================================================
---- gnome-applets-2.30.0.orig/battstat/power-management.c 2010-03-28 07:29:51.000000000 +0200
-+++ gnome-applets-2.30.0/battstat/power-management.c 2010-07-07 21:20:44.394239437 +0200
+--- gnome-applets-2.91.4.orig/battstat/power-management.c 2011-03-21 20:34:19.611985001 +0100
++++ gnome-applets-2.91.4/battstat/power-management.c 2011-03-21 20:34:21.411985000 +0100
@@ -41,6 +41,7 @@
#include "battstat.h"
@@ -599,13 +569,13 @@
power_management_using_hal( void )
{
#ifdef HAVE_HAL
-Index: gnome-applets-2.30.0/configure.in
+Index: gnome-applets-2.91.4/configure.in
===================================================================
---- gnome-applets-2.30.0.orig/configure.in 2010-07-07 21:19:23.918738153 +0200
-+++ gnome-applets-2.30.0/configure.in 2010-07-07 21:20:44.394239437 +0200
-@@ -23,6 +23,7 @@ LIBWNCK_REQUIRED=2.9.3
- LIBGNOME_DESKTOP_REQUIRED=2.11.1
- LIBNOTIFY_REQUIRED=0.3.2
+--- gnome-applets-2.91.4.orig/configure.in 2011-03-21 20:34:19.587985001 +0100
++++ gnome-applets-2.91.4/configure.in 2011-03-21 20:34:21.411985000 +0100
+@@ -23,6 +23,7 @@ LIBXKLAVIER_REQUIRED=4.0
+ LIBWNCK_REQUIRED=2.91.0
+ LIBNOTIFY_REQUIRED=0.7
HAL_REQUIRED=0.5.3
+UPOWER_REQUIRED=0.9.4
DBUS_REQUIRED=1.1.2
@@ -637,8 +607,8 @@
+
dnl -- check for gucharmap (optional) -----------------------------------------
- PKG_CHECK_EXISTS([gucharmap-2 >= $GUCHARMAP2_REQUIRED],
-@@ -758,5 +779,6 @@ gnome-applets-$VERSION configure summary
+ PKG_CHECK_MODULES([GUCHARMAP],[gucharmap-2.90 >= $GUCHARMAP3_REQUIRED],
+@@ -748,5 +769,6 @@ gnome-applets-$VERSION configure summary
Using DBUS: $HAVE_DBUS
Using NetworkManager: $HAVE_NETWORKMANAGER
Using HAL: $HAVE_HAL
Added: desktop/experimental/gnome-applets/debian/patches/02_link_X11.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/patches/02_link_X11.patch?rev=27013&op=file
==============================================================================
--- desktop/experimental/gnome-applets/debian/patches/02_link_X11.patch (added)
+++ desktop/experimental/gnome-applets/debian/patches/02_link_X11.patch [utf-8] Mon Mar 21 21:39:02 2011
@@ -1,0 +1,24 @@
+Index: gnome-applets-2.91.4/stickynotes/Makefile.am
+===================================================================
+--- gnome-applets-2.91.4.orig/stickynotes/Makefile.am 2011-03-21 20:57:09.319985001 +0100
++++ gnome-applets-2.91.4/stickynotes/Makefile.am 2011-03-21 20:57:49.167985000 +0100
+@@ -35,6 +35,7 @@ stickynotes_applet_SOURCES = \
+
+ stickynotes_applet_LDADD = \
+ $(GNOME_APPLETS_LIBS) \
++ $(X_LIBS) \
+ $(LIBWNCK_LIBS) \
+ $(XML2_LIBS)
+
+Index: gnome-applets-2.91.4/trashapplet/src/Makefile.am
+===================================================================
+--- gnome-applets-2.91.4.orig/trashapplet/src/Makefile.am 2011-03-21 20:58:30.047985002 +0100
++++ gnome-applets-2.91.4/trashapplet/src/Makefile.am 2011-03-21 20:58:39.167985001 +0100
+@@ -15,6 +15,7 @@ trashapplet_SOURCES = \
+
+ trashapplet_LDADD = \
+ $(GNOME_APPLETS_LIBS) \
++ $(X_LIBS) \
+ $(GIO_LIBS)
+
+ -include $(top_srcdir)/git.mk
Added: desktop/experimental/gnome-applets/debian/patches/03_mixer_gtk3.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/patches/03_mixer_gtk3.patch?rev=27013&op=file
==============================================================================
--- desktop/experimental/gnome-applets/debian/patches/03_mixer_gtk3.patch (added)
+++ desktop/experimental/gnome-applets/debian/patches/03_mixer_gtk3.patch [utf-8] Mon Mar 21 21:39:02 2011
@@ -1,0 +1,242 @@
+Index: gnome-applets-2.91.4/mixer/Makefile.am
+===================================================================
+--- gnome-applets-2.91.4.orig/mixer/Makefile.am 2011-03-21 21:23:13.099985000 +0100
++++ gnome-applets-2.91.4/mixer/Makefile.am 2011-03-21 21:23:32.267985002 +0100
+@@ -45,7 +45,7 @@ org.gnome.panel.applet.MixerAppletFactor
+ -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
+ $< > $@
+
+-uidir = $(datadir)/gnome-2.0/ui
++uidir = $(pkgdatadir)/ui
+ ui_DATA = mixer-applet-menu.xml
+
+ schemasdir = @GCONF_SCHEMA_FILE_DIR@
+Index: gnome-applets-2.91.4/mixer/applet.c
+===================================================================
+--- gnome-applets-2.91.4.orig/mixer/applet.c 2011-03-21 21:23:55.163985001 +0100
++++ gnome-applets-2.91.4/mixer/applet.c 2011-03-21 21:55:29.851985001 +0100
+@@ -69,10 +69,6 @@ gboolean gnome_volume_applet_key (GtkWi
+ static gdouble gnome_volume_applet_get_volume (GstMixer *mixer,
+ GstMixerTrack *track);
+
+-static void gnome_volume_applet_background (PanelApplet *panel_applet,
+- PanelAppletBackgroundType type,
+- GdkColor *colour,
+- GdkPixmap *pixmap);
+ static void gnome_volume_applet_orientation (PanelApplet *applet,
+ PanelAppletOrient orient);
+
+@@ -156,7 +152,6 @@ gnome_volume_applet_class_init (GnomeVol
+ gtkwidget_class->scroll_event = gnome_volume_applet_scroll;
+ gtkwidget_class->size_allocate = gnome_volume_applet_size_allocate;
+ panelapplet_class->change_orient = gnome_volume_applet_orientation;
+- panelapplet_class->change_background = gnome_volume_applet_background;
+
+ /* FIXME:
+ * - style-set.
+@@ -629,7 +624,6 @@ gnome_volume_applet_get_dock_position (G
+ static void
+ gnome_volume_applet_popup_dock (GnomeVolumeApplet *applet)
+ {
+- GtkWidget *widget = GTK_WIDGET (applet);
+ gint x, y;
+
+ /* Get it in just about the right position so that it
+@@ -657,13 +651,11 @@ gnome_volume_applet_popup_dock (GnomeVol
+ static void
+ gnome_volume_applet_popdown_dock (GnomeVolumeApplet *applet)
+ {
+- GtkWidget *widget = GTK_WIDGET (applet);
+-
+ if (!applet->pop)
+ return;
+
+ /* hide */
+- gtk_widget_hide_all (GTK_WIDGET (applet->dock));
++ gtk_widget_hide (GTK_WIDGET (applet->dock));
+
+ /* set menu item as active */
+ gtk_widget_set_state (GTK_WIDGET (applet), GTK_STATE_NORMAL);
+@@ -741,9 +733,9 @@ void
+ gnome_volume_applet_run_mixer (GnomeVolumeApplet *applet)
+ {
+ GError *error = NULL;
+-
+- gdk_spawn_command_line_on_screen (gtk_widget_get_screen (GTK_WIDGET (applet)),
+- "gnome-volume-control", &error);
++ char *argv[] = { "gnome-volume-control", NULL };
++ g_spawn_async (g_get_home_dir(), argv, NULL,
++ G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, &error);
+
+ if (error) {
+ GtkWidget *dialog;
+@@ -870,49 +862,49 @@ gnome_volume_applet_key (GtkWidget *wi
+ if (!applet->mixer) {
+ show_no_mixer_dialog (applet);
+ } else switch (event->keyval) {
+- case GDK_KP_Enter:
+- case GDK_ISO_Enter:
+- case GDK_3270_Enter:
+- case GDK_Return:
+- case GDK_space:
+- case GDK_KP_Space:
++ case GDK_KEY_KP_Enter:
++ case GDK_KEY_ISO_Enter:
++ case GDK_KEY_3270_Enter:
++ case GDK_KEY_Return:
++ case GDK_KEY_space:
++ case GDK_KEY_KP_Space:
+ gnome_volume_applet_pop_dock (applet);
+ return TRUE;
+- case GDK_m:
++ case GDK_KEY_m:
+ if (event->state == GDK_CONTROL_MASK) {
+ gnome_volume_applet_toggle_mute (applet);
+ return TRUE;
+ }
+ break;
+- case GDK_o:
++ case GDK_KEY_o:
+ if (event->state == GDK_CONTROL_MASK) {
+ gnome_volume_applet_run_mixer (applet);
+ return TRUE;
+ }
+ break;
+- case GDK_Escape:
++ case GDK_KEY_Escape:
+ gnome_volume_applet_popdown_dock (applet);
+ return TRUE;
+- case GDK_Page_Up:
+- case GDK_Page_Down:
+- case GDK_Left:
+- case GDK_Right:
+- case GDK_Up:
+- case GDK_Down: {
++ case GDK_KEY_Page_Up:
++ case GDK_KEY_Page_Down:
++ case GDK_KEY_Left:
++ case GDK_KEY_Right:
++ case GDK_KEY_Up:
++ case GDK_KEY_Down: {
+ gdouble volume = gtk_adjustment_get_value (applet->adjustment);
+ gdouble increment;
+
+ if (event->state != 0)
+ break;
+
+- if (event->keyval == GDK_Up || event->keyval == GDK_Down
+- ||event->keyval == GDK_Left)
++ if (event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_Down
++ ||event->keyval == GDK_KEY_Left)
+ increment = gtk_adjustment_get_step_increment (applet->adjustment);
+ else
+ increment = gtk_adjustment_get_page_increment (applet->adjustment);
+
+- if (event->keyval == GDK_Page_Up || event->keyval == GDK_Up
+- ||event->keyval == GDK_Right) {
++ if (event->keyval == GDK_KEY_Page_Up || event->keyval == GDK_KEY_Up
++ ||event->keyval == GDK_KEY_Right) {
+ volume += increment;
+ if (volume > gtk_adjustment_get_upper (applet->adjustment))
+ volume = gtk_adjustment_get_upper (applet->adjustment);
+@@ -995,40 +987,6 @@ void gnome_volume_applet_size_allocate (
+ gnome_volume_applet_refresh (applet, TRUE, -1, -1);
+ }
+
+-static void
+-gnome_volume_applet_background (PanelApplet *_applet,
+- PanelAppletBackgroundType type,
+- GdkColor *colour,
+- GdkPixmap *pixmap)
+-{
+- GnomeVolumeApplet *applet = GNOME_VOLUME_APPLET (_applet);
+- GtkRcStyle *rc_style;
+- GtkStyle *style;
+-
+- /* reset style */
+- gtk_widget_set_style (GTK_WIDGET (applet), NULL);
+- rc_style = gtk_rc_style_new ();
+- gtk_widget_modify_style (GTK_WIDGET (applet), rc_style);
+- g_object_unref (rc_style);
+-
+- switch (type) {
+- case PANEL_NO_BACKGROUND:
+- break;
+- case PANEL_COLOR_BACKGROUND:
+- gtk_widget_modify_bg (GTK_WIDGET (applet),
+- GTK_STATE_NORMAL, colour);
+- break;
+- case PANEL_PIXMAP_BACKGROUND:
+- style = gtk_style_copy (gtk_widget_get_style (GTK_WIDGET (applet)));
+- if (style->bg_pixmap[GTK_STATE_NORMAL])
+- g_object_unref (style->bg_pixmap[GTK_STATE_NORMAL]);
+- style->bg_pixmap[GTK_STATE_NORMAL] = g_object_ref (pixmap);
+- gtk_widget_set_style (GTK_WIDGET (applet), style);
+- g_object_unref (style);
+- break;
+- }
+-}
+-
+ /*
+ * This needs to be here because not all tracks have the same volume range,
+ * so you can send this function the track and a new volume and it will be
+Index: gnome-applets-2.91.4/mixer/dock.c
+===================================================================
+--- gnome-applets-2.91.4.orig/mixer/dock.c 2011-03-21 21:55:51.175985000 +0100
++++ gnome-applets-2.91.4/mixer/dock.c 2011-03-21 21:57:38.627985001 +0100
+@@ -29,6 +29,7 @@
+ #include <gtk/gtk.h>
+
+ #include "dock.h"
++#include "applet.h"
+
+ static void gnome_volume_applet_dock_class_init (GnomeVolumeAppletDockClass *klass);
+ static void gnome_volume_applet_dock_init (GnomeVolumeAppletDock *applet);
+@@ -142,7 +143,7 @@ gnome_volume_applet_dock_new (GtkOrienta
+ boxes (a "horizontal" orientation - the meaning is reversed for
+ historical reasons. */
+
+- GtkWidget *button, *scale, *mute, *more, *label;
++ GtkWidget *button, *scale, *more;
+ GtkWidget *container, *outerline, *innerline, *frame;
+ GnomeVolumeAppletDock *dock;
+ gint i;
+@@ -324,7 +325,7 @@ cb_key_press (GtkWidget *widget,
+ {
+
+ /* Trap the escape key to popdown the dock. */
+- if (event->keyval == GDK_Escape) {
++ if (event->keyval == GDK_KEY_Escape) {
+ /* This is trickier than it looks. The main applet is watching for
+ * this widget to loose focus. Hiding the widget causes a
+ * focus-loss, thus the applet gets the focus-out signal and all
+Index: gnome-applets-2.91.4/mixer/preferences.c
+===================================================================
+--- gnome-applets-2.91.4.orig/mixer/preferences.c 2011-03-21 21:58:17.055985001 +0100
++++ gnome-applets-2.91.4/mixer/preferences.c 2011-03-21 22:10:01.167985001 +0100
+@@ -88,7 +88,6 @@ gnome_volume_applet_preferences_init (Gn
+
+ /* make window look cute */
+ gtk_window_set_title (GTK_WINDOW (prefs), _("Volume Control Preferences"));
+- gtk_dialog_set_has_separator (GTK_DIALOG (prefs), FALSE);
+ gtk_container_set_border_width (GTK_CONTAINER (prefs), 5);
+ gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG(prefs))), 2);
+ gtk_dialog_add_buttons (GTK_DIALOG (prefs),
+@@ -106,7 +105,7 @@ gnome_volume_applet_preferences_init (Gn
+ gtk_widget_show (label);
+
+ /* optionmenu */
+- prefs->optionmenu = gtk_combo_box_new_text ();
++ prefs->optionmenu = GTK_WIDGET(gtk_combo_box_text_new ());
+ cells = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (prefs->optionmenu));
+ g_object_set (G_OBJECT (cells->data), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+ g_list_free (cells);
+@@ -170,7 +169,7 @@ gnome_volume_applet_preferences_new (Pan
+ for ( ; elements != NULL; elements = elements->next) {
+ gchar *name = g_object_get_data (G_OBJECT (elements->data),
+ "gnome-volume-applet-name");
+- gtk_combo_box_append_text (GTK_COMBO_BOX (prefs->optionmenu), name);
++ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (prefs->optionmenu), name);
+ }
+
+ gnome_volume_applet_preferences_change (prefs, mixer, tracks);
Modified: desktop/experimental/gnome-applets/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/patches/series?rev=27013&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-applets/debian/patches/series [utf-8] Mon Mar 21 21:39:02 2011
@@ -1,6 +1,4 @@
01_battstat_upower.patch
-09_modemlights_use_new_gst.patch
-10_network-manager.patch
+02_link_X11.patch
+03_mixer_gtk3.patch
15_path-max.patch
-98_autoreconf.patch
-99_ltmain_as-needed.patch
Modified: desktop/experimental/gnome-applets/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/rules?rev=27013&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-applets/debian/rules [utf-8] Mon Mar 21 21:39:02 2011
@@ -5,6 +5,7 @@
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
@@ -31,11 +32,9 @@
binary-install/gnome-applets::
rm -rf debian/gnome-applets/usr/lib/gnome-applets/gnome-applets/
chmod a+x debian/gnome-applets/usr/bin/* debian/gnome-applets/usr/lib/gnome-applets/*
- dh_pysupport -pgnome-applets
binary-install/gnome-applets-data::
find debian/gnome-applets-data/usr/share -type f -exec chmod -R a-x {} \;
- dh_pysupport -pgnome-applets-data
clean::
rm -f $(MANPAGES)
More information about the pkg-gnome-commits
mailing list