[Pkg-xfce-commits] r5314 - in goodies/trunk/xfce4-sensors-plugin: . debian debian/patches

Lionel Le Folgoc mrpouit-guest at alioth.debian.org
Sun Apr 3 12:26:55 UTC 2011 

Author: mrpouit-guest
Date: 2011-04-03 12:26:48 +0000 (Sun, 03 Apr 2011)
New Revision: 5314

Added:
   goodies/trunk/xfce4-sensors-plugin/debian/patches/02_port-xfce-47.patch
   goodies/trunk/xfce4-sensors-plugin/debian/patches/03_fix-typo.patch
Modified:
   goodies/trunk/xfce4-sensors-plugin/
   goodies/trunk/xfce4-sensors-plugin/debian/changelog
   goodies/trunk/xfce4-sensors-plugin/debian/control
   goodies/trunk/xfce4-sensors-plugin/debian/patches/01_fix-build-without-libnotify.patch
   goodies/trunk/xfce4-sensors-plugin/debian/patches/series
   goodies/trunk/xfce4-sensors-plugin/debian/rules
Log:
merge experimental changes into trunk


Property changes on: goodies/trunk/xfce4-sensors-plugin
___________________________________________________________________
Added: svn:mergeinfo
   + /goodies/branches/experimental/xfce4-sensors-plugin:4344-5311
/goodies/tags/xfce4-sensors-plugin/1.0.0-1:3942-4343

Modified: goodies/trunk/xfce4-sensors-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-sensors-plugin/debian/changelog	2011-04-03 12:26:23 UTC (rev 5313)
+++ goodies/trunk/xfce4-sensors-plugin/debian/changelog	2011-04-03 12:26:48 UTC (rev 5314)
@@ -1,3 +1,27 @@
+xfce4-sensors-plugin (1.0.0-2) UNRELEASED; urgency=low
+
+  [ Yves-Alexis Perez ]
+  * debian/control:
+    - add build-dep on libxfcegui4-dev.
+    - add build-dep on xfce4-dev-tools and libtool.
+    - update debhelper build-dep to 7.
+    - update standards version to 3.9.1.
+    - add build-dep on libnotify-dev.
+  * debian/patches:
+    - 02_port-xfce-47 added, port to 4.7 panel and link against libxfcegui4.
+  * debian/rules:
+    - run xdt-autogen after applying patch touching Makefile.am.
+  * debian/compat bumped to 7.
+
+  [ Lionel Le Folgoc ]
+  * debian/rules: clean up autogenerated files changed by xdt-autogen.
+  * Switch to 3.0 (quilt).
+  * debian/patches:
+    - 03_fix-typo.patch: added, fixes FTBFS with binutils-gold.  Closes: #556700
+    - series: refreshed.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 08 Dec 2010 18:12:04 +0100
+
 xfce4-sensors-plugin (1.0.0-1) unstable; urgency=low
 
   [ Yves-Alexis Perez ]

Modified: goodies/trunk/xfce4-sensors-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-sensors-plugin/debian/control	2011-04-03 12:26:23 UTC (rev 5313)
+++ goodies/trunk/xfce4-sensors-plugin/debian/control	2011-04-03 12:26:48 UTC (rev 5314)
@@ -5,8 +5,9 @@
 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 (>= 7), libgtk2.0-dev, 
  xfce4-panel-dev (>= 4.4.1), libxml2-dev, libsensors4-dev, libxml-parser-perl, 
- hddtemp [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386], intltool, libnotify-dev
-Standards-Version: 3.8.4
+ hddtemp [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386], intltool, libxfcegui4-dev,
+ xfce4-dev-tools, libtool, libnotify-dev
+Standards-Version: 3.9.1
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-sensors-plugin/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-sensors-plugin/

Modified: goodies/trunk/xfce4-sensors-plugin/debian/patches/01_fix-build-without-libnotify.patch
===================================================================
--- goodies/trunk/xfce4-sensors-plugin/debian/patches/01_fix-build-without-libnotify.patch	2011-04-03 12:26:23 UTC (rev 5313)
+++ goodies/trunk/xfce4-sensors-plugin/debian/patches/01_fix-build-without-libnotify.patch	2011-04-03 12:26:48 UTC (rev 5314)
@@ -1,3 +1,7 @@
+Origin: http://bugzilla.xfce.org/show_bug.cgi?id=6349
+Description: fix compilation without libnotify
+Bug: http://bugzilla.xfce.org/show_bug.cgi?id=6349
+Applied-Upstream: 1.0.1, http://git.xfce.org/panel-plugins/xfce4-sensors-plugin/commit/?id=9c0aa66667f47fe4e4eae91e995d041d3650993a
 diff --git a/lib/hddtemp.c b/lib/hddtemp.c
 index d7ac69e..5089f34 100644
 --- a/lib/hddtemp.c

Copied: goodies/trunk/xfce4-sensors-plugin/debian/patches/02_port-xfce-47.patch (from rev 5311, goodies/branches/experimental/xfce4-sensors-plugin/debian/patches/02_port-xfce-47.patch)
===================================================================
--- goodies/trunk/xfce4-sensors-plugin/debian/patches/02_port-xfce-47.patch	                        (rev 0)
+++ goodies/trunk/xfce4-sensors-plugin/debian/patches/02_port-xfce-47.patch	2011-04-03 12:26:48 UTC (rev 5314)
@@ -0,0 +1,55 @@
+Description: port to xfce4-panel 4.7
+Bug: http://bugzilla.xfce.org/show_bug.cgi?id=6938
+Applied-Upstream: 1.0.1, http://git.xfce.org/panel-plugins/xfce4-sensors-plugin/commit/?id=4ee50b039a8cb114cfdf8d04982bc114e833d550
+Author: Yves-Alexis Perez <corsac at debian.org>
+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@
+ 
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 7057c7c..1fa0788 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -27,7 +27,8 @@ xfce4_sensors_CFLAGS = \
+ 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+ 	@LIBSENSORS_CFLAGS@	\
+ 	@LIBXFCE4UTIL_CFLAGS@ \
+-	@LIBXFCEGUI4_CFLAGS@
++	@LIBXFCEGUI4_CFLAGS@ \
++	@LIBXFCE4PANEL_CFLAGS@
+ 
+ # @GTK_CFLAGS@ 	\
+ # @GLIB_CFLAGS@ \

Copied: goodies/trunk/xfce4-sensors-plugin/debian/patches/03_fix-typo.patch (from rev 5311, goodies/branches/experimental/xfce4-sensors-plugin/debian/patches/03_fix-typo.patch)
===================================================================
--- goodies/trunk/xfce4-sensors-plugin/debian/patches/03_fix-typo.patch	                        (rev 0)
+++ goodies/trunk/xfce4-sensors-plugin/debian/patches/03_fix-typo.patch	2011-04-03 12:26:48 UTC (rev 5314)
@@ -0,0 +1,14 @@
+Description: Add a missing \
+Origin: other, http://bugzilla.xfce.org/attachment.cgi?id=3274
+Bug: http://bugzilla.xfce.org/show_bug.cgi?id=6973
+--- xfce4-sensors-plugin-1.0.0.orig/panel-plugin/Makefile.am
++++ xfce4-sensors-plugin-1.0.0/panel-plugin/Makefile.am
+@@ -29,7 +29,7 @@ xfce4_sensors_plugin_CFLAGS = \
+ # @GLIB_CFLAGS@
+ 
+ xfce4_sensors_plugin_LDADD = 								\
+-	$(top_builddir)/lib/libxfce4sensors.la
++	$(top_builddir)/lib/libxfce4sensors.la							 \
+ 	@LIBXFCE4PANEL_LIBS@											 \
+ 	@LIBXFCEGUI4_LIBS@											 \
+ 	@SOLLIBS@														\

Modified: goodies/trunk/xfce4-sensors-plugin/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-sensors-plugin/debian/patches/series	2011-04-03 12:26:23 UTC (rev 5313)
+++ goodies/trunk/xfce4-sensors-plugin/debian/patches/series	2011-04-03 12:26:48 UTC (rev 5314)
@@ -1 +1,3 @@
 01_fix-build-without-libnotify.patch
+02_port-xfce-47.patch
+03_fix-typo.patch

Modified: goodies/trunk/xfce4-sensors-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-sensors-plugin/debian/rules	2011-04-03 12:26:23 UTC (rev 5313)
+++ goodies/trunk/xfce4-sensors-plugin/debian/rules	2011-04-03 12:26:48 UTC (rev 5314)
@@ -7,6 +7,13 @@
 DEB_DH_MAKESHLIBS_ARGS_ALL += -X debian/xfce4-sensors-plugin/usr/lib/xfce4/modules/libxfce4sensors.so.1.0.0
 DEB_INSTALL_MANPAGES_xfce4-sensors-plugin := debian/xfce4-sensors.1
 
+post-patches::
+	NOCONFIGURE=1 xdt-autogen
+
+clean::
+	rm -f $$(find -name 'Makefile.in*')
+	rm -f aclocal.m4 configure
+
 binary-post-install/xfce4-sensors-plugin::
 	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.a
 	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.la

More information about the Pkg-xfce-commits mailing list