[maemo-commits] [maemo-commits] r12019 - in projects/haf/trunk/libosso-help: . debian src

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2007-05-31 21:31:17 +0300 (Thu, 31 May 2007)
New Revision: 12019

Modified:
   projects/haf/trunk/libosso-help/ChangeLog
   projects/haf/trunk/libosso-help/debian/changelog
   projects/haf/trunk/libosso-help/debian/control
   projects/haf/trunk/libosso-help/src/osso-helplib.c
   projects/haf/trunk/libosso-help/src/osso-helplib.h
Log:
Removed debian/control dependency on libart


Modified: projects/haf/trunk/libosso-help/ChangeLog
===================================================================
--- projects/haf/trunk/libosso-help/ChangeLog	2007-05-31 18:08:17 UTC (rev 12018)
+++ projects/haf/trunk/libosso-help/ChangeLog	2007-05-31 18:31:17 UTC (rev 12019)
@@ -1,3 +1,7 @@
+2007-05-31 Gabriel Schulhof <gabriel.schulhof at nokia.com>
+
+	* Removed debian/control dependency on libart
+
 2007-03-14 Gabriel Schulhof <gabriel.schulhof at nokia.com>
 
 	* Trying the link warning stuff

Modified: projects/haf/trunk/libosso-help/debian/changelog
===================================================================
--- projects/haf/trunk/libosso-help/debian/changelog	2007-05-31 18:08:17 UTC (rev 12018)
+++ projects/haf/trunk/libosso-help/debian/changelog	2007-05-31 18:31:17 UTC (rev 12019)
@@ -1,3 +1,9 @@
+libosso-help (2.1.2-3) unstable; urgency=low
+
+  * Removed debian/control dependency on libart
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Thu, 31 May 2007 21:26:48 +0300
+
 libosso-help (2.1.2-2) unstable; urgency=low
 
   * Trying the link warning stuff

Modified: projects/haf/trunk/libosso-help/debian/control
===================================================================
--- projects/haf/trunk/libosso-help/debian/control	2007-05-31 18:08:17 UTC (rev 12018)
+++ projects/haf/trunk/libosso-help/debian/control	2007-05-31 18:31:17 UTC (rev 12019)
@@ -2,13 +2,13 @@
 Section: misc
 Priority: optional
 Maintainer: Jakub Pavelek <jakub.pavelek at nokia.com>
-Build-Depends: debhelper (>= 4.0.0), libgtk2.0-dev (>= 2.6.0-1), pkg-config, libosso-dev, libhildon1-dev (>= 0.9.9-3), libhildonhelp-dev (>= 1.9.0), intltool (>= 0.21), autoconf, automake1.7, libtool, gtkhtml-dev (>= 3.9.1), libart-2.0-dev, libpng12-dev, libjpeg62-dev, libxml2-dev
+Build-Depends: debhelper (>= 4.0.0), libgtk2.0-dev (>= 2.6.0-1), pkg-config, libosso-dev, libhildon1-dev (>= 0.9.9-3), libhildonhelp-dev (>= 1.9.0), intltool (>= 0.21), autoconf, automake1.7, libtool, gtkhtml-dev (>= 3.9.1), libpng12-dev, libjpeg62-dev, libxml2-dev
 Standards-Version: 3.6.1
 
 Package: libosso-help-dev
 Section: libdevel
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, libosso-help0 (= ${Source-Version}), libhildon1-dev, libart-2.0-dev, gtkhtml-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, libosso-help0 (= ${Source-Version}), libhildon1-dev, gtkhtml-dev
 Description: OSSO HelpLib for application developers
  Development files for HelpLib; access and controlling
  OSSO Help from other applications.

Modified: projects/haf/trunk/libosso-help/src/osso-helplib.c
===================================================================
--- projects/haf/trunk/libosso-help/src/osso-helplib.c	2007-05-31 18:08:17 UTC (rev 12018)
+++ projects/haf/trunk/libosso-help/src/osso-helplib.c	2007-05-31 18:31:17 UTC (rev 12019)
@@ -33,7 +33,7 @@
 /*---=== Public API ===---*/
 
 /*---( doc in header )---*/
-extern
+extern G_GNUC_DEPRECATED
 osso_return_t ossohelp_show( osso_context_t* osso,
                              const char* help_id,
                              guint flags )
@@ -72,6 +72,7 @@
 */
 
 /*---( docs in header )---*/
+G_GNUC_DEPRECATED
 gboolean ossohelp_dialog_help_enable( GtkDialog *dialog, 
                                       const gchar *topic,
                                       osso_context_t *osso )

Modified: projects/haf/trunk/libosso-help/src/osso-helplib.h
===================================================================
--- projects/haf/trunk/libosso-help/src/osso-helplib.h	2007-05-31 18:08:17 UTC (rev 12018)
+++ projects/haf/trunk/libosso-help/src/osso-helplib.h	2007-05-31 18:31:17 UTC (rev 12019)
@@ -35,6 +35,7 @@
 
 /*--- Public interface (for any applications) ---*/
 
+G_GNUC_DEPRECATED
 enum {
     OSSO_HELP_SHOW_DIALOG= 0x01,
     OSSO_HELP_SHOW_JUSTASK= 0x02,
@@ -67,6 +68,7 @@
             <br>#OSSO_INVALID   Param not formally right (NULL, or bad ID
                                 format)
 */
+G_GNUC_DEPRECATED
 osso_return_t ossohelp_show( osso_context_t *osso,
                              const gchar *topic_id,
                              guint flags );
@@ -93,6 +95,7 @@
   @return TRUE if the help topic existed, and '?' enabled
           <br>FALSE if the topic ID is not found in this system.
 */
+G_GNUC_DEPRECATED
 gboolean ossohelp_dialog_help_enable( GtkDialog *dialog, 
                                       const gchar *topic,
                                       osso_context_t *osso );