[maemo-commits] [maemo-commits] r14569 - in projects/haf/trunk/hildon-desktop: . debian doc doc/libhildondesktop

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Tue Oct 23 13:58:22 EEST 2007 
Author: jobi
Date: 2007-10-23 13:58:19 +0300 (Tue, 23 Oct 2007)
New Revision: 14569

Added:
   projects/haf/trunk/hildon-desktop/doc/libhildondesktop/
   projects/haf/trunk/hildon-desktop/doc/libhildondesktop/Makefile.am
   projects/haf/trunk/hildon-desktop/doc/libhildondesktop/libhildondesktop-docs.sgml
   projects/haf/trunk/hildon-desktop/doc/libhildondesktop/libhildondesktop.types
Removed:
   projects/haf/trunk/hildon-desktop/doc/hildon-desktop-docs.sgml
   projects/haf/trunk/hildon-desktop/doc/hildon-desktop.types
Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/configure.ac
   projects/haf/trunk/hildon-desktop/debian/rules
   projects/haf/trunk/hildon-desktop/doc/Makefile.am
Log:

2007-10-18  Johan Bilien  <johan.bilien at nokia.com>

	* doc/libhildondesktop: moved libhildondesktop documentation
	to its own subdirectory, with its own gtk-doc module.



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-10-22 13:50:03 UTC (rev 14568)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-10-23 10:58:19 UTC (rev 14569)
@@ -1,5 +1,10 @@
 2007-10-18  Johan Bilien  <johan.bilien at nokia.com>
 
+	* doc/libhildondesktop: moved libhildondesktop documentation
+	to its own subdirectory, with its own gtk-doc module.
+
+2007-10-18  Johan Bilien  <johan.bilien at nokia.com>
+
 	* configure.ac: 2.0.1
 
 2007-10-18  Johan Bilien  <johan.bilien at nokia.com>

Modified: projects/haf/trunk/hildon-desktop/configure.ac
===================================================================
--- projects/haf/trunk/hildon-desktop/configure.ac	2007-10-22 13:50:03 UTC (rev 14568)
+++ projects/haf/trunk/hildon-desktop/configure.ac	2007-10-23 10:58:19 UTC (rev 14569)
@@ -275,26 +275,27 @@
 AC_SUBST(HILDON_BACKGROUND_MANAGER_INTERFACE)
 
 AC_OUTPUT([
-Makefile 
+Makefile
 src/Makefile
 src/hildon-desktop.pc
-libhildonwm/Makefile 
-libhildonwm/libhildonwm.pc 
-libhildondesktop/Makefile 
-libhildondesktop/libhildondesktop.pc 
-background-manager/Makefile 
-background-manager/hildon-background-manager.service 
-background-manager/background-manager.xml 
-background-manager/background-manager-dbus.h 
+libhildonwm/Makefile
+libhildonwm/libhildonwm.pc
+libhildondesktop/Makefile
+libhildondesktop/libhildondesktop.pc
+background-manager/Makefile
+background-manager/hildon-background-manager.service
+background-manager/background-manager.xml
+background-manager/background-manager-dbus.h
 data/Makefile
 data/desktop.conf
 data/top-panel.conf
 data/bottom-panel.conf
 data/home.conf
-data/app-switcher.desktop 
-data/others-button.desktop 
-data/applications-menu.desktop 
+data/app-switcher.desktop
+data/others-button.desktop
+data/applications-menu.desktop
 data/switcher-menu.desktop
 policies/Makefile
 doc/Makefile
+doc/libhildondesktop/Makefile
 ])

Modified: projects/haf/trunk/hildon-desktop/debian/rules
===================================================================
--- projects/haf/trunk/hildon-desktop/debian/rules	2007-10-22 13:50:03 UTC (rev 14568)
+++ projects/haf/trunk/hildon-desktop/debian/rules	2007-10-23 10:58:19 UTC (rev 14569)
@@ -113,8 +113,8 @@
 # Build architecture-independent files here.
 binary-indep: build install
 	dh_link -plibhildondesktop0-doc			\
-		usr/share/doc/libhildondesktop0-doc/hildon-desktop	\
-		usr/share/gtk-doc/html/hildon-desktop;		\
+		usr/share/doc/libhildondesktop0-doc/libhildondesktop	\
+		usr/share/gtk-doc/html/libhildondesktop;		\
 
 
 # Build architecture-dependent files here.

Modified: projects/haf/trunk/hildon-desktop/doc/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-desktop/doc/Makefile.am	2007-10-22 13:50:03 UTC (rev 14568)
+++ projects/haf/trunk/hildon-desktop/doc/Makefile.am	2007-10-23 10:58:19 UTC (rev 14569)
@@ -1,59 +1 @@
-MAINTAINERCLEANFILES	= Makefile.in \
-			  hildon-desktop-sections.txt \
-			  hildon-desktop-undocumented.txt \
-			  version.xml \
-			  tmpl/*.sgml
-
-DOC_MODULE		= hildon-desktop
-
-DOC_MAIN_SGML_FILE	= $(DOC_MODULE)-docs.sgml
-
-SCAN_OPTIONS		=
-
-SCANOBJ_OPTIONS		=--type-init-func="gtk_type_init(0)"
-
-DOC_SOURCE_DIR		= $(top_srcdir)/libhildondesktop
-DOC_BUILD_DIR		= $(top_builddir)/libhildondesktop
-
-
-HFILE_GLOB		= $(top_srcdir)/libhildondesktop/*.h
-
-CFILE_GLOB		= $(top_srcdir)/libhildondesktop/*.c
-
-#IGNORE_HFILES 					= hildon-banner-private.h
-
-INCLUDES		= $(GTK_CFLAGS) $(HILDON_CFLAGS) -I$(top_srcdir)
-
-MKDB_OPTIONS		= --sgml-mode --output-format=xml
-
-content_files		= version.xml 
-#			  visual_index.xml
-
-GTKDOC_CFLAGS          = $(HILDON_CFLAGS)      \
-                         $(HILDON_FM_CFLAGS)   \
-                         $(HILDON_HELP_CFLAGS) \
-                         $(GCONF_CFLAGS)       \
-                         $(GNOME_VFS_CFLAGS)   \
-                         $(DBUS_GLIB_CFLAGS)
-
-GTKDOC_LIBS            = $(HILDON_LIBS)                                        \
-                         $(HILDON_FM_LIBS)                                     \
-                         $(OSSO_LIBS)                                          \
-                         $(GCONF_LIBS)                                         \
-                         $(HILDON_HELP_LIBS)                                   \
-                         $(GNOME_VFS_LIBS)                                     \
-                         $(DBUS_GLIB_LIBS)                                     \
-                         $(top_srcdir)/libhildondesktop/libhildondesktop.la    \
-                         $(top_srcdir)/libhildonwm/libhildonwm.la
-
-HTML_IMAGES		=
-
-version.xml: ../configure.ac
-	@echo $(VERSION) > version.xml
-
-html: html-build.stamp
-
-FIXXREF_OPTIONS		=
-
-include $(top_srcdir)/doc/gtk-doc.make
-
+SUBDIRS = libhildondesktop

Deleted: projects/haf/trunk/hildon-desktop/doc/hildon-desktop-docs.sgml
===================================================================
--- projects/haf/trunk/hildon-desktop/doc/hildon-desktop-docs.sgml	2007-10-22 13:50:03 UTC (rev 14568)
+++ projects/haf/trunk/hildon-desktop/doc/hildon-desktop-docs.sgml	2007-10-23 10:58:19 UTC (rev 14569)
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"
-[
-  <!ENTITY version SYSTEM "version.xml">
-]>
-
-<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
-  <bookinfo>
-    <title>libhildondesktop 2.0 Reference Manual</title>
-    <releaseinfo>For Hildon Desktop &version;</releaseinfo>
-  </bookinfo>
-
-  <chapter id="overview">
-    <title>Overview</title>
-    <xi:include href="xml/libhildondesktop.xml"/>
-  </chapter>
-
-  <chapter id="desktop-items">
-    <title>Desktop items</title>
-    <xi:include href="xml/hildon-desktop-item.xml"/>
-    <xi:include href="xml/hildon-desktop-home-item.xml"/>
-    <xi:include href="xml/hildon-desktop-panel-item.xml"/>
-    <xi:include href="xml/tasknavigator-item.xml"/>
-    <xi:include href="xml/statusbar-item.xml"/>
-  </chapter>
-
-  <chapter id="window-menu">
-    <title>Window and menu-like</title>
-    <xi:include href="xml/hildon-desktop-popup-window.xml"/>
-    <xi:include href="xml/hildon-desktop-popup-menu.xml"/>
-  </chapter>
-
-  <index id="symbols">
-    <title>Index</title>
-  </index>
-  <index role="hierarchy" id="hierarchy">
-    <title>Object Hierarchy</title>
-    <xi:include href="xml/tree_index.sgml"/>
-  </index>
-</book>

Deleted: projects/haf/trunk/hildon-desktop/doc/hildon-desktop.types
===================================================================
--- projects/haf/trunk/hildon-desktop/doc/hildon-desktop.types	2007-10-22 13:50:03 UTC (rev 14568)
+++ projects/haf/trunk/hildon-desktop/doc/hildon-desktop.types	2007-10-23 10:58:19 UTC (rev 14569)
@@ -1,15 +0,0 @@
-#include <libhildondesktop/hildon-desktop-item.h>
-#include <libhildondesktop/hildon-desktop-home-item.h>
-#include <libhildondesktop/hildon-desktop-panel-item.h>
-#include <libhildondesktop/statusbar-item.h>
-#include <libhildondesktop/tasknavigator-item.h>
-#include <libhildondesktop/hildon-desktop-popup-window.h>
-#include <libhildondesktop/hildon-desktop-popup-menu.h>
-
-hildon_desktop_item_get_type
-hildon_desktop_home_item_get_type
-hildon_desktop_panel_item_get_type
-statusbar_item_get_type
-tasknavigator_item_get_type
-hildon_desktop_popup_window_get_type
-hildon_desktop_popup_menu_get_type

Added: projects/haf/trunk/hildon-desktop/doc/libhildondesktop/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-desktop/doc/libhildondesktop/Makefile.am	2007-10-22 13:50:03 UTC (rev 14568)
+++ projects/haf/trunk/hildon-desktop/doc/libhildondesktop/Makefile.am	2007-10-23 10:58:19 UTC (rev 14569)
@@ -0,0 +1,60 @@
+
+MAINTAINERCLEANFILES	= Makefile.in \
+			  libhildondesktop-sections.txt \
+			  libhildondesktop-undocumented.txt \
+			  version.xml \
+			  tmpl/*.sgml
+
+DOC_MODULE		= libhildondesktop
+
+DOC_MAIN_SGML_FILE	= $(DOC_MODULE)-docs.sgml
+
+SCAN_OPTIONS		=
+
+SCANOBJ_OPTIONS		=--type-init-func="gtk_type_init(0)"
+
+DOC_SOURCE_DIR		= $(top_srcdir)/libhildondesktop
+DOC_BUILD_DIR		= $(top_builddir)/libhildondesktop
+
+
+HFILE_GLOB		= $(top_srcdir)/libhildondesktop/*.h
+
+CFILE_GLOB		= $(top_srcdir)/libhildondesktop/*.c
+
+#IGNORE_HFILES 					= hildon-banner-private.h
+
+INCLUDES		= $(GTK_CFLAGS) $(HILDON_CFLAGS) -I$(top_srcdir)
+
+MKDB_OPTIONS		= --sgml-mode --output-format=xml
+
+content_files		= version.xml 
+#			  visual_index.xml
+
+GTKDOC_CFLAGS          = $(HILDON_CFLAGS)      \
+                         $(HILDON_FM_CFLAGS)   \
+                         $(HILDON_HELP_CFLAGS) \
+                         $(GCONF_CFLAGS)       \
+                         $(GNOME_VFS_CFLAGS)   \
+                         $(DBUS_GLIB_CFLAGS)
+
+GTKDOC_LIBS            = $(HILDON_LIBS)                                        \
+                         $(HILDON_FM_LIBS)                                     \
+                         $(OSSO_LIBS)                                          \
+                         $(GCONF_LIBS)                                         \
+                         $(HILDON_HELP_LIBS)                                   \
+                         $(GNOME_VFS_LIBS)                                     \
+                         $(DBUS_GLIB_LIBS)                                     \
+                         $(top_srcdir)/libhildondesktop/libhildondesktop.la    \
+                         $(top_srcdir)/libhildonwm/libhildonwm.la
+
+HTML_IMAGES		=
+
+html: html-build.stamp
+
+version.xml: $(top_srcdir)/configure.ac
+	@echo $(VERSION) > version.xml
+
+FIXXREF_OPTIONS		=
+
+include $(top_srcdir)/doc/gtk-doc.make
+

Added: projects/haf/trunk/hildon-desktop/doc/libhildondesktop/libhildondesktop-docs.sgml
===================================================================
--- projects/haf/trunk/hildon-desktop/doc/libhildondesktop/libhildondesktop-docs.sgml	2007-10-22 13:50:03 UTC (rev 14568)
+++ projects/haf/trunk/hildon-desktop/doc/libhildondesktop/libhildondesktop-docs.sgml	2007-10-23 10:58:19 UTC (rev 14569)
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"
+[
+  <!ENTITY version SYSTEM "version.xml">
+]>
+
+<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
+  <bookinfo>
+    <title>libhildondesktop 2.0 Reference Manual</title>
+    <releaseinfo>For Hildon Desktop &version;</releaseinfo>
+  </bookinfo>
+
+  <chapter id="overview">
+    <title>Overview</title>
+    <xi:include href="xml/libhildondesktop.xml"/>
+  </chapter>
+
+  <chapter id="desktop-items">
+    <title>Desktop items</title>
+    <xi:include href="xml/hildon-desktop-item.xml"/>
+    <xi:include href="xml/hildon-desktop-home-item.xml"/>
+    <xi:include href="xml/hildon-desktop-panel-item.xml"/>
+    <xi:include href="xml/tasknavigator-item.xml"/>
+    <xi:include href="xml/statusbar-item.xml"/>
+  </chapter>
+
+  <chapter id="window-menu">
+    <title>Window and menu-like</title>
+    <xi:include href="xml/hildon-desktop-popup-window.xml"/>
+    <xi:include href="xml/hildon-desktop-popup-menu.xml"/>
+  </chapter>
+
+  <index id="symbols">
+    <title>Index</title>
+  </index>
+  <index role="hierarchy" id="hierarchy">
+    <title>Object Hierarchy</title>
+    <xi:include href="xml/tree_index.sgml"/>
+  </index>
+</book>

Added: projects/haf/trunk/hildon-desktop/doc/libhildondesktop/libhildondesktop.types
===================================================================
--- projects/haf/trunk/hildon-desktop/doc/libhildondesktop/libhildondesktop.types	2007-10-22 13:50:03 UTC (rev 14568)
+++ projects/haf/trunk/hildon-desktop/doc/libhildondesktop/libhildondesktop.types	2007-10-23 10:58:19 UTC (rev 14569)
@@ -0,0 +1,15 @@
+#include <libhildondesktop/hildon-desktop-item.h>
+#include <libhildondesktop/hildon-desktop-home-item.h>
+#include <libhildondesktop/hildon-desktop-panel-item.h>
+#include <libhildondesktop/statusbar-item.h>
+#include <libhildondesktop/tasknavigator-item.h>
+#include <libhildondesktop/hildon-desktop-popup-window.h>
+#include <libhildondesktop/hildon-desktop-popup-menu.h>
+
+hildon_desktop_item_get_type
+hildon_desktop_home_item_get_type
+hildon_desktop_panel_item_get_type
+statusbar_item_get_type
+tasknavigator_item_get_type
+hildon_desktop_popup_window_get_type
+hildon_desktop_popup_menu_get_type
More information about the maemo-commits mailing list