[maemo-commits] [maemo-commits] r10038 - in projects/haf/branches/hildon-control-panel/refactoring: . debian src

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-02-20 14:38:24 +0200 (Tue, 20 Feb 2007)
New Revision: 10038

Modified:
   projects/haf/branches/hildon-control-panel/refactoring/configure.ac
   projects/haf/branches/hildon-control-panel/refactoring/debian/changelog
   projects/haf/branches/hildon-control-panel/refactoring/debian/control
   projects/haf/branches/hildon-control-panel/refactoring/src/Makefile.am
Log:

hildon-control-panel (2.9.10-2) unstable; urgency=low

  * Removed build-dep on hildon-fm-dev, not used 

 -- Johan Bilien <johan.bilien at nokia.com>  Tue, 20 Feb 2007 14:37:28 +0200



Modified: projects/haf/branches/hildon-control-panel/refactoring/configure.ac
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/configure.ac	2007-02-20 11:21:00 UTC (rev 10037)
+++ projects/haf/branches/hildon-control-panel/refactoring/configure.ac	2007-02-20 12:38:24 UTC (rev 10038)
@@ -39,10 +39,6 @@
 localedir=`pkg-config osso-af-settings --variable=localedir`
 AC_SUBST(localedir)
 
-PKG_CHECK_MODULES(HILDONFM, hildon-fm)
-AC_SUBST(HILDONFM_LIBS)
-AC_SUBST(HILDONFM_CFLAGS)
-
 PKG_CHECK_MODULES(OSSO,libosso >= 0.10.0)
 AC_SUBST(OSSO_LIBS)
 AC_SUBST(OSSO_CFLAGS)

Modified: projects/haf/branches/hildon-control-panel/refactoring/debian/changelog
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/debian/changelog	2007-02-20 11:21:00 UTC (rev 10037)
+++ projects/haf/branches/hildon-control-panel/refactoring/debian/changelog	2007-02-20 12:38:24 UTC (rev 10038)
@@ -1,3 +1,9 @@
+hildon-control-panel (2.9.10-2) unstable; urgency=low
+
+  * Removed build-dep on hildon-fm-dev, not used 
+
+ -- Johan Bilien <johan.bilien at nokia.com>  Tue, 20 Feb 2007 14:37:28 +0200
+
 hildon-control-panel (2.9.10-1) unstable; urgency=low
 
   * src/*.c: replaced include <hildon-widgets/*> with <hildon/*>

Modified: projects/haf/branches/hildon-control-panel/refactoring/debian/control
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/debian/control	2007-02-20 11:21:00 UTC (rev 10037)
+++ projects/haf/branches/hildon-control-panel/refactoring/debian/control	2007-02-20 12:38:24 UTC (rev 10038)
@@ -2,7 +2,7 @@
 Section: x11
 Priority: optional
 Maintainer: Lucas Rocha <lucas.rocha at nokia.com>
-Build-Depends: debhelper (>= 4.0.0), libhildon1-dev (>= 0.9.9), hildon-base-lib-dev, pkg-config, libosso-dev (>= 1.5), osso-af-settings, libosso-help-dev, hildon-fm-dev
+Build-Depends: debhelper (>= 4.0.0), libhildon1-dev (>= 0.9.9), hildon-base-lib-dev, pkg-config, libosso-dev (>= 1.5), osso-af-settings, libosso-help-dev
 Standards-Version: 3.6.0
 
 Package: hildon-control-panel

Modified: projects/haf/branches/hildon-control-panel/refactoring/src/Makefile.am
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/src/Makefile.am	2007-02-20 11:21:00 UTC (rev 10037)
+++ projects/haf/branches/hildon-control-panel/refactoring/src/Makefile.am	2007-02-20 12:38:24 UTC (rev 10038)
@@ -20,7 +20,7 @@
 #
 
 INCLUDES = \
-	$(HILDON_CFLAGS) $(HILDONBASELIB_CFLAGS) $(HILDONFM_CFLAGS)\
+	$(HILDON_CFLAGS) $(HILDONBASELIB_CFLAGS)\
 	$(MAEMO_LAUNCHER_CFLAGS) \
 	$(OSSO_CFLAGS)\
 	$(LIBOSSOHELP_CFLAGS) \
@@ -66,7 +66,7 @@
 
 controlpanel_LDADD = \
 	$(HILDON_LIBS) $(HILDONBASELIB_LIBS) $(OSSO_LIBS)\
-	$(LIBOSSOHELP_LIBS)  $(GCONF_LIBS) $(HILDONFM_LIBS)
+	$(LIBOSSOHELP_LIBS)  $(GCONF_LIBS)
 
 hildon_cp_pluginincludeinstdir=$(includedir)/hildon-cp-plugin
 hildon_cp_pluginincludeinst_DATA = hildon-cp-plugin-interface.h