diff -Nru cairomm-1.8.4/debian/changelog cairomm-1.8.4/debian/changelog
--- cairomm-1.8.4/debian/changelog	2010-05-06 05:46:02.000000000 +0200
+++ cairomm-1.8.4/debian/changelog	2010-06-11 13:23:54.000000000 +0200
@@ -1,3 +1,21 @@
+cairomm (1.8.4-4~danielk) unstable; urgency=low
+
+  * debian/control:
+    - Drop build dependencies on doxygen and graphviz, since upstream now
+      ships the generated documentation
+  * debian/libcairomm-1.0-doc.install:
+    - Add the Devhelp book to the package
+  * debian/libcairomm-1.0-doc.links:
+    - Adjust the symlink for the upstream documentation directory, which has
+      has changed to /usr/share/doc/cairomm-1.0
+  * debian/rules:
+    - Remove the clean:: target, as it is no longer needed
+    - Add DEB_COMPRESS_EXCLUDE for .tag files since Doxygen cannot handle
+      compressed tag files
+    - Inlude clean-la.mk to purge dependency information from .la files
+
+ -- Daniel Elstner <daniel.kitta@gmail.com>  Fri, 11 Jun 2010 13:07:19 +0200
+
 cairomm (1.8.4-3) unstable; urgency=low
 
   * debian/control: Add dependency for libcairomm-1.0-dev on
diff -Nru cairomm-1.8.4/debian/control cairomm-1.8.4/debian/control
--- cairomm-1.8.4/debian/control	2010-05-06 05:45:33.000000000 +0200
+++ cairomm-1.8.4/debian/control	2010-06-11 13:06:07.000000000 +0200
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Dave Beckett <dajobe@debian.org>
 Uploaders: Danilo Piazzalunga <danilopiazza@gmail.com>
-Build-Depends: debhelper (>= 5), cdbs, libcairo2-dev (>= 1.8.0), doxygen, graphviz, libsigc++-2.0-dev
+Build-Depends: debhelper (>= 5), cdbs, libcairo2-dev (>= 1.8.0), libsigc++-2.0-dev
 Standards-Version: 3.8.4
 Homepage: http://cairographics.org/cairomm/
 
diff -Nru cairomm-1.8.4/debian/libcairomm-1.0-doc.install cairomm-1.8.4/debian/libcairomm-1.0-doc.install
--- cairomm-1.8.4/debian/libcairomm-1.0-doc.install	2010-04-20 22:51:18.000000000 +0200
+++ cairomm-1.8.4/debian/libcairomm-1.0-doc.install	2010-06-11 12:58:14.000000000 +0200
@@ -1 +1,2 @@
 debian/tmp/usr/share/doc/cairomm-1.0/reference usr/share/doc/libcairomm-1.0-doc
+debian/tmp/usr/share/devhelp/books
diff -Nru cairomm-1.8.4/debian/libcairomm-1.0-doc.links cairomm-1.8.4/debian/libcairomm-1.0-doc.links
--- cairomm-1.8.4/debian/libcairomm-1.0-doc.links	2010-04-20 22:40:07.000000000 +0200
+++ cairomm-1.8.4/debian/libcairomm-1.0-doc.links	2010-06-11 12:59:04.000000000 +0200
@@ -1,2 +1,2 @@
 # Upstream installs documentation in this directory
-usr/share/doc/libcairomm-1.0-doc usr/share/doc/libcairomm-1.0
+usr/share/doc/libcairomm-1.0-doc usr/share/doc/cairomm-1.0
diff -Nru cairomm-1.8.4/debian/rules cairomm-1.8.4/debian/rules
--- cairomm-1.8.4/debian/rules	2010-04-20 22:48:46.000000000 +0200
+++ cairomm-1.8.4/debian/rules	2010-06-11 13:04:00.000000000 +0200
@@ -3,15 +3,13 @@
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/clean-la.mk
 
 # We want .a
 DEB_CONFIGURE_EXTRA_FLAGS = --enable-static
 
+# Doxygen cannot handle compressed tag files
+DEB_COMPRESS_EXCLUDE := .tag
+
 # Make sure it depends on >= current-version
 #DEB_DH_MAKESHLIBS_ARGS_libcairomm-1.0-0 = -V
-
-clean::
-	rm -rf \
-	docs/reference/cairomm_doxygen_tags \
-	docs/reference/doxygen* \
-	docs/reference/undocumented.txt