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

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-02-13 14:31:12 +0200 (Tue, 13 Feb 2007)
New Revision: 9819

Modified:
   projects/haf/branches/hildon-control-panel/refactoring/ChangeLog
   projects/haf/branches/hildon-control-panel/refactoring/configure.ac
   projects/haf/branches/hildon-control-panel/refactoring/debian/control
Log:
2007-02-13  Lucas Rocha  <lucas.rocha at nokia.com>

	* debian/control, configure.ac: remove hildon-libs dependency and add hildon-1 dependency
	checks.


Modified: projects/haf/branches/hildon-control-panel/refactoring/ChangeLog
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/ChangeLog	2007-02-13 12:22:46 UTC (rev 9818)
+++ projects/haf/branches/hildon-control-panel/refactoring/ChangeLog	2007-02-13 12:31:12 UTC (rev 9819)
@@ -1,5 +1,10 @@
 2007-02-13  Lucas Rocha  <lucas.rocha at nokia.com>
 
+	* debian/control, configure.ac: remove hildon-libs dependency and add hildon-1 dependency
+	checks.
+
+2007-02-13  Lucas Rocha  <lucas.rocha at nokia.com>
+
 	* configure.ac: remove gtkhtml dependency and add gconf dependency
 	checks.
 

Modified: projects/haf/branches/hildon-control-panel/refactoring/configure.ac
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/configure.ac	2007-02-13 12:22:46 UTC (rev 9818)
+++ projects/haf/branches/hildon-control-panel/refactoring/configure.ac	2007-02-13 12:31:12 UTC (rev 9819)
@@ -1,5 +1,5 @@
 AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(hildon-control-panel, 2.2.10)
+AM_INIT_AUTOMAKE(hildon-control-panel, 3.0.0)
 AM_CONFIG_HEADER(config.h)
 
 AC_ARG_ENABLE(debug, [AC_HELP_STRING([--enable-debug],[Debug (default=no)])],
@@ -47,7 +47,7 @@
 AC_SUBST(OSSO_LIBS)
 AC_SUBST(OSSO_CFLAGS)
 
-PKG_CHECK_MODULES(HILDON, hildon-libs >= 0.7.1)
+PKG_CHECK_MODULES(HILDON, hildon-1 >= 1.0.0)
 AC_SUBST(HILDON_LIBS)
 AC_SUBST(HILDON_CFLAGS)
 

Modified: projects/haf/branches/hildon-control-panel/refactoring/debian/control
===================================================================
--- projects/haf/branches/hildon-control-panel/refactoring/debian/control	2007-02-13 12:22:46 UTC (rev 9818)
+++ projects/haf/branches/hildon-control-panel/refactoring/debian/control	2007-02-13 12:31:12 UTC (rev 9819)
@@ -1,8 +1,8 @@
 Source: hildon-control-panel
 Section: x11
 Priority: optional
-Maintainer: Johan Bilien <johan.bilien at nokia.com>
-Build-Depends: debhelper (>= 4.0.0), hildon-libs-dev (>= 0.12.2), hildon-base-lib-dev, pkg-config, libosso-dev (>= 1.5), osso-af-settings, libosso-help-dev, hildon-fm-dev
+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
 Standards-Version: 3.6.0
 
 Package: hildon-control-panel
@@ -19,7 +19,7 @@
 Package: hildon-control-panel-dev
 Section: libs
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, hildon-control-panel, hildon-base-lib-dev, hildon-libs-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, hildon-control-panel, hildon-base-lib-dev, libhildon1-dev
 Description: Hildon Control Panel development files.
  Development files to build Hildon Control Panel applets