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

[Yves-Alexis Perez]

Author: corsac
Date: 2010-12-08 11:20:05 +0000 (Wed, 08 Dec 2010)
New Revision: 4646

Removed:
   goodies/branches/experimental/xfce4-netload-plugin/debian/patches/03_link-against-libxfcegui4.patch
   goodies/branches/experimental/xfce4-netload-plugin/debian/patches/series
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:
remove the patch to link against libxfcegui4, and drop the xdt-autogen call


Modified: goodies/branches/experimental/xfce4-netload-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-netload-plugin/debian/changelog	2010-12-08 10:56:12 UTC (rev 4645)
+++ goodies/branches/experimental/xfce4-netload-plugin/debian/changelog	2010-12-08 11:20:05 UTC (rev 4646)
@@ -4,20 +4,17 @@
   * 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.
     - update standards version to 3.9.1.
   * debian/patches:
     - 01_fix-ftbfs-kfreebsd dropped, included upstream.
     - 02_fix-tooltips-gtk2.16 as well.
-    - 03_link-against-libxfcegui4 added, link against libxfcegui4 explicitly.
   * debian/rules:
-    - run xdt-autogen after applying patches.
     - pick {C,LD}FLAGS from dpkg-buildflags.
     - add -O1, -z,defs, --as-needed to LDFLAGS.
     - add hardening flags to {C,LD}FLAGS.
   * Switch to 3.0 (quilt) source format.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Wed, 08 Dec 2010 11:56:00 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 08 Dec 2010 11:56:24 +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-12-08 10:56:12 UTC (rev 4645)
+++ goodies/branches/experimental/xfce4-netload-plugin/debian/control	2010-12-08 11:20:05 UTC (rev 4646)
@@ -5,8 +5,7 @@
 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, xfce4-dev-tools, libtool, autoconf, 
- intltool, hardening-includes
+ libxml-parser-perl, libxfcegui4-dev, intltool, hardening-includes
 Standards-Version: 3.9.1
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-netload-plugin/

Deleted: 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	2010-12-08 10:56:12 UTC (rev 4645)
+++ goodies/branches/experimental/xfce4-netload-plugin/debian/patches/03_link-against-libxfcegui4.patch	2010-12-08 11:20:05 UTC (rev 4646)
@@ -1,46 +0,0 @@
-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
-index 4c353f0..842300e 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([ca de fr ko lt pl uk])
- 
-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
- #

Deleted: goodies/branches/experimental/xfce4-netload-plugin/debian/patches/series
===================================================================
--- goodies/branches/experimental/xfce4-netload-plugin/debian/patches/series	2010-12-08 10:56:12 UTC (rev 4645)
+++ goodies/branches/experimental/xfce4-netload-plugin/debian/patches/series	2010-12-08 11:20:05 UTC (rev 4646)
@@ -1 +0,0 @@
-03_link-against-libxfcegui4.patch

Modified: goodies/branches/experimental/xfce4-netload-plugin/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-netload-plugin/debian/rules	2010-12-08 10:56:12 UTC (rev 4645)
+++ goodies/branches/experimental/xfce4-netload-plugin/debian/rules	2010-12-08 11:20:05 UTC (rev 4646)
@@ -8,9 +8,6 @@
 LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
 CFLAGS+=$(HARDENING_CFLAGS)
 
-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