./hildon-desktop/ubuntu r357: Add 25_disable_hildonfm_usage.patch, disables use of hildonfm via autoconf hackery.

[Steve Kowalik]

------------------------------------------------------------
revno: 357
committer: Steve Kowalik <stevenk at ubuntu.com>
branch nick: ubuntu
timestamp: Wed 2008-09-24 12:09:49 +1000
message:
  Add 25_disable_hildonfm_usage.patch, disables use of hildonfm via autoconf hackery.
added:
  debian/patches/25_disable_hildonfm_usage.patch
modified:
  debian/changelog
  debian/rules
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-09-23 03:29:43 +0000
+++ b/debian/changelog	2008-09-24 02:09:49 +0000
@@ -1,3 +1,10 @@
+hildon-desktop (1:2.0.11-1~svn15367-0ubuntu4) intrepid; urgency=low
+
+  * 25_disable_hildonfm_usage.patch: Add, disables use of hildonfm via
+    autoconf hackery.
+
+ -- Steve Kowalik <stevenk at ubuntu.com>  Wed, 24 Sep 2008 11:33:20 +1000
+
 hildon-desktop (1:2.0.11-1~svn15367-0ubuntu3) intrepid; urgency=low
 
   * Switch from mobile-basic-flash to kourou.

=== added file 'debian/patches/25_disable_hildonfm_usage.patch'
--- a/debian/patches/25_disable_hildonfm_usage.patch	1970-01-01 00:00:00 +0000
+++ b/debian/patches/25_disable_hildonfm_usage.patch	2008-09-24 02:09:49 +0000
@@ -0,0 +1,29 @@
+diff -Nur -x '*.orig' -x '*~' ubuntu/configure.ac ubuntu.new/configure.ac
+--- ubuntu/configure.ac	2008-09-24 11:40:53.000000000 +1000
++++ ubuntu.new/configure.ac	2008-09-24 11:41:24.000000000 +1000
+@@ -52,6 +52,8 @@
+               [AS_HELP_STRING([--filter-windows-type],[Filter non-desktop or non-normal windows type  (default=no)])],
+               [filter_windows_type=yes], [filter_windows_type=no])
+ 
++AC_ARG_ENABLE(hildonfm, [AS_HELP_STRING([--enable-hildonfm],[Enable usage of hildon-fm (default=yes)])], [use_hildonfm=no], [use_hildonfm=yes])
++
+ if test "x${hildon_use_timestamping}" = "xyes"
+ then
+     CFLAGS="$CFLAGS -DHILDON_USE_TIMESTAMPING"
+@@ -131,6 +133,8 @@
+ #+++++++++++++++++++++
+ 
+ 
++if test "x${use_hildonfm}" = "xyes"
++then
+ PKG_CHECK_MODULES(HILDON_FM,
+                   [hildon-fm-2],
+                   [AC_DEFINE(HAVE_HILDON_FM2, [], [Whether hildon-fm is present on the system])],
+@@ -142,6 +146,7 @@
+ 
+ AC_SUBST(HILDON_FM_LIBS)
+ AC_SUBST(HILDON_FM_CFLAGS)
++fi
+ 
+ PKG_CHECK_MODULES(OSSO, 
+ 		  [libosso >= 0.9.19],

=== modified file 'debian/rules'
--- a/debian/rules	2008-04-10 11:53:40 +0000
+++ b/debian/rules	2008-09-24 02:09:49 +0000
@@ -45,6 +45,7 @@
 				--mandir=\$${prefix}/share/man \
 				--infodir=\$${prefix}/share/info \
 				--disable-dependency-tracking \
+				--disable-hildonfm \
 				--enable-gtk-doc
 
 config.status: configure