summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2019-04-28 12:37:18 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2019-04-28 12:37:18 +0200
commite3843a9e77c42013364f736b8e0abd44b942643d (patch)
tree392342220d45cc4151f0f98ecf18c59c851ad224 /debian
parentbace12e994a5df9b013e8911429c805bf90317b2 (diff)
Refresh d/patches/0100-source_spelling.patch; New d/*.lintian-overrides
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog3
-rw-r--r--debian/libsane-common.lintian-overrides6
-rw-r--r--debian/libsane.install2
-rw-r--r--debian/libsane1.dirs1
-rw-r--r--debian/libsane1.install2
-rw-r--r--debian/libsane1.lintian-overrides6
-rw-r--r--debian/patches/0100-source_spelling.patch19
7 files changed, 35 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 8ff01c8..784f47a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,9 @@ sane-backends (1.0.27-4~experimental1) UNRELEASED; urgency=medium
- debian/control: rename package libsane to libsane1.
- debian/rules: Change filenames and directories from libsane to libsane1.
- Rename debian/99-libsane.rules to debian/99-libsane1.rules.
+ * Refresh debian/patches/0100-source_spelling.patch.
+ * New debian/libsane-common.lintian-overrides and
+ debian/libsane1.lintian-overrides to override false positive spelling-error.
-- Jörg Frings-Fürst <debian@jff.email> Wed, 07 Nov 2018 13:21:48 +0100
diff --git a/debian/libsane-common.lintian-overrides b/debian/libsane-common.lintian-overrides
new file mode 100644
index 0000000..1386138
--- /dev/null
+++ b/debian/libsane-common.lintian-overrides
@@ -0,0 +1,6 @@
+#
+# doc/gt68xx/gt68xx.CHANGES:442:- Added "afe" option for gt68xx.conf for selecting default afe values.
+#
+libsane-common: spelling-error-in-manpage usr/share/man/man5/sane-gt68xx.5.gz afe safe
+libsane-common: spelling-error-in-manpage usr/share/man/man5/sane-gt68xx.5.gz afe safe
+libsane-common: spelling-error-in-manpage usr/share/man/man5/sane-gt68xx.5.gz afe safe
diff --git a/debian/libsane.install b/debian/libsane.install
index ce0868c..f0d7a75 100644
--- a/debian/libsane.install
+++ b/debian/libsane.install
@@ -1,3 +1,3 @@
usr/lib/*/*.so.*
usr/lib/*/sane/*.so.*
-debian/99-libsane.rules /etc/udev/rules.d/
+debian/99-libsane.rules /lib/udev/rules.d/
diff --git a/debian/libsane1.dirs b/debian/libsane1.dirs
index 863867a..ad3a3cc 100644
--- a/debian/libsane1.dirs
+++ b/debian/libsane1.dirs
@@ -1,2 +1 @@
/lib/udev/hwdb.d/
-/etc/udev/rules.d/
diff --git a/debian/libsane1.install b/debian/libsane1.install
index 2b6aa59..ba37095 100644
--- a/debian/libsane1.install
+++ b/debian/libsane1.install
@@ -1,3 +1,3 @@
usr/lib/*/*.so.*
usr/lib/*/sane/*.so.*
-debian/99-libsane1.rules /etc/udev/rules.d/
+debian/99-libsane1.rules /lib/udev/rules.d/
diff --git a/debian/libsane1.lintian-overrides b/debian/libsane1.lintian-overrides
new file mode 100644
index 0000000..125b615
--- /dev/null
+++ b/debian/libsane1.lintian-overrides
@@ -0,0 +1,6 @@
+#
+# doc/gt68xx/gt68xx.CHANGES:442:- Added "afe" option for gt68xx.conf for selecting default afe values.
+#
+libsane1: spelling-error-in-binary usr/lib/x86_64-linux-gnu/sane/libsane-artec_eplus48u.so.1.0.27 afe safe
+libsane1: spelling-error-in-binary usr/lib/x86_64-linux-gnu/sane/libsane-canon_dr.so.1.0.27 afe safe
+libsane1: spelling-error-in-binary usr/lib/x86_64-linux-gnu/sane/libsane-gt68xx.so.1.0.27 afe safe
diff --git a/debian/patches/0100-source_spelling.patch b/debian/patches/0100-source_spelling.patch
index 1d26086..7e638f2 100644
--- a/debian/patches/0100-source_spelling.patch
+++ b/debian/patches/0100-source_spelling.patch
@@ -1,6 +1,6 @@
Description: Correct source typos
Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Last-Update: 2018-05-19
+Last-Update: 2019-04-28
----
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: trunk/backend/pixma_bjnp.c
@@ -165,3 +165,20 @@ Index: trunk/backend/apple.c
s->opt[OPT_VOLT_REF].type = SANE_TYPE_BOOL;
if (s->hw->ScannerModel!=COLORONESCANNER)
s->opt[OPT_VOLT_REF].cap |= SANE_CAP_INACTIVE;
+Index: trunk/tools/umax_pp.c
+===================================================================
+--- trunk.orig/tools/umax_pp.c
++++ trunk/tools/umax_pp.c
+@@ -370,10 +370,10 @@ main (int argc, char **argv)
+ if (sanei_umax_pp_initPort (port, name) != 1)
+ {
+ if (port)
+- fprintf (stderr, "failed to gain direct acces to port 0x%X!\n",
++ fprintf (stderr, "failed to gain direct access to port 0x%X!\n",
+ port);
+ else
+- fprintf (stderr, "failed to gain acces to device %s!\n", name);
++ fprintf (stderr, "failed to gain access to device %s!\n", name);
+ return 0;
+ }
+ }