From 314542fd2e1bb2dc7324febe07a865ed502c0bc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 1 Oct 2022 21:26:21 +0200 Subject: minor cleanup #904168 --- debian/changelog | 2 ++ debian/control | 3 ++- debian/docs | 1 + debian/gbp.conf | 1 - debian/rules | 13 +------------ 5 files changed, 6 insertions(+), 14 deletions(-) create mode 100644 debian/docs diff --git a/debian/changelog b/debian/changelog index 653abbf..c5e034a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ simple-scan (42.5-1) UNRELEASED; urgency=medium * New upstream release. + * Adoption of most of the points from the bug "minor cleanup" + (Closes #904168). -- Jörg Frings-Fürst Thu, 28 Apr 2022 09:48:54 +0200 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/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 -- cgit v1.2.3