[maemo-commits] [maemo-commits] r10041 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: . background-manager debian libhildondesktop src

Tue Feb 20 14:55:46 EET 2007

Author: jobi
Date: 2007-02-20 14:55:45 +0200 (Tue, 20 Feb 2007)
New Revision: 10041

Modified:
   projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog
   projects/haf/branches/maemo-af-desktop/hildon-desktop/background-manager/Makefile.am
   projects/haf/branches/maemo-af-desktop/hildon-desktop/configure.ac
   projects/haf/branches/maemo-af-desktop/hildon-desktop/debian/changelog
   projects/haf/branches/maemo-af-desktop/hildon-desktop/debian/control
   projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-applet.h
   projects/haf/branches/maemo-af-desktop/hildon-desktop/src/Makefile.am
Log:

2007-02-15  Johan Bilien  <johan.bilien at nokia.com>

	* configure.ac: Added check for libhildonfm2



Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog
===================================================================

--- projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog	2007-02-20 12:39:23 UTC (rev 10040)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog	2007-02-20 12:55:45 UTC (rev 10041)
@@ -1,3 +1,7 @@
+2007-02-15  Johan Bilien  <johan.bilien at nokia.com>
+
+	* configure.ac: Added check for libhildonfm2
+
 2007-02-19  Moises Martinez  <moises.martinez at nokia.com>
 
 	* libhildondesktop/hildon-desktop-panel-expandable.c:

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/background-manager/Makefile.am
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/background-manager/Makefile.am	2007-02-20 12:39:23 UTC (rev 10040)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/background-manager/Makefile.am	2007-02-20 12:55:45 UTC (rev 10041)
@@ -1,23 +1,23 @@
 bin_PROGRAMS = hildon-background-manager
 
-BUILT_SOURCES = background-manager-glue.h hildon-background-manager.h
+#BUILT_SOURCES = background-manager-glue.h hildon-background-manager.h
 CLEANFILES = $(BUILT_SOURCES) \
 			 background-manager-glue-tmp.h \
 			 hildon-background-manager-tmp.h
 
 EXTRA_DIST = background-manager.xml
 
-background-manager-glue.h: background-manager.xml background-manager-dbus.h
-	$(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=background_manager \
-		       --mode=glib-server --output=background-manager-glue-tmp.h \
-			   background-manager.xml
-	cat background-manager-dbus.h background-manager-glue-tmp.h > background-manager-glue.h
+#background-manager-glue.h: background-manager.xml background-manager-dbus.h
+#	$(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=background_manager \
+#		       --mode=glib-server --output=background-manager-glue-tmp.h \
+#			   background-manager.xml
+#	cat background-manager-dbus.h background-manager-glue-tmp.h > background-manager-glue.h
 
-hildon-background-manager.h: background-manager.xml background-manager-dbus.h
-	$(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=background_manager \
-        --mode=glib-client --output=hildon-background-manager-tmp.h \
-			   background-manager.xml
-	cat background-manager.h background-manager-dbus.h hildon-background-manager-tmp.h > hildon-background-manager.h
+#hildon-background-manager.h: background-manager.xml background-manager-dbus.h
+#	$(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=background_manager \
+#       --mode=glib-client --output=hildon-background-manager-tmp.h \
+#			   background-manager.xml
+#	cat background-manager.h background-manager-dbus.h hildon-background-manager-tmp.h > hildon-background-manager.h
 
 pkgincludedir = $(includedir)/libhildondesktop/libhildondesktop
 pkginclude_HEADERS = hildon-background-manager.h

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/configure.ac
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/configure.ac	2007-02-20 12:39:23 UTC (rev 10040)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/configure.ac	2007-02-20 12:55:45 UTC (rev 10041)
@@ -75,10 +75,17 @@
 # Dependencies checks
 #+++++++++++++++++++++
 
+
 PKG_CHECK_MODULES(HILDON_FM,
-		  [hildon-fm >= 0.15],
-                  AC_DEFINE(HAVE_HILDON_FM, [], [Whether hildon-fm is present on the system]), 
-		  [AC_MSG_NOTICE([hildon-fm not present.])])
+                  [hildon-fm-2],
+                  [AC_DEFINE(HAVE_HILDON_FM, [], [Whether hildon-fm is present on the system])],
+                  
+                  [PKG_CHECK_MODULES(HILDON_FM,
+		                    [hildon-fm >= 0.15],
+                                    [AC_DEFINE(HAVE_HILDON_FM, [], [Whether hildon-fm is present on the system])], 
+		                    [AC_MSG_NOTICE([hildon-fm not present.])])])
+
+
 AC_SUBST(HILDON_FM_LIBS)
 AC_SUBST(HILDON_FM_CFLAGS)
 

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/debian/changelog
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/debian/changelog	2007-02-20 12:39:23 UTC (rev 10040)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/debian/changelog	2007-02-20 12:55:45 UTC (rev 10041)
@@ -1,3 +1,10 @@
+hildon-desktop (0.0.0-13) unstable; urgency=low
+
+  * Replaced build-dep on hildon-fm-dev with build-dep on
+    libhildonfm2-dev 
+
+ -- Johan Bilien <johan.bilien at nokia.com>  Tue, 20 Feb 2007 14:55:05 +0200
+
 hildon-desktop (0.0.0-12) unstable; urgency=low
 
   * Added startup script to the package

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/debian/control
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/debian/control	2007-02-20 12:39:23 UTC (rev 10040)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/debian/control	2007-02-20 12:55:45 UTC (rev 10041)
@@ -2,7 +2,7 @@
 Section: x11
 Priority: optional
 Maintainer: Johan Bilien <johan.bilien at nokia.com>
-Build-Depends: debhelper (>= 4.0.0), libhildon1-dev, pkg-config, libosso-dev (>= 0.9.19), libosso-gnomevfs2-dev, osso-af-settings, hildon-fm-dev (>= 0.15), libosso-help-dev, libxtst-dev, libxml2-dev, osso-esd-dev, hildon-base-lib-dev
+Build-Depends: debhelper (>= 4.0.0), libhildon1-dev, pkg-config, libosso-dev (>= 0.9.19), libosso-gnomevfs2-dev, osso-af-settings, libhildonfm2-dev, libosso-help-dev, libxtst-dev, libxml2-dev, osso-esd-dev, hildon-base-lib-dev
 Standards-Version: 3.6.0
  
 Package: hildon-desktop

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-applet.h
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-applet.h	2007-02-20 12:39:23 UTC (rev 10040)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-applet.h	2007-02-20 12:55:45 UTC (rev 10041)
@@ -96,6 +96,7 @@
 
   GdkPixbuf                     *close_button;
   GdkPixbuf                     *resize_handle;
+  GdkPixbuf                     *drag_handle;
 
 };
 

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/Makefile.am
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/Makefile.am	2007-02-20 12:39:23 UTC (rev 10040)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/Makefile.am	2007-02-20 12:55:45 UTC (rev 10041)
@@ -79,10 +79,10 @@
 	hn-others-button.c \
 	hn-others-button.h
 
-BUILT_SOURCES = hd-notification-service.h 
+#BUILT_SOURCES = hd-notification-service.h 
 
-hd-notification-service.h: notification-manager.xml
-	dbus-binding-tool --prefix=hd_notification_service --mode=glib-server --output=hd-notification-service.h $<
+#hd-notification-service.h: notification-manager.xml
+#	dbus-binding-tool --prefix=hd_notification_service --mode=glib-server --output=hd-notification-service.h $<
 
 hildon_desktop_SOURCES = \
 	$(BUILT_SOURCES)            \


