diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/README.source | 18 | ||||
| -rw-r--r-- | debian/changelog | 37 | ||||
| -rw-r--r-- | debian/control | 20 | ||||
| -rw-r--r-- | debian/copyright | 2 | ||||
| -rw-r--r-- | debian/patches/0010-metadata.patch | 18 | ||||
| -rw-r--r-- | debian/patches/series | 3 | ||||
| -rwxr-xr-x | debian/rules | 22 | ||||
| -rw-r--r-- | debian/simple-scan.install | 2 | ||||
| -rw-r--r-- | debian/simple-scan.lintian-overrides | 5 | ||||
| -rw-r--r-- | debian/watch | 3 |
10 files changed, 82 insertions, 48 deletions
diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..a62f7b9 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,18 @@ +Hello, + +now I use the branching model from Vincent Driessen[1]. + +I use the gitflow-avh[2]. with the Documentation[3]. +The Debian package can be found here[4]. + +Please upload unattended uploads use a branch feature/<your title>. + + +Many thanks. + + -- Jörg Frings-Fürst <debian@jff.email> 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 +[3] https://github.com/petervanderdoes/gitflow-avh/wiki +[4] https://tracker.debian.org/pkg/git-flow diff --git a/debian/changelog b/debian/changelog index af8eb34..cbe80f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,37 @@ -simple-scan (3.24.0-1) UNRELEASED; urgency=medium +simple-scan (3.26.2-1) unstable; urgency=medium - * New upstream release: + * New upstream release (Closes: #881345): - Updated translations. - * Refresh debian/patches/0005-zlib.patch. - - -- Jörg Frings-Fürst <debian@jff-webhosting.net> Tue, 03 Jan 2017 04:33:58 +0100 + - 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: + - Add meson to Build-Depends. + - Remove dh-autoreconf from Build-Depends. + + debian/rules: + - Remove the --with=autoreconf parameter. + - 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.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 <debian@jff.email> Sun, 12 Nov 2017 13:27:57 +0100 simple-scan (3.23.2-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index baf7021..23377ab 100644 --- a/debian/control +++ b/debian/control @@ -1,11 +1,10 @@ Source: simple-scan Section: gnome Priority: optional -Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net> -Standards-Version: 3.9.8 +Maintainer: Jörg Frings-Fürst <debian@jff.email> +Standards-Version: 4.1.1 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, @@ -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/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 <alessio@debian.org> 2009 Robert Ancell <robert.ancell@canonical.com> - 2014-2016 Jörg Frings-Fürst <debian@jff-webhosting.net> + 2014-2017 Jörg Frings-Fürst <debian@jff.email> License: GPL-3+ License: GPL-3+ 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 <debian@jff.email> +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 74172d5..82e9ebc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ #0100-typos.patch -0005-zlib.patch +#0005-zlib.patch +0010-metadata.patch diff --git a/debian/rules b/debian/rules index 9eec217..0112413 100755 --- a/debian/rules +++ b/debian/rules @@ -20,29 +20,19 @@ # - remove gcc-6 comments # - remove override_dh_auto_build # +# 2017-07-16 Jörg Frings-Fürst <debian@jff-webhosting.net> +# +# - switch to meson +# - remove override_dh_strip +# # # Hardening # 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 - -override_dh_auto_clean: - 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 + 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 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 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 |