[maemo-commits] [maemo-commits] r18630 - in projects/haf/trunk/gnome-vfs-filechooser-backend: . debian src

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2009-06-05 17:15:10 +0300 (Fri, 05 Jun 2009)
New Revision: 18630

Modified:
   projects/haf/trunk/gnome-vfs-filechooser-backend/ChangeLog
   projects/haf/trunk/gnome-vfs-filechooser-backend/configure.ac
   projects/haf/trunk/gnome-vfs-filechooser-backend/debian/changelog
   projects/haf/trunk/gnome-vfs-filechooser-backend/debian/control
   projects/haf/trunk/gnome-vfs-filechooser-backend/src/gtkfilesystemgnomevfs.h
Log:
2009-06-05  Michael Natterer  <mitch at lendso.com>

	* configure.ac: require hildon-fm-2, bump GTK+ requirement to
	2.14.3.

	* src/gtkfilesystemgnomevfs.h: include gtkfilesystem.h from its
	new place in hildon-fm.

	* debian/control
	* debian/changelog: debian stuff.



Modified: projects/haf/trunk/gnome-vfs-filechooser-backend/ChangeLog
===================================================================
--- projects/haf/trunk/gnome-vfs-filechooser-backend/ChangeLog	2009-06-05 13:15:51 UTC (rev 18629)
+++ projects/haf/trunk/gnome-vfs-filechooser-backend/ChangeLog	2009-06-05 14:15:10 UTC (rev 18630)
@@ -1,3 +1,14 @@
+2009-06-05  Michael Natterer  <mitch at lendso.com>
+
+	* configure.ac: require hildon-fm-2, bump GTK+ requirement to
+	2.14.3.
+
+	* src/gtkfilesystemgnomevfs.h: include gtkfilesystem.h from its
+	new place in hildon-fm.
+
+	* debian/control
+	* debian/changelog: debian stuff.
+
 2009-03-10  Richard Hult  <richard at imendio.com>
 
 	* Release 1.10.0

Modified: projects/haf/trunk/gnome-vfs-filechooser-backend/configure.ac
===================================================================
--- projects/haf/trunk/gnome-vfs-filechooser-backend/configure.ac	2009-06-05 13:15:51 UTC (rev 18629)
+++ projects/haf/trunk/gnome-vfs-filechooser-backend/configure.ac	2009-06-05 14:15:10 UTC (rev 18630)
@@ -23,11 +23,12 @@
 IDT_CHECK_TIMEZONE
 
 GNOME_VFS_REQUIRED=2.16.3
-GTK_REQUIRED=2.10.0
+GTK_REQUIRED=2.14.3
 
 PKG_CHECK_MODULES(BACKEND, [
         gtk+-2.0 >= $GTK_REQUIRED
         gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED
+	hildon-fm-2
 ])
 
 GTK_BINARY_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`

Modified: projects/haf/trunk/gnome-vfs-filechooser-backend/debian/changelog
===================================================================
--- projects/haf/trunk/gnome-vfs-filechooser-backend/debian/changelog	2009-06-05 13:15:51 UTC (rev 18629)
+++ projects/haf/trunk/gnome-vfs-filechooser-backend/debian/changelog	2009-06-05 14:15:10 UTC (rev 18630)
@@ -1,3 +1,10 @@
+gnome-vfs-filechooser-backend (1.10.0-2) unstable; urgency=low
+
+  * Depend on hildon-fm and GTK+ 2.14.3 and fix up the gtkfilesystem.h
+    includes.
+
+ -- Michael Natterer <mitch at lanedo.com>  Fri, 05 Jun 2009 16:12:00 +0200
+
 gnome-vfs-filechooser-backend (1.10.0-1) unstable; urgency=low
 
   * Fixes: NB#104961, update gnomevfs icon names

Modified: projects/haf/trunk/gnome-vfs-filechooser-backend/debian/control
===================================================================
--- projects/haf/trunk/gnome-vfs-filechooser-backend/debian/control	2009-06-05 13:15:51 UTC (rev 18629)
+++ projects/haf/trunk/gnome-vfs-filechooser-backend/debian/control	2009-06-05 14:15:10 UTC (rev 18630)
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Richard Hult <richard at imendio.com>
-Build-Depends: debhelper (>= 4.0.0), cdbs, libglib2.0-dev (>= 2.8), libosso-gnomevfs2-dev (>= 2.16.3), libgtk2.0-dev (>= 2.10.0)
+Build-Depends: debhelper (>= 4.0.0), cdbs, libglib2.0-dev (>= 2.8), libosso-gnomevfs2-dev (>= 2.16.3), libgtk2.0-dev (>= 2.14.3)
 Standards-Version: 3.6.1.0
 
 Package: gnome-vfs-filechooser-backend

Modified: projects/haf/trunk/gnome-vfs-filechooser-backend/src/gtkfilesystemgnomevfs.h
===================================================================
--- projects/haf/trunk/gnome-vfs-filechooser-backend/src/gtkfilesystemgnomevfs.h	2009-06-05 13:15:51 UTC (rev 18629)
+++ projects/haf/trunk/gnome-vfs-filechooser-backend/src/gtkfilesystemgnomevfs.h	2009-06-05 14:15:10 UTC (rev 18630)
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 #define GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED
-#include <gtk/gtkfilesystem.h>
+#include <hildon-fm-2/hildon/gtkfilesystem/gtkfilesystem.h>
 #undef GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED
 
 G_BEGIN_DECLS