[Pkg-xfce-commits] r4514 - in goodies/branches/experimental/xfce4-sensors-plugin/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-06 16:28:56 +0000 (Sat, 06 Nov 2010)
New Revision: 4514

Added:
   goodies/branches/experimental/xfce4-sensors-plugin/debian/patches/02_port-xfce-47.patch
Modified:
   goodies/branches/experimental/xfce4-sensors-plugin/debian/changelog
   goodies/branches/experimental/xfce4-sensors-plugin/debian/control
Log:
* debian/control:
  - add build-dep on libxfcegui4-dev.
* debian/patches:
  - 02_port-xfce-47 added, port to 4.7 panel and link against libxfcegui4.

Modified: goodies/branches/experimental/xfce4-sensors-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-sensors-plugin/debian/changelog	2010-11-06 14:22:51 UTC (rev 4513)
+++ goodies/branches/experimental/xfce4-sensors-plugin/debian/changelog	2010-11-06 16:28:56 UTC (rev 4514)
@@ -1,5 +1,14 @@
-xfce4-sensors-plugin (1.0.0-1) UNRELEASED; urgency=low
+xfce4-sensors-plugin (1.0.0-2) UNRELEASED; urgency=low
 
+  * debian/control:
+    - add build-dep on libxfcegui4-dev.
+  * debian/patches:
+    - 02_port-xfce-47 added, port to 4.7 panel and link against libxfcegui4.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 06 Nov 2010 15:38:18 +0100
+
+xfce4-sensors-plugin (1.0.0-1) unstable; urgency=low
+
   [ Yves-Alexis Perez ]
   * debian/control:
     - switch section to xfce.

Modified: goodies/branches/experimental/xfce4-sensors-plugin/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-sensors-plugin/debian/control	2010-11-06 14:22:51 UTC (rev 4513)
+++ goodies/branches/experimental/xfce4-sensors-plugin/debian/control	2010-11-06 16:28:56 UTC (rev 4514)
@@ -5,7 +5,7 @@
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Rudy Godoy <rudy at kernel-panik.org>, Yves-Alexis Perez <corsac at debian.org>, Stefan Ott <stefan at ott.net>, Michael Casadevall <mcasadevall at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: cdbs, debhelper (>= 4.1), libgtk2.0-dev, 
  xfce4-panel-dev (>= 4.4.1), libxml2-dev, libsensors4-dev, libxml-parser-perl, 
- hddtemp [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386], intltool
+ hddtemp [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386], intltool, libxfcegui4-dev 
 Standards-Version: 3.8.0
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-sensors-plugin/

Added: goodies/branches/experimental/xfce4-sensors-plugin/debian/patches/02_port-xfce-47.patch
===================================================================
--- goodies/branches/experimental/xfce4-sensors-plugin/debian/patches/02_port-xfce-47.patch	                        (rev 0)
+++ goodies/branches/experimental/xfce4-sensors-plugin/debian/patches/02_port-xfce-47.patch	2010-11-06 16:28:56 UTC (rev 4514)
@@ -0,0 +1,37 @@
+diff --git a/include/sensors-interface-common.h b/include/sensors-interface-common.h
+index 0013549..654bbb4 100644
+--- a/include/sensors-interface-common.h
++++ b/include/sensors-interface-common.h
+@@ -31,7 +31,7 @@
+ /* #include <glib/gprintf.h>  */
+ 
+ /* Xfce includes */
+-#include <libxfce4panel/xfce-panel-plugin.h>
++#include <libxfce4panel/libxfce4panel.h>
+ 
+ /* Package includes */
+ #include <types.h>
+diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
+index b9f3ffe..e45b153 100644
+--- a/panel-plugin/Makefile.am
++++ b/panel-plugin/Makefile.am
+@@ -20,6 +20,7 @@ xfce4_sensors_plugin_SOURCES =									   \
+ 
+ xfce4_sensors_plugin_CFLAGS = \
+ 	@LIBXFCE4PANEL_CFLAGS@										   \
++	@LIBXFCEGUI4_CFLAGS@										   \
+ 	@PLATFORM_CFLAGS@												\
+ 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"							\
+ 	@LIBSENSORS_CFLAGS@
+@@ -27,9 +28,10 @@ xfce4_sensors_plugin_CFLAGS = \
+ #	@GTK_CFLAGS@ \
+ # @GLIB_CFLAGS@
+ 
+-xfce4_sensors_plugin_LDFLAGS = 								\
++xfce4_sensors_plugin_LDADD = 								\
+ 	$(top_builddir)/lib/libxfce4sensors.la
+ 	@LIBXFCE4PANEL_LIBS@											 \
++	@LIBXFCEGUI4_LIBS@											 \
+ 	@SOLLIBS@														\
+ 	@LIBSENSORS_LDFLAGS@
+