Move /usr/share/sane/doc to /usr/share/xsane-common/html

11 files changed, 47 insertions, 20 deletions

diff --git a/debian/changelog b/debian/changelog
index 3d113f8..dc62ca5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xsane (0.999-7) UNRELEASED; urgency=medium
     - Bump minimum debhelper version in debian/control to >= 12.
   * Declare compliance with Debian Policy 4.4.0 (No changes needed).
   * New debian/NEWS.debian.
+  * Move /usr/share/sane/doc to /usr/share/xsane-common/html
 
  -- Jörg Frings-Fürst <debian@jff.email>  Thu, 25 Jul 2019 17:37:17 +0200
 
diff --git a/debian/rules b/debian/rules
index 9e63675..42fc61f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,13 +16,6 @@ override_dh_auto_clean:
 	rm -f xsane.spec include/config.h
 	rm -f po/*.gmo
 
-override_dh_auto_install:
-	dh_auto_install
-
-	# remove outdated/useless documentation
-	rm -f debian/tmp/usr/share/sane/xsane/doc/sane-backends-doc.html
-	rm -f debian/tmp/usr/share/sane/xsane/doc/sane-pnm-doc.html
-
 override_dh_install-arch:
 	dh_install
 
@@ -36,3 +29,12 @@ override_dh_install-indep:
 
 override_dh_installchangelogs:
 	dh_installchangelogs xsane.CHANGES
+
+override_dh_installdocs-indep:
+	dh_installdocs
+	mkdir debian/xsane-common/usr/share/doc/xsane-common/html
+	mv debian/xsane-common/usr/share/doc/xsane-common/*.html debian/xsane-common/usr/share/doc/xsane-common/html/
+	mv debian/xsane-common/usr/share/doc/xsane-common/*.jpg debian/xsane-common/usr/share/doc/xsane-common/html/
+	# remove outdated/useless documentation
+	rm -f debian/xsane-common/usr/share/doc/xsane-common/html/sane-backends-doc.html
+	rm -f debian/xsane-common/usr/share/doc/xsane-common/html/sane-pnm-doc.html
diff --git a/debian/xsane-common.dirs b/debian/xsane-common.dirs
deleted file mode 100644
index 8dd0c85..0000000
--- a/debian/xsane-common.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/sane/xsane
diff --git a/debian/xsane-common.doc-base b/debian/xsane-common.doc-base
index 8bbd3b6..4df3e91 100644
--- a/debian/xsane-common.doc-base
+++ b/debian/xsane-common.doc-base
@@ -11,5 +11,5 @@ Abstract: This manual describes how to use xsane as a frontend to
 Section: Graphics
 
 Format: html
-Index: /usr/share/sane/xsane/doc/sane-xsane-doc.html
-Files: /usr/share/sane/xsane/doc/*.html
+Index: /usr/share/doc/xsane-common/html/sane-xsane-doc.html
+Files: /usr/share/doc/xsane-common/html/*.html
diff --git a/debian/xsane-common.docs b/debian/xsane-common.docs
new file mode 100644
index 0000000..6e128ad
--- /dev/null
+++ b/debian/xsane-common.docs
@@ -0,0 +1,2 @@
+doc/*.html
+doc/*.jpg
diff --git a/debian/xsane-common.install b/debian/xsane-common.install
index d18bbb8..3635480 100644
--- a/debian/xsane-common.install
+++ b/debian/xsane-common.install
@@ -1,2 +1 @@
-usr/share/sane/xsane
 usr/share/locale
diff --git a/debian/xsane-common.links b/debian/xsane-common.links
index 7d505be..f57e7a1 100644
--- a/debian/xsane-common.links
+++ b/debian/xsane-common.links
@@ -1,2 +1 @@
-usr/share/sane/xsane/doc/sane-xsane-doc.html usr/share/sane/xsane/doc/index.html
-usr/share/sane/xsane/doc usr/share/doc/xsane-common/html
+usr/share/doc/xsane-coomon/html/sane-xsane-doc.html usr/share/doc/xsane-common/html/index.html
diff --git a/debian/xsane-common.preinst b/debian/xsane-common.preinst
new file mode 100644
index 0000000..b319f56
--- /dev/null
+++ b/debian/xsane-common.preinst
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+HTMLDOCDIR=/usr/share/doc/xsane-common/html
+
+if [ -d "$HTMLDOCDIR" ] && [ -L "$HTMLDOCDIR" ]; then
+    # Remove old directory and files that are now provided by xsane-common
+    rm -rf "$HTMLDOCDIR"
+fi
+
+
+#DEBHELPER#
diff --git a/debian/xsane.links b/debian/xsane.links
index 46dc8ac..9984384 100644
--- a/debian/xsane.links
+++ b/debian/xsane.links
@@ -1,2 +1 @@
 usr/bin/xsane usr/lib/gimp/2.0/plug-ins/xsane
-usr/share/sane/xsane/doc usr/share/doc/xsane/html
diff --git a/debian/xsane.postinst b/debian/xsane.postinst
index b0b66df..3c74428 100644
--- a/debian/xsane.postinst
+++ b/debian/xsane.postinst
@@ -5,12 +5,12 @@ set -e
 HTMLDOCDIR=/usr/share/doc/xsane/html
 NEWHTMLDOCDIR=../xsane-common/html
 
-if [ -d "$HTMLDOCDIR" ] && [ ! -L "$HTMLDOCDIR" ]; then
-    # Remove old directory and files that are now provided by xsane-common
-    rm -rf "$HTMLDOCDIR"
-    # Create a link to the new directory
-    ln -s "$NEWHTMLDOCDIR" "$HTMLDOCDIR"
-fi
+#if [ -d "$HTMLDOCDIR" ] && [ ! -L "$HTMLDOCDIR" ]; then
+#    # Remove old directory and files that are now provided by xsane-common
+#    rm -rf "$HTMLDOCDIR"
+#    # Create a link to the new directory
+#    ln -s "$NEWHTMLDOCDIR" "$HTMLDOCDIR"
+#fi
 
 
 #DEBHELPER#
diff --git a/debian/xsane.preinst b/debian/xsane.preinst
new file mode 100644
index 0000000..ae87956
--- /dev/null
+++ b/debian/xsane.preinst
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+HTMLDOCDIR=/usr/share/doc/xsane/html
+
+if [ -d "$HTMLDOCDIR" ] && [ -L "$HTMLDOCDIR" ]; then
+    # Remove old directory and files that are now provided by xsane-common
+    rm -rf "$HTMLDOCDIR"
+fi
+
+
+#DEBHELPER#