[maemo-commits] [maemo-commits] r11107 - in projects/haf/trunk/hildon-desktop: . debian

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-04-17 13:38:37 +0300 (Tue, 17 Apr 2007)
New Revision: 11107

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/debian/control
Log:
2007-04-17  Lucas Rocha  <lucas.rocha at nokia.com>

	* debian/control: build dependency on hildon-1 or hildon-libs to be 
	more Bora build friendly.


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-04-17 06:53:47 UTC (rev 11106)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-04-17 10:38:37 UTC (rev 11107)
@@ -1,3 +1,8 @@
+2007-04-17  Lucas Rocha  <lucas.rocha at nokia.com>
+
+	* debian/control: build dependency on hildon-1 or hildon-libs to be 
+	more Bora build friendly.
+
 2007-04-17  Johan Bilien  <johan.bilien at nokia.com>
 
 	* configure.ac: 0.0.7

Modified: projects/haf/trunk/hildon-desktop/debian/control
===================================================================
--- projects/haf/trunk/hildon-desktop/debian/control	2007-04-17 06:53:47 UTC (rev 11106)
+++ projects/haf/trunk/hildon-desktop/debian/control	2007-04-17 10:38:37 UTC (rev 11107)
@@ -9,7 +9,6 @@
 Section: x11
 Architecture: any
 Depends:  ${shlibs:Depends}, ${misc:Depends}, ${launcher:Depends}, maemo-af-desktop-l10n-mr | maemo-af-desktop-l10n-mr0
-Conflicts: maemo-af-desktop (<< 3.0.0), maemo-af-desktop-config
 Description: Desktop environment for embedded devices
   Hildon Desktop is a desktop environment for embedded devices. It
   is based on the GNOME platform
@@ -41,7 +40,7 @@
 Package: libhildondesktop-dev
 Section: devel
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, libhildondesktop0 (=${Source-Version}), libhildon1-dev, libxml2-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, libhildondesktop0 (=${Source-Version}), libhildon1-dev | hildon-libs-dev, libxml2-dev
 Description: libhildondesktop development files
   Development headers and static libraries for the libhildondesktop
 
@@ -62,7 +61,7 @@
 Package: libhildonwm-dev
 Section: devel
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, libhildondesktop0 (=${Source-Version}), libxtst-dev, libx11-dev, libhildon1-dev, libgconf2-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, libhildondesktop0 (=${Source-Version}), libxtst-dev, libx11-dev, libhildon1-dev | hildon-libs-dev, libgconf2-dev
 Description: libhildonwm development files
   Development headers and static libraries for the libhildonwm