diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-06-25 20:34:22 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-06-25 20:34:22 +0200 |
commit | 826845e71c1621a92deaf89d43f3ea3e85429f7b (patch) | |
tree | 74c4c85b6645dc74128d56caba88c27247fa1de2 | |
parent | f88e4be52eca658d900f75a04a4deec68668ec50 (diff) | |
parent | 9994b98f3a617f266b42124efb04d25b2cb89732 (diff) |
Merge branch 'release/1.0.27-1_experimental5'1.0.27-1_experimental5
-rw-r--r-- | debian/changelog | 17 | ||||
-rw-r--r-- | debian/control | 6 | ||||
-rw-r--r-- | debian/libsane1.symbols.arm64 | 2 | ||||
-rw-r--r-- | debian/libsane1.symbols.hppa | 2 | ||||
-rw-r--r-- | debian/libsane1.symbols.m68k | 2 | ||||
-rw-r--r-- | debian/libsane1.symbols.mips | 2 | ||||
-rw-r--r-- | debian/libsane1.symbols.mips64el | 2 | ||||
-rw-r--r-- | debian/libsane1.symbols.mipsel | 2 | ||||
-rw-r--r-- | debian/libsane1.symbols.powerpc | 2 | ||||
-rw-r--r-- | debian/libsane1.symbols.powerpcspe | 2 | ||||
-rw-r--r-- | debian/libsane1.symbols.ppc64 | 2 | ||||
-rw-r--r-- | debian/libsane1.symbols.ppc64el | 2 | ||||
-rw-r--r-- | debian/libsane1.symbols.s390x | 2 | ||||
-rw-r--r-- | debian/libsane1.symbols.sh4 | 2 | ||||
-rw-r--r-- | debian/libsane1.symbols.sparc64 (renamed from debian/libsane1.symbols.sparc54) | 0 | ||||
-rw-r--r-- | debian/patches/0100-source_spelling.patch | 15 | ||||
-rwxr-xr-x | debian/rules | 8 |
17 files changed, 41 insertions, 29 deletions
diff --git a/debian/changelog b/debian/changelog index 3ce7ac9..cdb72b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +sane-backends (1.0.27-1~experimental5) experimental; urgency=medium + + * debian/rules: + - Add rule to enable --enable-parport-directio for all + architectures except hurd-i386. + * debian/control: + - Fix FTBFS on kfreebsd-*: + + Exclude libsnmp-dev from Build-Depends for kfreebsd-any. + - Change VCS-* to point to the new repository. + * Refresh symbols files for the following architectures: + - arm64, hppa, m68k, mips, mips64el, mipsel, powerpc, + powerpcspe, ppc64, ppc64el, s390x, sh4. + * Refresh debian/patches/0100-source_spelling.patch to + fix typo in backend/apple.c. + + -- Jörg Frings-Fürst <debian@jff.email> Thu, 31 May 2018 08:48:38 +0200 + sane-backends (1.0.27-1~experimental4) experimental; urgency=medium * Change to my new email address. diff --git a/debian/control b/debian/control index d815329..8dc9ce7 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: libieee1284-3-dev [!hurd-i386], libjpeg-dev, libltdl3-dev, - libsnmp-dev, + libsnmp-dev [!kfreebsd-any], libsystemd-dev [linux-any], libtiff-dev, libusb-1.0-0-dev, @@ -23,8 +23,8 @@ Build-Depends: po-debconf, xutils-dev Homepage: http://www.sane-project.org -Vcs-Git: git://anonscm.debian.org/collab-maint/sane-backends.git -Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/sane-backends.git +Vcs-Git: git://jff.email/opt/git/sane-backends.git +Vcs-Browser: https://jff.email/cgit/sane-backends.git Package: sane-utils Architecture: any diff --git a/debian/libsane1.symbols.arm64 b/debian/libsane1.symbols.arm64 index a79c5af..04a5076 100644 --- a/debian/libsane1.symbols.arm64 +++ b/debian/libsane1.symbols.arm64 @@ -5389,7 +5389,6 @@ libsane-plustek_pp.so.1 libsane1 #MINVER# sanei_pp_outb_addr@Base 1.0.25 sanei_pp_outb_ctrl@Base 1.0.25 sanei_pp_outb_data@Base 1.0.25 - sanei_pp_outb_epp@Base 1.0.25 sanei_pp_release@Base 1.0.25 sanei_pp_set_datadir@Base 1.0.25 sanei_pp_setmode@Base 1.0.25 @@ -7149,7 +7148,6 @@ libsane.so.1 libsane1 #MINVER# sanei_pp_outb_addr@Base 1.0.25 sanei_pp_outb_ctrl@Base 1.0.25 sanei_pp_outb_data@Base 1.0.25 - sanei_pp_outb_epp@Base 1.0.25 sanei_pp_release@Base 1.0.25 sanei_pp_set_datadir@Base 1.0.25 sanei_pp_setmode@Base 1.0.25 diff --git a/debian/libsane1.symbols.hppa b/debian/libsane1.symbols.hppa index a79c5af..04a5076 100644 --- a/debian/libsane1.symbols.hppa +++ b/debian/libsane1.symbols.hppa @@ -5389,7 +5389,6 @@ libsane-plustek_pp.so.1 libsane1 #MINVER# sanei_pp_outb_addr@Base 1.0.25 sanei_pp_outb_ctrl@Base 1.0.25 sanei_pp_outb_data@Base 1.0.25 - sanei_pp_outb_epp@Base 1.0.25 sanei_pp_release@Base 1.0.25 sanei_pp_set_datadir@Base 1.0.25 sanei_pp_setmode@Base 1.0.25 @@ -7149,7 +7148,6 @@ libsane.so.1 libsane1 #MINVER# sanei_pp_outb_addr@Base 1.0.25 sanei_pp_outb_ctrl@Base 1.0.25 sanei_pp_outb_data@Base 1.0.25 - sanei_pp_outb_epp@Base 1.0.25 sanei_pp_release@Base 1.0.25 sanei_pp_set_datadir@Base 1.0.25 sanei_pp_setmode@Base 1.0.25 diff --git a/debian/libsane1.symbols.m68k b/debian/libsane1.symbols.m68k index a79c5af..04a5076 100644 --- a/debian/libsane1.symbols.m68k +++ b/debian/libsane1.symbols.m68k @@ -5389,7 +5389,6 @@ libsane-plustek_pp.so.1 libsane1 #MINVER# sanei_pp_outb_addr@Base 1.0.25 sanei_pp_outb_ctrl@Base 1.0.25 sanei_pp_outb_data@Base 1.0.25 - sanei_pp_outb_epp@Base 1.0.25 sanei_pp_release@Base 1.0.25 sanei_pp_set_datadir@Base 1.0.25 sanei_pp_setmode@Base 1.0.25 @@ -7149,7 +7148,6 @@ libsane.so.1 libsane1 #MINVER# sanei_pp_outb_addr@Base 1.0.25 sanei_pp_outb_ctrl@Base 1.0.25 sanei_pp_outb_data@Base 1.0.25 - sanei_pp_outb_epp@Base 1.0.25 sanei_pp_release@Base 1.0.25 sanei_pp_set_datadir@Base 1.0.25 sanei_pp_setmode@Base 1.0.25 diff --git a/debian/libsane1.symbols.mips b/debian/libsane1.symbols.mips index a79c5af..04a5076 100644 --- a/debian/libsane1.symbols.mips +++ b/debian/libsane1.symbols.mips @@ -5389,7 +5389,6 @@ libsane-plustek_pp.so.1 libsane1 #MINVER# sanei_pp_outb_addr@Base 1.0.25 sanei_pp_outb_ctrl@Base 1.0.25 sanei_pp_outb_data@Base 1.0.25 - sanei_pp_outb_epp@Base 1.0.25 sanei_pp_release@Base 1.0.25 sanei_pp_set_datadir@Base 1.0.25 sanei_pp_setmode@Base 1.0.25 @@ -7149,7 +7148,6 @@ libsane.so.1 libsane1 #MINVER# sanei_pp_outb_addr@Base 1.0.25 sanei_pp_outb_ctrl@Base 1.0.25 sanei_pp_outb_data@Base 1.0.25 - sanei_pp_outb_epp@Base 1.0.25 sanei_pp_release@Base 1.0.25 sanei_pp_set_datadir@Base 1.0.25 sanei_pp_setmode@Base 1.0.25 diff --git a/debian/libsane1.symbols.mips64el b/debian/libsane1.symbols.mips64el index a79c5af..04a5076 100644 --- a/debian/libsane1.symbols.mips64el +++ b/debian/libsane1.symbols.mips64el @@ -5389,7 +5389,6 @@ libsane-plustek_pp.so.1 libsane1 #MINVER# sanei_pp_outb_addr@Base 1.0.25 sanei_pp_outb_ctrl@Base 1.0.25 sanei_pp_outb_data@Base 1.0.25 - sanei_pp_outb_epp@Base 1.0.25 sanei_pp_release@Base 1.0.25 sanei_pp_set_datadir@Base 1.0.25 sanei_pp_setmode@Base 1.0.25 @@ -7149,7 +7148,6 @@ libsane.so.1 libsane1 #MINVER# sanei_pp_outb_addr@Base 1.0.25 sanei_pp_outb_ctrl@Base 1.0.25 sanei_pp_outb_data@Base 1.0.25 - sanei_pp_outb_epp@Base 1.0.25 sanei_pp_release@Base 1.0.25 sanei_pp_set_datadir@Base 1.0.25 sanei_pp_setmode@Base 1.0.25 diff --git a/debian/libsane1.symbols.mipsel b/debian/libsane1.symbols.mipsel index a79c5af..04a5076 100644 --- a/debian/libsane1.symbols.mipsel +++ b/debian/libsane1.symbols.mipsel @@ -5389,7 +5389,6 @@ libsane-plustek_pp.so.1 libsane1 #MINVER# sanei_pp_outb_addr@Base 1.0.25 sanei_pp_outb_ctrl@Base 1.0.25 sanei_pp_outb_data@Base 1.0.25 - sanei_pp_outb_epp@Base 1.0.25 sanei_pp_release@Base 1.0.25 sanei_pp_set_datadir@Base 1.0.25 sanei_pp_setmode@Base 1.0.25 @@ -7149,7 +7148,6 @@ libsane.so.1 libsane1 #MINVER# sanei_pp_outb_addr@Base 1.0.25 sanei_pp_outb_ctrl@Base 1.0.25 sanei_pp_outb_data@Base 1.0.25 - sanei_pp_outb_epp@Base 1.0.25 sanei_pp_release@Base 1.0.25 sanei_pp_set_datadir@Base 1.0.25 sanei_pp_setmode@Base 1.0.25 diff --git a/debian/libsane1.symbols.powerpc b/debian/libsane1.symbols.powerpc index a79c5af..04a5076 100644 --- a/debian/libsane1.symbols.powerpc +++ b/debian/libsane1.symbols.powerpc @@ -5389,7 +5389,6 @@ libsane-plustek_pp.so.1 libsane1 #MINVER# sanei_pp_outb_addr@Base 1.0.25 sanei_pp_outb_ctrl@Base 1.0.25 sanei_pp_outb_data@Base 1.0.25 - sanei_pp_outb_epp@Base 1.0.25 sanei_pp_release@Base 1.0.25 sanei_pp_set_datadir@Base 1.0.25 sanei_pp_setmode@Base 1.0.25 @@ -7149,7 +7148,6 @@ libsane.so.1 libsane1 #MINVER# sanei_pp_outb_addr@Base 1.0.25 sanei_pp_outb_ctrl@Base 1.0.25 sanei_pp_outb_data@Base 1.0.25 - sanei_pp_outb_epp@Base 1.0.25 sanei_pp_release@Base 1.0.25 sanei_pp_set_datadir@Base 1.0.25 sanei_pp_setmode@Base 1.0.25 diff --git a/debian/libsane1.symbols.powerpcspe b/debian/libsane1.symbols.powerpcspe index a79c5af..04a5076 100644 --- a/debian/libsane1.symbols.powerpcspe +++ b/debian/libsane1.symbols.powerpcspe @@ -5389,7 +5389,6 @@ libsane-plustek_pp.so.1 libsane1 #MINVER# sanei_pp_outb_addr@Base 1.0.25 sanei_pp_outb_ctrl@Base 1.0.25 sanei_pp_outb_data@Base 1.0.25 - sanei_pp_outb_epp@Base 1.0.25 sanei_pp_release@Base 1.0.25 sanei_pp_set_datadir@Base 1.0.25 sanei_pp_setmode@Base 1.0.25 @@ -7149,7 +7148,6 @@ libsane.so.1 libsane1 #MINVER# sanei_pp_outb_addr@Base 1.0.25 sanei_pp_outb_ctrl@Base 1.0.25 sanei_pp_outb_data@Base 1.0.25 - sanei_pp_outb_epp@Base 1.0.25 sanei_pp_release@Base 1.0.25 sanei_pp_set_datadir@Base 1.0.25 sanei_pp_setmode@Base 1.0.25 diff --git a/debian/libsane1.symbols.ppc64 b/debian/libsane1.symbols.ppc64 index a79c5af..04a5076 100644 --- a/debian/libsane1.symbols.ppc64 +++ b/debian/libsane1.symbols.ppc64 @@ -5389,7 +5389,6 @@ libsane-plustek_pp.so.1 libsane1 #MINVER# sanei_pp_outb_addr@Base 1.0.25 sanei_pp_outb_ctrl@Base 1.0.25 sanei_pp_outb_data@Base 1.0.25 - sanei_pp_outb_epp@Base 1.0.25 sanei_pp_release@Base 1.0.25 sanei_pp_set_datadir@Base 1.0.25 sanei_pp_setmode@Base 1.0.25 @@ -7149,7 +7148,6 @@ libsane.so.1 libsane1 #MINVER# sanei_pp_outb_addr@Base 1.0.25 sanei_pp_outb_ctrl@Base 1.0.25 sanei_pp_outb_data@Base 1.0.25 - sanei_pp_outb_epp@Base 1.0.25 sanei_pp_release@Base 1.0.25 sanei_pp_set_datadir@Base 1.0.25 sanei_pp_setmode@Base 1.0.25 diff --git a/debian/libsane1.symbols.ppc64el b/debian/libsane1.symbols.ppc64el index a79c5af..04a5076 100644 --- a/debian/libsane1.symbols.ppc64el +++ b/debian/libsane1.symbols.ppc64el @@ -5389,7 +5389,6 @@ libsane-plustek_pp.so.1 libsane1 #MINVER# sanei_pp_outb_addr@Base 1.0.25 sanei_pp_outb_ctrl@Base 1.0.25 sanei_pp_outb_data@Base 1.0.25 - sanei_pp_outb_epp@Base 1.0.25 sanei_pp_release@Base 1.0.25 sanei_pp_set_datadir@Base 1.0.25 sanei_pp_setmode@Base 1.0.25 @@ -7149,7 +7148,6 @@ libsane.so.1 libsane1 #MINVER# sanei_pp_outb_addr@Base 1.0.25 sanei_pp_outb_ctrl@Base 1.0.25 sanei_pp_outb_data@Base 1.0.25 - sanei_pp_outb_epp@Base 1.0.25 sanei_pp_release@Base 1.0.25 sanei_pp_set_datadir@Base 1.0.25 sanei_pp_setmode@Base 1.0.25 diff --git a/debian/libsane1.symbols.s390x b/debian/libsane1.symbols.s390x index a79c5af..04a5076 100644 --- a/debian/libsane1.symbols.s390x +++ b/debian/libsane1.symbols.s390x @@ -5389,7 +5389,6 @@ libsane-plustek_pp.so.1 libsane1 #MINVER# sanei_pp_outb_addr@Base 1.0.25 sanei_pp_outb_ctrl@Base 1.0.25 sanei_pp_outb_data@Base 1.0.25 - sanei_pp_outb_epp@Base 1.0.25 sanei_pp_release@Base 1.0.25 sanei_pp_set_datadir@Base 1.0.25 sanei_pp_setmode@Base 1.0.25 @@ -7149,7 +7148,6 @@ libsane.so.1 libsane1 #MINVER# sanei_pp_outb_addr@Base 1.0.25 sanei_pp_outb_ctrl@Base 1.0.25 sanei_pp_outb_data@Base 1.0.25 - sanei_pp_outb_epp@Base 1.0.25 sanei_pp_release@Base 1.0.25 sanei_pp_set_datadir@Base 1.0.25 sanei_pp_setmode@Base 1.0.25 diff --git a/debian/libsane1.symbols.sh4 b/debian/libsane1.symbols.sh4 index a79c5af..04a5076 100644 --- a/debian/libsane1.symbols.sh4 +++ b/debian/libsane1.symbols.sh4 @@ -5389,7 +5389,6 @@ libsane-plustek_pp.so.1 libsane1 #MINVER# sanei_pp_outb_addr@Base 1.0.25 sanei_pp_outb_ctrl@Base 1.0.25 sanei_pp_outb_data@Base 1.0.25 - sanei_pp_outb_epp@Base 1.0.25 sanei_pp_release@Base 1.0.25 sanei_pp_set_datadir@Base 1.0.25 sanei_pp_setmode@Base 1.0.25 @@ -7149,7 +7148,6 @@ libsane.so.1 libsane1 #MINVER# sanei_pp_outb_addr@Base 1.0.25 sanei_pp_outb_ctrl@Base 1.0.25 sanei_pp_outb_data@Base 1.0.25 - sanei_pp_outb_epp@Base 1.0.25 sanei_pp_release@Base 1.0.25 sanei_pp_set_datadir@Base 1.0.25 sanei_pp_setmode@Base 1.0.25 diff --git a/debian/libsane1.symbols.sparc54 b/debian/libsane1.symbols.sparc64 index a79c5af..a79c5af 100644 --- a/debian/libsane1.symbols.sparc54 +++ b/debian/libsane1.symbols.sparc64 diff --git a/debian/patches/0100-source_spelling.patch b/debian/patches/0100-source_spelling.patch index 0985e99..1d26086 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: 2017-06-20 +Last-Update: 2018-05-19 ---- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ Index: trunk/backend/pixma_bjnp.c @@ -152,3 +152,16 @@ Index: trunk/doc/sane-kodak.man which reports itself to be a scanner made by 'KODAK'. .RE .PP +Index: trunk/backend/apple.c +=================================================================== +--- trunk.orig/backend/apple.c ++++ trunk/backend/apple.c +@@ -1546,7 +1546,7 @@ init_options (Apple_Scanner * s) + /* Use volt_ref */ + s->opt[OPT_VOLT_REF].name = "volt-ref"; + s->opt[OPT_VOLT_REF].title = "Volt Reference"; +- s->opt[OPT_VOLT_REF].desc ="It's brightness equivalant."; ++ s->opt[OPT_VOLT_REF].desc ="It's brightness equivalent."; + s->opt[OPT_VOLT_REF].type = SANE_TYPE_BOOL; + if (s->hw->ScannerModel!=COLORONESCANNER) + s->opt[OPT_VOLT_REF].cap |= SANE_CAP_INACTIVE; diff --git a/debian/rules b/debian/rules index 91512fa..69b8f35 100755 --- a/debian/rules +++ b/debian/rules @@ -15,6 +15,12 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) STRIP = "" endif +ifeq (,$(filter hurd-i386,$(DEB_HOST_ARCH))) + INS_CONF = --enable-parport-directio +else + INS_CONF = "" +endif + %: dh $@ @@ -37,7 +43,7 @@ override_dh_auto_configure: --enable-pnm-backend \ --with-usb \ --without-v4l \ - --enable-parport-directio + $(INS_CONF) override_dh_autoreconf: dh_autoreconf -Xlibtool.m4 |