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

[Yves-Alexis Perez]

Author: corsac
Date: 2011-03-23 15:31:34 +0000 (Wed, 23 Mar 2011)
New Revision: 5148

Removed:
   goodies/branches/experimental/xfce4-genmon-plugin/debian/patches/03_link-with-libxfcegui4.patch
   goodies/branches/experimental/xfce4-genmon-plugin/debian/patches/series
Modified:
   goodies/branches/experimental/xfce4-genmon-plugin/debian/changelog
   goodies/branches/experimental/xfce4-genmon-plugin/debian/control
   goodies/branches/experimental/xfce4-genmon-plugin/debian/rules
Log:
drop 03_link-with-libxfcegui4, included upstream

remove all the autoconf regeneration too


Modified: goodies/branches/experimental/xfce4-genmon-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-genmon-plugin/debian/changelog	2011-03-23 15:29:11 UTC (rev 5147)
+++ goodies/branches/experimental/xfce4-genmon-plugin/debian/changelog	2011-03-23 15:31:34 UTC (rev 5148)
@@ -9,23 +9,17 @@
   * debian/control:
     - switch to xfce section.
     - add build-dep on libxfcegui4-dev. 
-    - add build-dep on xfce4-dev-tools, libtool, intltool and autoconf so we
-      can run xdt-autogen at build time.
     - update standards version to 3.9.1.
     - add ${misc:Depends} to dependencies.
   * debian/patches:
     - 01_no-zombies dropped, included upstream.
     - 02_close-unused-pipes as well.
-    - 03_link-with-libxfcegui4 added, link against libxfcegui4 now that it's
-      not provided by xfce4-panel.
   * debian/rules:
-    - run xdt-autogen after applying patches to configure.ac/Makefile.am.
     - drop simple-patchsys include.
   * Switch to 3.0 (quilt) source format
   * debian/compat bumped to 7.
 
   [ Lionel Le Folgoc ]
-  * debian/rules: clean up autogenerated files changed by xdt-autogen.
   * debian/control: add myself to Uploaders.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Thu, 04 Nov 2010 13:18:33 +0100

Modified: goodies/branches/experimental/xfce4-genmon-plugin/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-genmon-plugin/debian/control	2011-03-23 15:29:11 UTC (rev 5147)
+++ goodies/branches/experimental/xfce4-genmon-plugin/debian/control	2011-03-23 15:31:34 UTC (rev 5148)
@@ -5,8 +5,7 @@
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
  Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: debhelper (>= 4.1.0), autotools-dev, cdbs, 
- xfce4-panel-dev (>= 4.4.1), libxml-parser-perl, libxfcegui4-dev, 
- xfce4-dev-tools, intltool, libtool, autoconf
+ xfce4-panel-dev (>= 4.4.1), libxml-parser-perl, libxfcegui4-dev
 Standards-Version: 3.9.1
 Homepage: http://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-genmon-plugin/

Deleted: goodies/branches/experimental/xfce4-genmon-plugin/debian/patches/03_link-with-libxfcegui4.patch
===================================================================
--- goodies/branches/experimental/xfce4-genmon-plugin/debian/patches/03_link-with-libxfcegui4.patch	2011-03-23 15:29:11 UTC (rev 5147)
+++ goodies/branches/experimental/xfce4-genmon-plugin/debian/patches/03_link-with-libxfcegui4.patch	2011-03-23 15:31:34 UTC (rev 5148)
@@ -1,35 +0,0 @@
-Description: explict link against libxfcegui4, fix build with xfce4-panel 4.7
-Author: Yves-Alexis Perez <corsac at debian.org>
-Bug: http://bugzilla.xfce.org/show_bug.cgi?id=6953
-diff --git a/configure.ac b/configure.ac
-index 5848dd9..f5ae222 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -32,6 +32,8 @@ AC_HEADER_STDC
- 
- dnl configure the panel plugin
- XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.22])
-+XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4])                      
-+
- 
- dnl Translations
- XDT_I18N([ca cs en_GB eu fr pl pt_PT sq])
-diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
-index e3b55fb..f377d02 100644
---- a/panel-plugin/Makefile.am
-+++ b/panel-plugin/Makefile.am
-@@ -3,10 +3,12 @@ plugin_PROGRAMS = xfce4-genmon-plugin
- 
- xfce4_genmon_plugin_CFLAGS =					\
- 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"			\
--	@LIBXFCE4PANEL_CFLAGS@
-+	@LIBXFCE4PANEL_CFLAGS@ \
-+	@LIBXFCEGUI4_CFLAGS@
- 
- xfce4_genmon_plugin_LDADD =					\
--	@LIBXFCE4PANEL_LIBS@
-+	@LIBXFCE4PANEL_LIBS@ \
-+	@LIBXFCEGUI4_LIBS@
- 
- xfce4_genmon_plugin_SOURCES =	\
- 	main.c			\

Deleted: goodies/branches/experimental/xfce4-genmon-plugin/debian/patches/series
===================================================================
--- goodies/branches/experimental/xfce4-genmon-plugin/debian/patches/series	2011-03-23 15:29:11 UTC (rev 5147)
+++ goodies/branches/experimental/xfce4-genmon-plugin/debian/patches/series	2011-03-23 15:31:34 UTC (rev 5148)
@@ -1 +0,0 @@
-03_link-with-libxfcegui4.patch

Modified: goodies/branches/experimental/xfce4-genmon-plugin/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-genmon-plugin/debian/rules	2011-03-23 15:29:11 UTC (rev 5147)
+++ goodies/branches/experimental/xfce4-genmon-plugin/debian/rules	2011-03-23 15:31:34 UTC (rev 5148)
@@ -2,15 +2,6 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
-post-patches::
-	NOCONFIGURE=1 xdt-autogen
-
-clean::
-	rm -f $$(find -name 'Makefile.in*')
-	rm -f INSTALL aclocal.m4 config.h.in configure depcomp install-sh
-	rm -f intltool-extract.in intltool-merge.in intltool-update.in
-	rm -f missing mkinstalldirs
-
 binary-post-install/xfce4-genmon-plugin::
 	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.a
 	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.la