[Pkg-xfce-commits] r4403 - in goodies/branches/experimental/xfce4-messenger-plugin/debian: . patches source

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-04 14:14:59 +0000 (Thu, 04 Nov 2010)
New Revision: 4403

Added:
   goodies/branches/experimental/xfce4-messenger-plugin/debian/patches/
   goodies/branches/experimental/xfce4-messenger-plugin/debian/patches/01_link-with-libxfcegui4.patch
   goodies/branches/experimental/xfce4-messenger-plugin/debian/patches/series
   goodies/branches/experimental/xfce4-messenger-plugin/debian/source/
   goodies/branches/experimental/xfce4-messenger-plugin/debian/source/format
Modified:
   goodies/branches/experimental/xfce4-messenger-plugin/debian/changelog
   goodies/branches/experimental/xfce4-messenger-plugin/debian/control
   goodies/branches/experimental/xfce4-messenger-plugin/debian/rules
Log:
* debian/patches:
  - 01_link-with-libxfcegui4 added, link against libxfcegui4 now that
    xfce4-panel-dev doesn't bring the flags.
* debian/rules:
  - run xdt-autogen after applying patches touching Makefile.am
* debian/control:
  - add build-dep on xfce4-dev-tools, intltool and libtool to run
    xdt-autogen after applying patches.
* Switch to 3.0 (quilt) source format.

Modified: goodies/branches/experimental/xfce4-messenger-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-messenger-plugin/debian/changelog	2010-11-04 14:08:17 UTC (rev 4402)
+++ goodies/branches/experimental/xfce4-messenger-plugin/debian/changelog	2010-11-04 14:14:59 UTC (rev 4403)
@@ -1,3 +1,17 @@
+xfce4-messenger-plugin (0.1.0-5) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 01_link-with-libxfcegui4 added, link against libxfcegui4 now that
+      xfce4-panel-dev doesn't bring the flags.
+  * debian/rules:
+    - run xdt-autogen after applying patches touching Makefile.am
+  * debian/control:
+    - add build-dep on xfce4-dev-tools, intltool and libtool to run
+      xdt-autogen after applying patches.
+  * Switch to 3.0 (quilt) source format.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 04 Nov 2010 15:09:14 +0100
+
 xfce4-messenger-plugin (0.1.0-4) unstable; urgency=low
 
   [ Evgeni Golov ]

Modified: goodies/branches/experimental/xfce4-messenger-plugin/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-messenger-plugin/debian/control	2010-11-04 14:08:17 UTC (rev 4402)
+++ goodies/branches/experimental/xfce4-messenger-plugin/debian/control	2010-11-04 14:14:59 UTC (rev 4403)
@@ -5,7 +5,8 @@
 Uploaders: Yves-Alexis Perez <corsac at debian.org>, 
  Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>
 Build-Depends: debhelper (>= 7), cdbs, xfce4-panel-dev (>= 4.3.90.2-3),
- libdbus-1-dev, libdbus-glib-1-dev, libxt-dev, autotools-dev
+ libdbus-1-dev, libdbus-glib-1-dev, libxt-dev, autotools-dev, libxfcegui4-dev,
+ xfce4-dev-tools, libtool, intltool
 Standards-Version: 3.8.2
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-messenger-plugin/

Added: goodies/branches/experimental/xfce4-messenger-plugin/debian/patches/01_link-with-libxfcegui4.patch
===================================================================
--- goodies/branches/experimental/xfce4-messenger-plugin/debian/patches/01_link-with-libxfcegui4.patch	                        (rev 0)
+++ goodies/branches/experimental/xfce4-messenger-plugin/debian/patches/01_link-with-libxfcegui4.patch	2010-11-04 14:14:59 UTC (rev 4403)
@@ -0,0 +1,22 @@
+diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
+index c17906a..d5974df 100644
+--- a/panel-plugin/Makefile.am
++++ b/panel-plugin/Makefile.am
+@@ -20,14 +20,16 @@ xfce4_messenger_plugin_SOURCES = \
+ xfce4_messenger_plugin_CFLAGS = \
+ 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+ 	@LIBXFCE4PANEL_CFLAGS@ \
++	@LIBXFCEGUI4_CFLAGS@ \
+ 	@GLIB_CFLAGS@ \
+ 	@GOBJECT_CFLAGS@ \
+ 	@GTK_CFLAGS@ \
+ 	@DBUS_CFLAGS@ \
+ 	@DBUS_GLIB_CFLAGS@
+ 
+-xfce4_messenger_plugin_LDFLAGS = \
++xfce4_messenger_plugin_LDADD = \
+ 	@LIBXFCE4PANEL_LIBS@ \
++	@LIBXFCEGUI4_LIBS@ \
+ 	@GLIB_LIBS@ \
+ 	@GOBJECT_LIBS@ \
+ 	@GTK_LIBS@ \

Added: goodies/branches/experimental/xfce4-messenger-plugin/debian/patches/series
===================================================================
--- goodies/branches/experimental/xfce4-messenger-plugin/debian/patches/series	                        (rev 0)
+++ goodies/branches/experimental/xfce4-messenger-plugin/debian/patches/series	2010-11-04 14:14:59 UTC (rev 4403)
@@ -0,0 +1 @@
+01_link-with-libxfcegui4.patch

Modified: goodies/branches/experimental/xfce4-messenger-plugin/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-messenger-plugin/debian/rules	2010-11-04 14:08:17 UTC (rev 4402)
+++ goodies/branches/experimental/xfce4-messenger-plugin/debian/rules	2010-11-04 14:14:59 UTC (rev 4403)
@@ -2,6 +2,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-messenger-plugin::
 	cp -r scripts/ debian/`dh_listpackages`/usr/share/doc/`dh_listpackages`/
 	-rm -rf debian/`dh_listpackages`/usr/share/doc/`dh_listpackages`/scripts/Makefile*

Added: goodies/branches/experimental/xfce4-messenger-plugin/debian/source/format
===================================================================
--- goodies/branches/experimental/xfce4-messenger-plugin/debian/source/format	                        (rev 0)
+++ goodies/branches/experimental/xfce4-messenger-plugin/debian/source/format	2010-11-04 14:14:59 UTC (rev 4403)
@@ -0,0 +1 @@
+3.0 (quilt)