Merge branch 'release/debian/0.999-8'debian/0.999-8

6 files changed, 22 insertions, 3 deletions

diff --git a/debian/NEWS.Debian b/debian/NEWS
index 9ddc8d2..9ddc8d2 100644
--- a/debian/NEWS.Debian
+++ b/debian/NEWS
diff --git a/debian/changelog b/debian/changelog
index 8d0052f..5e80f18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+xsane (0.999-8) unstable; urgency=medium
+
+  * Add missing pnm, xpm and rc files into the doc directory (Closes: #941344).
+  * Declare compliance with Debian Policy 4.4.1.2 (No changes needed).
+  * debian/control:
+    - Add Rules-Requires-Root: no.
+  * Switch to debhelper-compat:
+    - debian/control: change to debhelper-compat (=12).
+    - remove debian/compat.
+  * Rename NEWS.Debian to NEWS.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Tue, 24 Dec 2019 17:14:21 +0100
+
 xsane (0.999-7) unstable; urgency=medium
 
   * Migrate to debhelper 12:
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 48082f7..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-12
diff --git a/debian/control b/debian/control
index 24af8ce..69e0d38 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: xsane
 Section: graphics
 Priority: optional
 Maintainer: Jörg Frings-Fürst <debian@jff.email>
-Standards-Version: 4.4.0
+Standards-Version: 4.4.1.2
 Build-Depends:
- debhelper (>= 12),
+ debhelper-compat (= 12),
  gettext,
  libgimp2.0-dev,
  libgtk2.0-dev,
@@ -14,6 +14,7 @@ Build-Depends:
  libsane-dev (>= 1.0.27),
  libtiff-dev,
  zlib1g-dev
+Rules-Requires-Root: no
 Vcs-Git: git://jff.email/opt/git/xsane.git
 Vcs-Browser: https://jff.email/cgit/xsane.git
 
diff --git a/debian/rules b/debian/rules
index 42fc61f..a078a1d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,3 +38,6 @@ override_dh_installdocs-indep:
 	# 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
+
+override_dh_compress:
+	dh_compress -X.pnm -X.rc -X.xpm
diff --git a/debian/xsane-common.docs b/debian/xsane-common.docs
index 6e128ad..ec93406 100644
--- a/debian/xsane-common.docs
+++ b/debian/xsane-common.docs
@@ -1,2 +1,5 @@
 doc/*.html
 doc/*.jpg
+src/*.pnm
+src/*.xpm
+src/*.rc