r30575 - in /desktop/unstable/gnome-applets/debian: changelog patches/01_battstat_upower.patch
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Sun Oct 16 00:33:10 UTC 2011
Author: biebl
Date: Sun Oct 16 00:33:09 2011
New Revision: 30575
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30575
Log:
* debian/patches/01_battstat_upower.patch
- battstat-upower.c uses floor(). Update the patch to link battstat applet
against -lm.
Modified:
desktop/unstable/gnome-applets/debian/changelog
desktop/unstable/gnome-applets/debian/patches/01_battstat_upower.patch
Modified: desktop/unstable/gnome-applets/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/changelog?rev=30575&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/changelog [utf-8] Sun Oct 16 00:33:09 2011
@@ -1,8 +1,14 @@
gnome-applets (3.2.0-3) UNRELEASED; urgency=low
+ [ Jordi Mallach ]
* Make Vcs-* fields point at the unstable branch.
- -- Jordi Mallach <jordi at debian.org> Fri, 14 Oct 2011 18:17:40 +0200
+ [ Michael Biebl ]
+ * debian/patches/01_battstat_upower.patch
+ - battstat-upower.c uses floor(). Update the patch to link battstat applet
+ against -lm.
+
+ -- Michael Biebl <biebl at debian.org> Sun, 16 Oct 2011 02:31:36 +0200
gnome-applets (3.2.0-2) unstable; urgency=low
Modified: desktop/unstable/gnome-applets/debian/patches/01_battstat_upower.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/patches/01_battstat_upower.patch?rev=30575&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/patches/01_battstat_upower.patch [utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/patches/01_battstat_upower.patch [utf-8] Sun Oct 16 00:33:09 2011
@@ -21,8 +21,8 @@
Index: gnome-applets-3.2.0/battstat/Makefile.am
===================================================================
---- gnome-applets-3.2.0.orig/battstat/Makefile.am 2011-05-08 02:18:20.000000000 +0200
-+++ gnome-applets-3.2.0/battstat/Makefile.am 2011-10-11 23:16:29.169379320 +0200
+--- gnome-applets-3.2.0.orig/battstat/Makefile.am 2011-10-16 02:00:12.459022032 +0200
++++ gnome-applets-3.2.0/battstat/Makefile.am 2011-10-16 02:03:43.988362748 +0200
@@ -27,6 +27,7 @@
$(GNOME_APPLETS_CFLAGS) \
$(LIBNOTIFY_CFLAGS) \
@@ -31,7 +31,7 @@
$(APMINC) \
$(ACPIINC) \
$(WARN_CFLAGS) \
-@@ -48,13 +49,16 @@
+@@ -48,13 +49,17 @@
acpi-freebsd.c \
acpi-freebsd.h \
battstat-hal.c \
@@ -46,13 +46,14 @@
$(LIBNOTIFY_LIBS) \
$(HAL_LIBS) \
+ $(UPOWER_LIBS) \
++ $(LIBM) \
$(APMLIB)
schemasdir = @GCONF_SCHEMA_FILE_DIR@
Index: gnome-applets-3.2.0/battstat/battstat-upower.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gnome-applets-3.2.0/battstat/battstat-upower.c 2011-10-11 23:16:29.173379270 +0200
++++ gnome-applets-3.2.0/battstat/battstat-upower.c 2011-10-16 02:00:24.926865289 +0200
@@ -0,0 +1,301 @@
+/*
+ * Copyright (C) 2010 by Joachim Breitner <mail at joachim-breitner.de>
@@ -358,7 +359,7 @@
Index: gnome-applets-3.2.0/battstat/battstat-upower.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gnome-applets-3.2.0/battstat/battstat-upower.h 2011-10-11 23:16:29.177379220 +0200
++++ gnome-applets-3.2.0/battstat/battstat-upower.h 2011-10-16 02:00:24.934865189 +0200
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2010 by Joachim Breitner <mail at joachim-breitner.de>
@@ -395,8 +396,8 @@
+#endif /* _battstat_upower_h_ */
Index: gnome-applets-3.2.0/battstat/battstat_applet.c
===================================================================
---- gnome-applets-3.2.0.orig/battstat/battstat_applet.c 2011-04-05 22:45:47.000000000 +0200
-+++ gnome-applets-3.2.0/battstat/battstat_applet.c 2011-10-11 23:16:29.181379170 +0200
+--- gnome-applets-3.2.0.orig/battstat/battstat_applet.c 2011-10-16 02:00:12.335023591 +0200
++++ gnome-applets-3.2.0/battstat/battstat_applet.c 2011-10-16 02:00:24.934865189 +0200
@@ -1188,9 +1188,12 @@
char *comments = g_strdup_printf ("%s\n\n%s",
@@ -414,8 +415,8 @@
"version", VERSION,
Index: gnome-applets-3.2.0/battstat/docs/C/battstat.xml
===================================================================
---- gnome-applets-3.2.0.orig/battstat/docs/C/battstat.xml 2011-09-25 20:55:02.000000000 +0200
-+++ gnome-applets-3.2.0/battstat/docs/C/battstat.xml 2011-10-11 23:16:29.181379170 +0200
+--- gnome-applets-3.2.0.orig/battstat/docs/C/battstat.xml 2011-10-16 02:00:12.379023038 +0200
++++ gnome-applets-3.2.0/battstat/docs/C/battstat.xml 2011-10-16 02:00:24.934865189 +0200
@@ -226,10 +226,13 @@
<title>Power Management Backends</title>
@@ -451,8 +452,8 @@
<screenshot>
Index: gnome-applets-3.2.0/battstat/power-management.c
===================================================================
---- gnome-applets-3.2.0.orig/battstat/power-management.c 2011-04-05 22:45:47.000000000 +0200
-+++ gnome-applets-3.2.0/battstat/power-management.c 2011-10-11 23:16:29.185379120 +0200
+--- gnome-applets-3.2.0.orig/battstat/power-management.c 2011-10-16 02:00:12.299024044 +0200
++++ gnome-applets-3.2.0/battstat/power-management.c 2011-10-16 02:00:24.934865189 +0200
@@ -41,6 +41,7 @@
#include "battstat.h"
@@ -571,8 +572,8 @@
#ifdef HAVE_HAL
Index: gnome-applets-3.2.0/configure.in
===================================================================
---- gnome-applets-3.2.0.orig/configure.in 2011-09-19 22:49:01.000000000 +0200
-+++ gnome-applets-3.2.0/configure.in 2011-10-11 23:16:29.185379120 +0200
+--- gnome-applets-3.2.0.orig/configure.in 2011-10-16 02:00:12.499021530 +0200
++++ gnome-applets-3.2.0/configure.in 2011-10-16 02:03:17.784692172 +0200
@@ -23,6 +23,7 @@
LIBWNCK_REQUIRED=2.91.0
LIBNOTIFY_REQUIRED=0.7
@@ -581,7 +582,7 @@
DBUS_REQUIRED=1.1.2
DBUS_GLIB_REQUIRED=0.74
PYGOBJECT_REQUIRED=2.26
-@@ -223,6 +224,26 @@
+@@ -223,6 +224,30 @@
AC_SUBST(HAL_CFLAGS)
AC_SUBST(HAL_LIBS)
@@ -595,6 +596,7 @@
+ HAVE_UPOWER="yes",
+ HAVE_UPOWER="no")
+
++ LT_LIB_M
+ if test "x$HAVE_UPOWER" = "xyes"; then
+ AC_DEFINE(HAVE_UPOWER, 1, [UPOWER available])
+ fi
@@ -604,11 +606,14 @@
+
+AC_SUBST(UPOWER_CFLAGS)
+AC_SUBST(UPOWER_LIBS)
++AC_SUBST(LIBM)
++
++
+
dnl -- check for gucharmap (optional) -----------------------------------------
PKG_CHECK_MODULES([GUCHARMAP],[gucharmap-2.90 >= $GUCHARMAP3_REQUIRED],
-@@ -742,5 +763,6 @@
+@@ -742,5 +767,6 @@
Using DBUS: $HAVE_DBUS
Using NetworkManager: $HAVE_NETWORKMANAGER
Using HAL: $HAVE_HAL
More information about the pkg-gnome-commits
mailing list