[Pkg-cli-apps-commits] r3809 - in /packages/beagle/trunk/debian: changelog patches/00list patches/glib-sharp-2.0-support.dpatch

[jsogo at users.alioth.debian.org]

Author: jsogo
Date: Tue Mar 18 21:59:17 2008
New Revision: 3809

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3809
Log:
Fix FTFBS adding a check for glib-sharp (#470328)

Added:
    packages/beagle/trunk/debian/patches/glib-sharp-2.0-support.dpatch   (with props)
Modified:
    packages/beagle/trunk/debian/changelog
    packages/beagle/trunk/debian/patches/00list

Modified: packages/beagle/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/changelog?rev=3809&op=diff
==============================================================================
--- packages/beagle/trunk/debian/changelog (original)
+++ packages/beagle/trunk/debian/changelog Tue Mar 18 21:59:17 2008
@@ -1,3 +1,9 @@
+beagle (0.3.3-3) unstable; urgency=low
+
+  * Fix FTFBS in evolution plugin (Closes: #470328)
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org>  Tue, 18 Mar 2008 22:39:46 +0100
+
 beagle (0.3.3-2) unstable; urgency=low
 
   [ Jose Carlos Garcia Sogo ]

Modified: packages/beagle/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/patches/00list?rev=3809&op=diff
==============================================================================
--- packages/beagle/trunk/debian/patches/00list (original)
+++ packages/beagle/trunk/debian/patches/00list Tue Mar 18 21:59:17 2008
@@ -5,3 +5,4 @@
 fix_UiUtil.dll.config
 fix_Util.dll.config
 fix_beagle-build-index-manpage.dpatch
+glib-sharp-2.0-support.dpatch

Added: packages/beagle/trunk/debian/patches/glib-sharp-2.0-support.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/patches/glib-sharp-2.0-support.dpatch?rev=3809&op=file
==============================================================================
--- packages/beagle/trunk/debian/patches/glib-sharp-2.0-support.dpatch (added)
+++ packages/beagle/trunk/debian/patches/glib-sharp-2.0-support.dpatch Tue Mar 18 21:59:17 2008
@@ -1,0 +1,62 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## glib-sharp-2.0-support.dpatch by Luca Falavigna <dktrkranz at ubuntu.com>
+## DP: Add /glib-sharp-2.0 support, fix FTBFS.
+
+ at DPATCH@
+diff -urNad beagle-0.3.3~/configure beagle-0.3.3/configure
+--- beagle-0.3.3~/configure	2008-01-02 08:59:06.000000000 +0100
++++ beagle-0.3.3/configure	2008-03-18 10:50:24.000000000 +0100
+@@ -25746,12 +25746,14 @@
+                   gmime-sharp >= \$GMIME_SHARP_REQUIRED\"") >&5
+   ($PKG_CONFIG --exists --print-errors "evolution-sharp >= $EVOLUTION_SHARP_REQUIRED 	\
+                   gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED	\
++                  glib-sharp-2.0 >= $GTK_SHARP_REQUIRED		\
+                   gmime-sharp >= $GMIME_SHARP_REQUIRED") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   pkg_cv_EVO_CFLAGS=`$PKG_CONFIG --cflags "evolution-sharp >= $EVOLUTION_SHARP_REQUIRED 	\
+                   gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED	\
++                  glib-sharp-2.0 >= $GTK_SHARP_REQUIRED		\
+                   gmime-sharp >= $GMIME_SHARP_REQUIRED" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -25770,12 +25772,14 @@
+                   gmime-sharp >= \$GMIME_SHARP_REQUIRED\"") >&5
+   ($PKG_CONFIG --exists --print-errors "evolution-sharp >= $EVOLUTION_SHARP_REQUIRED 	\
+                   gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED	\
++                  glib-sharp-2.0 >= $GTK_SHARP_REQUIRED		\
+                   gmime-sharp >= $GMIME_SHARP_REQUIRED") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   pkg_cv_EVO_LIBS=`$PKG_CONFIG --libs "evolution-sharp >= $EVOLUTION_SHARP_REQUIRED 	\
+                   gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED	\
++                  glib-sharp-2.0 >= $GTK_SHARP_REQUIRED		\
+                   gmime-sharp >= $GMIME_SHARP_REQUIRED" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -25797,10 +25801,12 @@
+         if test $_pkg_short_errors_supported = yes; then
+ 	        EVO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "evolution-sharp >= $EVOLUTION_SHARP_REQUIRED 	\
+                   gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED	\
++                  glib-sharp-2.0 >= $GTK_SHARP_REQUIRED		\
+                   gmime-sharp >= $GMIME_SHARP_REQUIRED"`
+         else
+ 	        EVO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-sharp >= $EVOLUTION_SHARP_REQUIRED 	\
+                   gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED	\
++                  glib-sharp-2.0 >= $GTK_SHARP_REQUIRED		\
+                   gmime-sharp >= $GMIME_SHARP_REQUIRED"`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+diff -urNad beagle-0.3.3~/configure.in beagle-0.3.3/configure.in
+--- beagle-0.3.3~/configure.in	2008-01-02 08:14:48.000000000 +0100
++++ beagle-0.3.3/configure.in	2008-03-18 10:43:43.000000000 +0100
+@@ -251,6 +251,7 @@
+ PKG_CHECK_MODULES(EVO,
+                   evolution-sharp >= $EVOLUTION_SHARP_REQUIRED 	\
+                   gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED	\
++                  glib-sharp-2.0 >= $GTK_SHARP_REQUIRED		\
+                   gmime-sharp >= $GMIME_SHARP_REQUIRED,
+                   have_evo_dependencies=yes, have_evo_dependencies=no)
+ AC_SUBST(EVO_LIBS)

Propchange: packages/beagle/trunk/debian/patches/glib-sharp-2.0-support.dpatch
------------------------------------------------------------------------------
    svn:executable = *