Merge branch 'release/debian/42.5-1'debian/42.5-1

6 files changed, 13 insertions, 14 deletions

diff --git a/debian/changelog b/debian/changelog
index 4cf1e14..af87629 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+simple-scan (42.5-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Adoption of most of the points from the bug "minor cleanup"
+    (Closes: #904168).
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Sun, 02 Oct 2022 15:09:48 +0200
+
 simple-scan (42.0-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index e16cb2c..005dec7 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,9 @@ Rules-Requires-Root: no
 Build-Depends:
  cmake,
  debhelper-compat (= 13),
+ dh-sequence-gnome,
+ dh-sequence-scour,
  gettext,
- gnome-pkg-tools,
  itstool,
  libcairo2-dev,
  libcolord-dev,
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..edc0071
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1 @@
+NEWS
diff --git a/debian/files b/debian/files
new file mode 100644
index 0000000..f5a936a
--- /dev/null
+++ b/debian/files
@@ -0,0 +1 @@
+simple-scan_42.5-1_source.buildinfo gnome optional
diff --git a/debian/gbp.conf b/debian/gbp.conf
index d0c1355..cec628c 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,3 +1,2 @@
 [DEFAULT]
 pristine-tar = True
-compression = xz
diff --git a/debian/rules b/debian/rules
index a5b6d0e..1c5e95b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,18 +37,7 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-	dh $@  --buildsystem=meson --with gnome,scour
-
-override_dh_installdocs:
-	dh_installdocs --link-doc=simple-scan
-
-override_dh_installchangelogs:
-	dh_installchangelogs NEWS
+	dh $@  --with gnome,scour
 
 override_dh_gnome_clean:
 	dh_gnome_clean --no-control
-
-# Work around Ubuntu translations issue
-override_dh_translations:
-	ninja -C obj-$(DEB_HOST_GNU_TYPE) simple-scan-pot
-	dh_translations