summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-12 12:57:38 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-12 12:57:38 +0100
commit35fd3ab8990210defe10f1614abe4ca1afe04c5d (patch)
treef511703bdeeff064dbc314281c6abce9b0bb5348
parentf1a056923fce6dd0ebd778d381794d3090a62e8c (diff)
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
-rw-r--r--.gitignore4
-rw-r--r--debian/changelog9
-rw-r--r--debian/control2
-rw-r--r--debian/patches/0010-metadata.patch18
-rw-r--r--debian/patches/series1
-rwxr-xr-xdebian/rules1
-rw-r--r--debian/simple-scan.lintian-overrides5
7 files changed, 30 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e95ad62
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+.bzr
+.bzrignore
+.pc
+debian/files
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 <debian@jff.email> 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 <debian@jff.email>
-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 <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 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