1 files changed, 27 insertions, 8 deletions

diff --git a/debian/rules b/debian/rules
index d5c6c92..d7116ef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -72,11 +72,25 @@ install-stamp: build-stamp
 	  PYTHON_SITE_PACKAGES=`pwd`/debian/tmp/usr/lib/python2.3/site-packages \
 	  install
 
-	mkdir -p debian/tmp/usr/share/doc/libxml2-doc/html
-	install -m 644 doc/*.html doc/*.gif debian/tmp/usr/share/doc/libxml2-doc/html/
-
 	mv debian/tmp/usr/share/aclocal/libxml.m4 debian/tmp/usr/share/aclocal/libxml2.m4
 
+	# Properly install documentation in /usr/share/doc/libxml2-doc
+	install -d debian/tmp/usr/share/doc/libxml2-doc/examples
+	install -m 644 \
+		doc/*.html \
+		doc/*.gif \
+		doc/*.png \
+		doc/libxml2-api.xml debian/tmp/usr/share/doc/libxml2-doc
+	install -m 644 \
+		doc/examples/*.c \
+		doc/examples/*.res \
+		doc/examples/index.html \
+		doc/examples/[tw]*.xml debian/tmp/usr/share/doc/libxml2-doc/examples
+	cp -a \
+		doc/html \
+		doc/tutorial debian/tmp/usr/share/doc/libxml2-doc
+
+
 	# Special workaround for svn-buildpackage:
 	# Restore workaround backups of modified files.
 	-for file in $(WORKAROUND_MODIFIED_FILES); do \
@@ -91,11 +105,11 @@ binary-indep: build install
 	dh_testdir -i
 	dh_testroot -i
 	dh_installdocs -i -A AUTHORS TODO README
-	dh_installchangelogs -i ChangeLog
+	dh_installchangelogs -i debian/no-upstream-changelog
 	dh_install -i --sourcedir=debian/tmp
 	dh_link -i
 	dh_strip -i
-	dh_compress -i
+	dh_compress -i -Xexamples/ -Xtutorial/ -Xhtml/ -X.html
 	dh_fixperms -i
 	dh_installdeb -i
 	dh_shlibdeps -i
@@ -108,14 +122,19 @@ binary-arch: build install
 	dh_testdir -a
 	dh_testroot -a
 	dh_installexamples -a
-	dh_installdocs -a -A AUTHORS TODO README
+	dh_installdocs -plibxml2 -Nlibxml2-dev -A AUTHORS TODO README
 	dh_installdocs -plibxml2-python2.3 python/TODO
+	ln -sf libxml2 debian/libxml2-dev/usr/share/doc/libxml2-dev
+	ln -sf libxml2 debian/libxml2-utils/usr/share/doc/libxml2-utils
 	dh_installman -a
-	dh_installchangelogs -a ChangeLog
+	dh_installchangelogs -plibxml2 ChangeLog
+	for file in AUTHORS README changelog.Debian.gz changelog.gz; do \
+		ln -sf ../libxml2/$${file} debian/libxml2-python2.3/usr/share/doc/libxml2-python2.3/$${file}; \
+	done
 	dh_install -a --sourcedir=debian/tmp
 	dh_link -a
 	dh_strip -a
-	dh_compress -a
+	dh_compress -a -Xexamples/
 	dh_fixperms -a
 	dh_makeshlibs -a -V 'libxml2 (>= 2.6.14)'
 	dh_installdeb -a