[Pkg-xfce-commits] r9611 - in /goodies/trunk/xfce4-battery-plugin: ./ debian/changelog debian/control debian/patches/01_no-sysctl.patch

[Yves-Alexis Perez]

Author: corsac
Date: Wed Nov  2 19:43:30 2016
New Revision: 9611

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=9611
Log:
merge battery plugin to trunk

Modified:
    goodies/trunk/xfce4-battery-plugin/   (props changed)
    goodies/trunk/xfce4-battery-plugin/debian/changelog
    goodies/trunk/xfce4-battery-plugin/debian/control
    goodies/trunk/xfce4-battery-plugin/debian/patches/01_no-sysctl.patch

Propchange: goodies/trunk/xfce4-battery-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Wed Nov  2 19:43:30 2016
@@ -1 +1 @@
-/goodies/branches/experimental/xfce4-battery-plugin:4419-5250
+/goodies/branches/experimental/xfce4-battery-plugin:4419-5250,9415-9610

Modified: goodies/trunk/xfce4-battery-plugin/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-battery-plugin/debian/changelog?rev=9611&op=diff
==============================================================================
--- goodies/trunk/xfce4-battery-plugin/debian/changelog	(original)
+++ goodies/trunk/xfce4-battery-plugin/debian/changelog	Wed Nov  2 19:43:30 2016
@@ -1,3 +1,14 @@
+xfce4-battery-plugin (1.0.99-1) UNRELEASED; urgency=medium
+
+  * New upstream development release.
+  * debian/control:
+    - replace gtk2 build-dep by gtk3
+    - add build-dep on libxfce4util and libxfce4ui.
+  * debian/patches:
+    - 01_no-sysctl updated for new release.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 06 Jun 2016 22:25:54 +0200
+
 xfce4-battery-plugin (1.0.5-4) unstable; urgency=medium
 
   * debian/patches:

Modified: goodies/trunk/xfce4-battery-plugin/debian/control
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-battery-plugin/debian/control?rev=9611&op=diff
==============================================================================
--- goodies/trunk/xfce4-battery-plugin/debian/control	(original)
+++ goodies/trunk/xfce4-battery-plugin/debian/control	Wed Nov  2 19:43:30 2016
@@ -4,8 +4,9 @@
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Yves-Alexis Perez <corsac at debian.org>,
  Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: autotools-dev, debhelper (>= 9), libgtk2.0-dev,
-  xfce4-panel-dev (>= 4.8.0), libxml2-dev, libxml-parser-perl,
+Build-Depends: autotools-dev, debhelper (>= 9), libgtk-3-dev,
+  libxfce4util-dev, libxfce4ui-2-dev (>= 4.12),
+  xfce4-panel-dev (>= 4.12.0), libxml2-dev, libxml-parser-perl,
   libxfce4util-dev, libxfce4ui-1-dev, intltool, dpkg-dev (>= 1.16.1),
   xfce4-dev-tools, automake, libtool
 Standards-Version: 3.9.6

Modified: goodies/trunk/xfce4-battery-plugin/debian/patches/01_no-sysctl.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-battery-plugin/debian/patches/01_no-sysctl.patch?rev=9611&op=diff
==============================================================================
--- goodies/trunk/xfce4-battery-plugin/debian/patches/01_no-sysctl.patch	(original)
+++ goodies/trunk/xfce4-battery-plugin/debian/patches/01_no-sysctl.patch	Wed Nov  2 19:43:30 2016
@@ -1,19 +1,17 @@
---- xfce4-battery-plugin-1.0.5.orig/panel-plugin/libacpi.c
-+++ xfce4-battery-plugin-1.0.5/panel-plugin/libacpi.c
-@@ -50,12 +50,13 @@ static int      acpifd;
- #endif
- 
- #include <sys/sysctl.h>
-+
-+#endif
-+
- #include <err.h>
- #include <errno.h>
- #include <unistd.h>
- 
--#endif
--
- #include "libacpi.h"
- 
- #define ACBASE "/proc/acpi/ac_adapter"
-
+--- a/panel-plugin/libacpi.c
++++ b/panel-plugin/libacpi.c
+@@ -51,11 +51,12 @@ static int      acpifd;
+ #endif
+ 
+ #include <sys/sysctl.h>
+-#include <err.h>
+-#include <errno.h>
+ 
+ #endif
+ 
++#include <err.h>
++#include <errno.h>
++
+ #include "libacpi.h"
+ 
+ #define ACBASE "/proc/acpi/ac_adapter"