[Pkg-xfce-commits] r4446 - in goodies/branches/experimental/xfce4-netload-plugin/debian: . patches
Yves-Alexis Perez
corsac at alioth.debian.org
Fri Nov 5 12:41:02 UTC 2010
Author: corsac
Date: 2010-11-05 12:41:01 +0000 (Fri, 05 Nov 2010)
New Revision: 4446
Added:
goodies/branches/experimental/xfce4-netload-plugin/debian/patches/03_link-against-libxfcegui4.patch
Modified:
goodies/branches/experimental/xfce4-netload-plugin/debian/changelog
goodies/branches/experimental/xfce4-netload-plugin/debian/control
goodies/branches/experimental/xfce4-netload-plugin/debian/rules
Log:
- add build-dep on xfce4-dev-tools, libtool, autoconf and intltool.
* debian/patches:
- 03_link-against-libxfcegui4 added, link against libxfcegui4 explicitely.
* debian/rules:
- run xdt-autogen after applying patches.
Modified: goodies/branches/experimental/xfce4-netload-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-netload-plugin/debian/changelog 2010-11-05 11:50:14 UTC (rev 4445)
+++ goodies/branches/experimental/xfce4-netload-plugin/debian/changelog 2010-11-05 12:41:01 UTC (rev 4446)
@@ -3,8 +3,13 @@
* debian/control:
- add explicit build-dep on libxfcegui4-dev now that xfce4-panel-dev
doesn't provide it anymore.
+ - add build-dep on xfce4-dev-tools, libtool, autoconf and intltool.
+ * debian/patches:
+ - 03_link-against-libxfcegui4 added, link against libxfcegui4 explicitely.
+ * debian/rules:
+ - run xdt-autogen after applying patches.
- -- Yves-Alexis Perez <corsac at debian.org> Fri, 05 Nov 2010 12:49:50 +0100
+ -- Yves-Alexis Perez <corsac at debian.org> Fri, 05 Nov 2010 13:19:42 +0100
xfce4-netload-plugin (0.4.0-4) unstable; urgency=low
Modified: goodies/branches/experimental/xfce4-netload-plugin/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-netload-plugin/debian/control 2010-11-05 11:50:14 UTC (rev 4445)
+++ goodies/branches/experimental/xfce4-netload-plugin/debian/control 2010-11-05 12:41:01 UTC (rev 4446)
@@ -5,7 +5,8 @@
Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
Yves-Alexis Perez <corsac at debian.org>
Build-Depends: cdbs, debhelper (>= 7), xfce4-panel-dev (>= 4.6.0), libxml2-dev,
- libxml-parser-perl, libxfcegui4-dev
+ libxml-parser-perl, libxfcegui4-dev, xfce4-dev-tools, libtool, autoconf,
+ intltool
Standards-Version: 3.8.3
Homepage: http://goodies.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-netload-plugin/
Added: goodies/branches/experimental/xfce4-netload-plugin/debian/patches/03_link-against-libxfcegui4.patch
===================================================================
--- goodies/branches/experimental/xfce4-netload-plugin/debian/patches/03_link-against-libxfcegui4.patch (rev 0)
+++ goodies/branches/experimental/xfce4-netload-plugin/debian/patches/03_link-against-libxfcegui4.patch 2010-11-05 12:41:01 UTC (rev 4446)
@@ -0,0 +1,46 @@
+commit 3d15b6fb40900b043dc3863d3ad5571029e45c3d
+Author: Alex Dedul <rotmer at gmail.com>
+Date: Tue Oct 12 10:19:09 2010 +0900
+
+ Fix compatibility with Xfce 4.7+
+
+ Make the dependency on libxfcegui4 explicit, instead of relying on some
+ other component to link to it for us.
+
+ Fixes bug 6466.
+
+diff --git a/configure.ac b/configure.ac
+ex bcaf4fc..a601f3d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -54,6 +54,9 @@ AC_SUBST(SOLLIBS)
+ dnl configure the panel plugin
+ XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20])
+
++dnl configure the libxfcegui4
++XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0])
++
+ dnl Check for i18n support
+ XDT_I18N([@LINGUAS@])
+
+diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
+index 2e0850b..0635d67 100644
+--- a/panel-plugin/Makefile.am
++++ b/panel-plugin/Makefile.am
+@@ -16,11 +16,13 @@ xfce4_netload_plugin_SOURCES = \
+
+ xfce4_netload_plugin_CFLAGS = \
+ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+- @LIBXFCE4PANEL_CFLAGS@
++ @LIBXFCE4PANEL_CFLAGS@ \
++ @LIBXFCEGUI4_CFLAGS@
+
+-xfce4_netload_plugin_LDFLAGS = \
++xfce4_netload_plugin_LDADD = \
+ @SOLLIBS@ \
+- @LIBXFCE4PANEL_LIBS@
++ @LIBXFCE4PANEL_LIBS@ \
++ @LIBXFCEGUI4_LIBS@
+
+ # .desktop file
+ #
Modified: goodies/branches/experimental/xfce4-netload-plugin/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-netload-plugin/debian/rules 2010-11-05 11:50:14 UTC (rev 4445)
+++ goodies/branches/experimental/xfce4-netload-plugin/debian/rules 2010-11-05 12:41:01 UTC (rev 4446)
@@ -3,6 +3,9 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
+post-patches::
+ NOCONFIGURE=1 xdt-autogen
+
binary-post-install/xfce4-netload-plugin::
-rm -rf debian/xfce4-netload-plugin/usr/lib/xfce4/panel-plugins/*.a
-rm -rf debian/xfce4-netload-plugin/usr/lib/xfce4/panel-plugins/*.la
More information about the Pkg-xfce-commits
mailing list