From 4d33913d0d9327cbc7a5cd4b9aeeb1f62b372133 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 16 Jul 2017 10:59:23 +0200 Subject: Switch to meson --- debian/changelog | 11 +++++++++-- debian/control | 2 +- debian/patches/series | 2 +- debian/rules | 12 +++++------- 4 files changed, 16 insertions(+), 11 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 65d2d04..f33a0b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,16 @@ -simple-scan (3.24.0-1) UNRELEASED; urgency=medium +simple-scan (3.25.1-1) UNRELEASED; urgency=medium * New upstream release: - Updated translations. - * Refresh debian/patches/0005-zlib.patch. * New README.source to explain the branching model used. + * Switch buildsystem to meson: + + debian/control: + - Add meson to Build-Depends. + - Remove dh-autoreconf from Build-Depends. + + debian/rules: + - Remove the --with=autoreconf parameter. + - Remove override_dh_autoreconf section. + + Remove useless debian/patches/0005-zlib.patch. -- Jörg Frings-Fürst Tue, 03 Jan 2017 04:33:58 +0100 diff --git a/debian/control b/debian/control index baf7021..4f21af3 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,6 @@ Maintainer: Jörg Frings-Fürst Standards-Version: 3.9.8 Build-Depends: debhelper (>= 10), - dh-autoreconf, gnome-pkg-tools (>= 0.10), libcairo2-dev, libcolord-dev, @@ -18,6 +17,7 @@ Build-Depends: libsane-dev, librsvg2-dev, libxml2-utils, + meson, python-scour, valac (>= 0.22), yelp-tools, diff --git a/debian/patches/series b/debian/patches/series index 74172d5..7d8faf6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,2 @@ #0100-typos.patch -0005-zlib.patch +#0005-zlib.patch diff --git a/debian/rules b/debian/rules index 9eec217..21b23e5 100755 --- a/debian/rules +++ b/debian/rules @@ -20,6 +20,10 @@ # - remove gcc-6 comments # - remove override_dh_auto_build # +# 2017-07-16 Jörg Frings-Fürst +# +# - switch to meson + # # Hardening @@ -28,13 +32,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: - dh $@ --with=autoreconf,scour - -# Autoreconf due to 01_lpi.patch -override_dh_autoreconf: - [ -e gnome-doc-utils.make ] || \ - ln -s /usr/share/gnome-doc-utils/gnome-doc-utils.make - dh_autoreconf + dh $@ --with=scour override_dh_auto_clean: dh_auto_clean -- cgit v1.2.3 From e7d8ffe2ab58fecae6a5990d31b18ca82f1088bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 16 Jul 2017 11:00:59 +0200 Subject: Declare compliance with Debian Policy 4.0.0 --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f33a0b4..346025e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ simple-scan (3.25.1-1) UNRELEASED; urgency=medium - Remove the --with=autoreconf parameter. - Remove override_dh_autoreconf section. + Remove useless debian/patches/0005-zlib.patch. + * Declare compliance with Debian Policy 4.0.0. (No changes needed). -- Jörg Frings-Fürst Tue, 03 Jan 2017 04:33:58 +0100 diff --git a/debian/control b/debian/control index 4f21af3..4bf4843 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: simple-scan Section: gnome Priority: optional Maintainer: Jörg Frings-Fürst -Standards-Version: 3.9.8 +Standards-Version: 4.0.0 Build-Depends: debhelper (>= 10), gnome-pkg-tools (>= 0.10), -- cgit v1.2.3 From b34ca4572fb3ea676b07d10b64e063f2be0e735a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 16 Jul 2017 11:03:52 +0200 Subject: Use the automatic debug symbol packages --- debian/changelog | 3 +++ debian/control | 14 -------------- debian/rules | 6 ++---- 3 files changed, 5 insertions(+), 18 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 346025e..97c9127 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,9 @@ simple-scan (3.25.1-1) UNRELEASED; urgency=medium - Remove override_dh_autoreconf section. + Remove useless debian/patches/0005-zlib.patch. * Declare compliance with Debian Policy 4.0.0. (No changes needed). + * Use the automatic debug symbol packages: + - Remove simple-scan-dbg section from debian/control. + - Remove override_dh_strip from debian/rules. -- Jörg Frings-Fürst Tue, 03 Jan 2017 04:33:58 +0100 diff --git a/debian/control b/debian/control index 4bf4843..7c2eb87 100644 --- a/debian/control +++ b/debian/control @@ -41,17 +41,3 @@ Description: Simple Scanning Utility Simple Scan is basically a frontend for SANE - which is the same backend as XSANE uses. This means that all existing scanners will work and the interface is well tested. - -Package: simple-scan-dbg -Section: debug -Priority: extra -Architecture: linux-any -Depends: - simple-scan (= ${binary:Version}), - ${misc:Depends} -Description: Simple Scanning Utility - debugging symbols - Simple Scan is an easy-to-use application, designed to let users - connect their scanner and quickly have the image/document in an - appropriate format. - . - This package provides the debugging symbols for simple-scan. diff --git a/debian/rules b/debian/rules index 21b23e5..36ded38 100755 --- a/debian/rules +++ b/debian/rules @@ -23,7 +23,8 @@ # 2017-07-16 Jörg Frings-Fürst # # - switch to meson - +# - remove override_dh_strip +# # # Hardening @@ -39,9 +40,6 @@ override_dh_auto_clean: [ ! -h gnome-doc-utils.make ] || \ rm gnome-doc-utils.make -override_dh_strip: - dh_strip -psimple-scan --dbg-package=simple-scan-dbg - override_dh_installdocs: dh_installdocs --link-doc=simple-scan -- cgit v1.2.3 From c0bee169bc715a352bff1219bb449fb4e43e21dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 16 Jul 2017 12:05:42 +0200 Subject: Switch to meson Part2 --- debian/changelog | 11 ++++++++++- debian/rules | 7 +------ debian/simple-scan.install | 2 -- 3 files changed, 11 insertions(+), 9 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 97c9127..53c2e95 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,13 @@ simple-scan (3.25.1-1) UNRELEASED; urgency=medium * New upstream release: - Updated translations. + - Check if files exist in multi-file saves. + - Remove "Save As" - save now always prompts when overwriting + (Closes: #852730). + - Add a continuous scan option. + - Make email and print actions insensitive when document empty. + - Remove .ps and .tiff output support - this is not required. + - Switch from autotools to Meson. * New README.source to explain the branching model used. * Switch buildsystem to meson: + debian/control: @@ -9,7 +16,9 @@ simple-scan (3.25.1-1) UNRELEASED; urgency=medium - Remove dh-autoreconf from Build-Depends. + debian/rules: - Remove the --with=autoreconf parameter. - - Remove override_dh_autoreconf section. + - Remove override_dh_auto_clean and override_dh_autoreconf section. + + debian/simple-scan.install: + - Remove useless /usr/bin and /usr/share. + Remove useless debian/patches/0005-zlib.patch. * Declare compliance with Debian Policy 4.0.0. (No changes needed). * Use the automatic debug symbol packages: diff --git a/debian/rules b/debian/rules index 36ded38..3acfc8d 100755 --- a/debian/rules +++ b/debian/rules @@ -33,12 +33,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: - dh $@ --with=scour - -override_dh_auto_clean: - dh_auto_clean - [ ! -h gnome-doc-utils.make ] || \ - rm gnome-doc-utils.make + dh $@ --buildsystem=meson --with=scour override_dh_installdocs: dh_installdocs --link-doc=simple-scan diff --git a/debian/simple-scan.install b/debian/simple-scan.install index b7d9a09..63d50cc 100644 --- a/debian/simple-scan.install +++ b/debian/simple-scan.install @@ -1,3 +1 @@ debian/source_simple-scan.py usr/share/apport/package-hooks/ -usr/bin -usr/share -- cgit v1.2.3 From 8f8e1b606f99f9873a713a8468642ab7d6d57fb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 11 Nov 2017 13:34:15 +0100 Subject: debian/watch: switch to gnome --- debian/changelog | 2 ++ debian/watch | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 53c2e95..b277a9e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -44,6 +44,8 @@ simple-scan (3.23.2-1) unstable; urgency=medium Thanks to Laurent Bigonville ! - Move build dependency from deprecated python-rsvg to librsvg2-dev (Closes: #844152). + * New Homepage: + - debian/watch: switch to gnome. -- Jörg Frings-Fürst Fri, 02 Dec 2016 00:32:13 +0100 diff --git a/debian/watch b/debian/watch index 6b24219..81fb209 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,3 @@ version=4 -https://launchpad.net/simple-scan/+download .*/simple-scan-([0-9.]+)\.tar\.xz +https://download.gnome.org/sources/@PACKAGE@/([\d\.]+[02468])/ \ + @PACKAGE@@ANY_VERSION@\.tar\.xz -- cgit v1.2.3 From 0b098a24e80acb1bd7ffeed90c6c821f8420b84a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 11 Nov 2017 13:45:06 +0100 Subject: Change to my new email address --- debian/README.source | 2 +- debian/changelog | 7 ++++--- debian/control | 2 +- debian/copyright | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) (limited to 'debian') diff --git a/debian/README.source b/debian/README.source index e4f2b3d..a62f7b9 100644 --- a/debian/README.source +++ b/debian/README.source @@ -10,7 +10,7 @@ Please upload unattended uploads use a branch feature/. Many thanks. - -- Jörg Frings-Fürst Fri, 02 Jun 2017 19:00:40 +0200 + -- Jörg Frings-Fürst Fri, 02 Jun 2017 19:00:40 +0200 [1] http://nvie.com/posts/a-successful-git-branching-model/ [2] https://github.com/petervanderdoes/gitflow-avh diff --git a/debian/changelog b/debian/changelog index b277a9e..f8e06ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,8 +24,11 @@ simple-scan (3.25.1-1) UNRELEASED; urgency=medium * Use the automatic debug symbol packages: - Remove simple-scan-dbg section from debian/control. - Remove override_dh_strip from debian/rules. + * New Homepage: + - debian/watch: switch to gnome. + * Change to my new email address. - -- Jörg Frings-Fürst Tue, 03 Jan 2017 04:33:58 +0100 + -- Jörg Frings-Fürst Tue, 03 Jan 2017 04:33:58 +0100 simple-scan (3.23.2-1) unstable; urgency=medium @@ -44,8 +47,6 @@ simple-scan (3.23.2-1) unstable; urgency=medium Thanks to Laurent Bigonville ! - Move build dependency from deprecated python-rsvg to librsvg2-dev (Closes: #844152). - * New Homepage: - - debian/watch: switch to gnome. -- Jörg Frings-Fürst Fri, 02 Dec 2016 00:32:13 +0100 diff --git a/debian/control b/debian/control index 7c2eb87..c5418d2 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: simple-scan Section: gnome Priority: optional -Maintainer: Jörg Frings-Fürst +Maintainer: Jörg Frings-Fürst Standards-Version: 4.0.0 Build-Depends: debhelper (>= 10), diff --git a/debian/copyright b/debian/copyright index 86443a9..84bf9e4 100644 --- a/debian/copyright +++ b/debian/copyright @@ -11,7 +11,7 @@ Files: debian/* Copyright: 2009-2012 Alessio Treglia 2009 Robert Ancell - 2014-2016 Jörg Frings-Fürst + 2014-2017 Jörg Frings-Fürst License: GPL-3+ License: GPL-3+ -- cgit v1.2.3 From 35fd3ab8990210defe10f1614abe4ca1afe04c5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 12 Nov 2017 12:57:38 +0100 Subject: New upstream release 3.26.2; Declare compliance with Debian Policy 4.1.1; Drop d/simple-scan.lintian-overrides; New d/p/0010-metadata.patch --- debian/changelog | 9 ++++++--- debian/control | 2 +- debian/patches/0010-metadata.patch | 18 ++++++++++++++++++ debian/patches/series | 1 + debian/rules | 1 - debian/simple-scan.lintian-overrides | 5 ----- 6 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 debian/patches/0010-metadata.patch delete mode 100644 debian/simple-scan.lintian-overrides (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f8e06ef..d6e4abb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -simple-scan (3.25.1-1) UNRELEASED; urgency=medium +simple-scan (3.26.2-1) UNRELEASED; urgency=medium - * New upstream release: + * New upstream release (Closes: #881345): - Updated translations. - Check if files exist in multi-file saves. - Remove "Save As" - save now always prompts when overwriting @@ -20,13 +20,16 @@ simple-scan (3.25.1-1) UNRELEASED; urgency=medium + debian/simple-scan.install: - Remove useless /usr/bin and /usr/share. + Remove useless debian/patches/0005-zlib.patch. - * Declare compliance with Debian Policy 4.0.0. (No changes needed). + * Declare compliance with Debian Policy 4.1.1. (No changes needed). * Use the automatic debug symbol packages: - Remove simple-scan-dbg section from debian/control. - Remove override_dh_strip from debian/rules. * New Homepage: - debian/watch: switch to gnome. * Change to my new email address. + * Drop useless debian/simple-scan.lintian-overrides. + * New debian/patches/0010-metadata.patch to install appstream metadata into + the requested directory /usr/share/metainfo/. -- Jörg Frings-Fürst Tue, 03 Jan 2017 04:33:58 +0100 diff --git a/debian/control b/debian/control index c5418d2..23377ab 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: simple-scan Section: gnome Priority: optional Maintainer: Jörg Frings-Fürst -Standards-Version: 4.0.0 +Standards-Version: 4.1.1 Build-Depends: debhelper (>= 10), gnome-pkg-tools (>= 0.10), diff --git a/debian/patches/0010-metadata.patch b/debian/patches/0010-metadata.patch new file mode 100644 index 0000000..7277159 --- /dev/null +++ b/debian/patches/0010-metadata.patch @@ -0,0 +1,18 @@ +Description: Install metadate into /usr/share/metainfo/ +Author: Jörg Frings-Fürst +Last-Update: 2017-11-12 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/data/meson.build +=================================================================== +--- trunk.orig/data/meson.build ++++ trunk/data/meson.build +@@ -23,7 +23,7 @@ i18n.merge_file ('appdata-file', + input: 'simple-scan.appdata.xml.in', + output: 'simple-scan.appdata.xml', + install: true, +- install_dir: join_paths (datadir, 'appdata'), ++ install_dir: join_paths (datadir, 'metainfo'), + po_dir: '../po') + + install_man ('simple-scan.1') diff --git a/debian/patches/series b/debian/patches/series index 7d8faf6..82e9ebc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ #0100-typos.patch #0005-zlib.patch +0010-metadata.patch diff --git a/debian/rules b/debian/rules index 3acfc8d..0112413 100755 --- a/debian/rules +++ b/debian/rules @@ -31,7 +31,6 @@ # export DEB_BUILD_MAINT_OPTIONS = hardening=+all - %: dh $@ --buildsystem=meson --with=scour diff --git a/debian/simple-scan.lintian-overrides b/debian/simple-scan.lintian-overrides deleted file mode 100644 index bcc578d..0000000 --- a/debian/simple-scan.lintian-overrides +++ /dev/null @@ -1,5 +0,0 @@ -# -# Override this false positve error: -# (See Debian bug #762753) -# -privacy-breach-generic -- cgit v1.2.3