7 files changed, 43 insertions, 21 deletions
diff --git a/debian/changelog b/debian/changelog
index 2844a6c..4ea0322 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,15 +3,15 @@ uriparser (0.8.4-1) UNRELEASED; urgency=medium
   * New upstream release.
   * debian/liburiparser-dev.links:
     - Bump library version to 1.0.20.
-  * Add documentation build:
+  * Add package liburiparser-doc:
     - debian/rules:
-      + Remove --disable-doc from confflags.
-      + Add override_install to install the html docu.
-    - debian/liburiparser-dev.install:
-      + Add documentation.
+      + Add override_dh_auto_build-indep and override_dh_installdocs-indep
+        to handle the build and install the html documentation.
     - debian/control:
-      + Add Build-Depends for the docu build.
-    - New debian/liburiparser-dev.doc-base.
+      + Add Build-Depends-Indep.
+      + Add new package liburiparser-doc.
+    - New debian/liburiparser-doc.doc-base.
+    - New debian/liburiparser-doc.dirs.
 
  -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Sun, 01 Nov 2015 19:00:29 +0100
 
diff --git a/debian/control b/debian/control
index ed2203c..ec9ae66 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,8 @@ Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net>
 Build-Depends:
  debhelper (>= 9),
  dh-autoreconf,
- dh-exec (>=0.3),
+ dh-exec (>=0.3)
+Build-Depends-Indep:
  doxygen,
  graphviz,
  qttools5-dev-tools,
@@ -51,3 +52,15 @@ Description: development files for uriparser
  This package provides the development files for uriparser, a library to parse
  Uniform Resource Identifiers (URIs). Install it if you want to compile a
  program that makes use of this library.
+
+Package: liburiparser-doc
+Architecture: all
+Section: doc
+Depends:
+ ${misc:Depends}
+Description: documentation files for uriparser
+ uriparser is a library that parses Uniform Resource Identifiers (URIs),
+ strictly adhering to RFC 3986 where syntax for URIs is defined. URIs
+ are used to identify resources, like http://www.debian.org/ or
+ urn:isbn:0-395-36341-1.  This package provides the documentation 
+ files for uriparser.
diff --git a/debian/liburiparser-dev.doc-base b/debian/liburiparser-dev.doc-base
deleted file mode 100644
index b078cbc..0000000
--- a/debian/liburiparser-dev.doc-base
+++ /dev/null
@@ -1,7 +0,0 @@
-Document: liburiparser
-Title: liburiparserx Documentation
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/liburiparser-dev/html/index.html
-Files: /usr/share/doc/liburiparser-dev/html/*.html
diff --git a/debian/liburiparser-dev.install b/debian/liburiparser-dev.install
index 33207b8..68e5a87 100644
--- a/debian/liburiparser-dev.install
+++ b/debian/liburiparser-dev.install
@@ -1,3 +1,2 @@
 usr/include
 usr/lib/*/pkgconfig/*
-usr/share/doc/uriparser/*
-\ No newline at end of file
diff --git a/debian/liburiparser-doc.dirs b/debian/liburiparser-doc.dirs
new file mode 100644
index 0000000..14ce20b
--- /dev/null
+++ b/debian/liburiparser-doc.dirs
@@ -0,0 +1 @@
+/usr/share/doc/liburiparser-doc/html/
diff --git a/debian/liburiparser-doc.doc-base b/debian/liburiparser-doc.doc-base
new file mode 100644
index 0000000..3e3c089
--- /dev/null
+++ b/debian/liburiparser-doc.doc-base
@@ -0,0 +1,7 @@
+Document: liburiparser
+Title: liburiparserx Documentation
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/liburiparser-doc/html/index.html
+Files: /usr/share/doc/liburiparser-doc/html/*.html
diff --git a/debian/rules b/debian/rules
index 5cba506..41c2be5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 # Configure arguments
 
-confflags = --prefix=/usr --disable-test --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+confflags = --prefix=/usr --disable-test --disable-doc --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -25,10 +25,19 @@ endif
 override_dh_auto_configure:
 	./configure $(confflags)
 
-override_dh_install:
-	dh_install
-	mv debian/liburiparser-dev/usr/share/doc/uriparser debian/liburiparser-dev/usr/share/doc/liburiparser-dev
-	$(RM) debian/liburiparser-dev/usr/share/doc/liburiparser-dev/html/*.md5
+override_dh_auto_build-indep:
+	dh_auto_build
+	make -C doc
+
+override_dh_installdocs-indep:
+	cp -r $(CURDIR)/doc/html/* $(CURDIR)/debian/liburiparser-doc/usr/share/doc/liburiparser-doc/html/
+	$(RM) debian/liburiparser-doc/usr/share/doc/liburiparser-doc/html/*.md5
+	dh_installdocs
+
+#override_dh_install:
+#	dh_install
+#	mv debian/liburiparser-doc/usr/share/doc/uriparser debian/liburiparser-doc/usr/share/doc/liburiparser-doc
+#	$(RM) debian/liburiparser-doc/usr/share/doc/liburiparser-doc/html/*.md5
 
 UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -n '/\(Version:\)/{s/^Version:[[:space:]]\+\([0-9]\+:\)\?\(.*\)/\2/p}' | rev | cut -d- -f 2- | rev)