Rearranged documentation.

Removed context-properties-doc package, it's all in contextkit-doc now.
libcontextprovider-doc installs into usr/share/gtk-doc/.

5 files changed, 6 insertions, 20 deletions

diff --git a/debian/contextkit-doc.install b/debian/contextkit-doc.install
index 9a89f819..8d5f6b89 100644
--- a/debian/contextkit-doc.install
+++ b/debian/contextkit-doc.install
@@ -1 +1 @@
-usr/share/maemo-doc/*
+usr/share/doc/contextkit/html/*
diff --git a/debian/contextkit.install b/debian/contextkit.install
index 1df36c61..e69de29b 100644
--- a/debian/contextkit.install
+++ b/debian/contextkit.install
@@ -1 +0,0 @@
-usr/bin/*
diff --git a/debian/control b/debian/control
index e6e78007..f01d1e6e 100644
--- a/debian/control
+++ b/debian/control
@@ -41,7 +41,7 @@ Description: ContextKit daemon documentation
  ContextKit is a system for providing real-time context awareness to
  applications.
  .
- This package contains the D-Bus interface documentation.
+ This package contains the documentation.
 
 Package: libcontextprovider0
 Architecture: any
@@ -78,10 +78,3 @@ Description: Helper library for providers of context properties
  org.freedesktop.ContextKit D-Bus interface.
  .
  This package contains the documentation.
-
-Package: context-properties-doc
-Section: doc
-Architecture: all
-Description: Documentation of all context properties
- This package contains the documentation of all context properties
- of the Maemo platform.
diff --git a/debian/libcontextprovider-doc.install b/debian/libcontextprovider-doc.install
index caaca796..dbf6e6c1 100644
--- a/debian/libcontextprovider-doc.install
+++ b/debian/libcontextprovider-doc.install
@@ -1 +1 @@
-usr/share/maemo-doc/libcontextprovider/*
+usr/share/gtk-doc/html/libcontextprovider/*
diff --git a/debian/rules b/debian/rules
index d85bf1b4..c9abc8be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,6 @@
 
 #export DH_VERBOSE=1
 
-docdir=/usr/share/maemo-doc/
-
 Makefile:
 	./configure --prefix /usr --sysconfdir=/etc
 
@@ -32,13 +30,9 @@ install: build
 	dh_clean -k
 	dh_installdirs
 	$(MAKE) DESTDIR=`pwd`/debian/tmp/ install
-	mkdir -p `pwd`/debian/tmp/$(docdir)/org.freedesktop.ContextKit
-	mkdir -p `pwd`/debian/tmp/$(docdir)/libcontextprovider
-	mkdir -p `pwd`/debian/tmp/$(docdir)/context-properties
-	cp -a doc/contextkit.html `pwd`/debian/tmp/$(docdir)/org.freedesktop.ContextKit/index.html
-	cp -a doc/reference/libcontextprovider/html/* `pwd`/debian/tmp/$(docdir)/libcontextprovider/
-	cp -a doc/context.html `pwd`/debian/tmp/$(docdir)/context-properties/
-
+	mkdir -p `pwd`/debian/tmp/usr/share/gtk-doc/html
+	rm -rf `pwd`/debian/tmp/usr/share/gtk-doc/html/libcontextprovider
+	cp -a doc/reference/libcontextprovider/html `pwd`/debian/tmp/usr/share/gtk-doc/html/libcontextprovider
 	dh_install --sourcedir=`pwd`/debian/tmp/
 
 binary-indep: build install