summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog17
-rw-r--r--debian/control2
-rw-r--r--debian/copyright6
-rw-r--r--debian/files1
-rw-r--r--debian/patches/0060-cross.patch4
-rw-r--r--debian/patches/0140-avahi.patch12
-rw-r--r--debian/patches/0145-avahi.patch4
-rw-r--r--debian/patches/0610-fix_groff_font_warnings.patch55
-rw-r--r--debian/patches/series1
-rw-r--r--debian/sane-utils.install1
-rw-r--r--debian/sane-utils.links2
11 files changed, 92 insertions, 13 deletions
diff --git a/debian/changelog b/debian/changelog
index 8f3a75a..8c0b96d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+sane-backends (1.3.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ - debian/sane-utils.install: Install new saned.install.md.
+ - Refresh patches.
+ * debian/control:
+ - Replace obsolete pkg-config with pkgconf.
+ * New debian/patches/0610-fix_groff_font_warnings.patch:
+ - Fix missing font messages.
+ * Install saned.service mask symlink into /usr (Closes: #1059186).
+ - Thanks to Chris Hofstaedtler <zeha@debian.org>.
+ * debian/copyright:
+ - Add 2024 to myself.
+ - New po/zh_CN.po.
+
+ -- Jörg Frings-Fürst <debian@jff.email> Sun, 03 Mar 2024 13:23:47 +0100
+
sane-backends (1.2.1-7) unstable; urgency=medium
* debian/rules:
diff --git a/debian/control b/debian/control
index 53528af..44c2738 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Build-Depends:
libtiff-dev,
libusb-1.0-0-dev,
libxml2-dev,
- pkg-config,
+ pkgconf,
po-debconf,
xutils-dev,
python3-minimal:any
diff --git a/debian/copyright b/debian/copyright
index 556e112..b5be539 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -15,7 +15,7 @@ Copyright: 1997-2002 Kevin Dalley <kevind@rahul.net>
2013 Mark Buda <hermit@acm.org>
2018 Laurent Bigonville <bigon@debian.org>
2019 John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
- 2014-2023 Jörg Frings-Fürst <debian@jff.email>
+ 2014-2024 Jörg Frings-Fürst <debian@jff.email>
License: GPL-2+ with sane exception
Files: backend/abaton.*
@@ -747,6 +747,10 @@ Copyright: 2002 Frank Zago <fzago@austin.rr.com>
2003-2010 Yann E. MORIN <yann.morin.1998@anciens.enib.fr>
License: GPL-2+ with sane exception
+Files: po/zh_CN.po
+Copyright: 2021-2024 Tyson Tan <tysontan@tysontan.com>
+License: GPL-2+ with sane exception
+
Files: frontend/saned.c
Copyright: 1997 Andreas Beck
2001-2004 Henning Meier-Geinitz
diff --git a/debian/files b/debian/files
new file mode 100644
index 0000000..a980a6d
--- /dev/null
+++ b/debian/files
@@ -0,0 +1 @@
+sane-backends_1.3.0-1_source.buildinfo graphics optional
diff --git a/debian/patches/0060-cross.patch b/debian/patches/0060-cross.patch
index 1c32cac..2bb5965 100644
--- a/debian/patches/0060-cross.patch
+++ b/debian/patches/0060-cross.patch
@@ -9,7 +9,7 @@ Index: trunk/acinclude.m4
===================================================================
--- trunk.orig/acinclude.m4
+++ trunk/acinclude.m4
-@@ -414,15 +414,19 @@ AC_DEFUN([SANE_CHECK_GPHOTO2],
+@@ -422,15 +422,19 @@ AC_DEFUN([SANE_CHECK_GPHOTO2],
# a program. And, if that works, then add the -l flags to
# GPHOTO2_LIBS and any other flags to GPHOTO2_LDFLAGS to pass to
# sane-config.
@@ -36,7 +36,7 @@ Index: trunk/acinclude.m4
saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${GPHOTO2_CPPFLAGS}"
saved_LIBS="${LIBS}"
-@@ -442,13 +446,13 @@ AC_DEFUN([SANE_CHECK_GPHOTO2],
+@@ -450,13 +454,13 @@ AC_DEFUN([SANE_CHECK_GPHOTO2],
GPHOTO2_LIBS=""
else
SANE_EXTRACT_LDFLAGS(GPHOTO2_LIBS, GPHOTO2_LDFLAGS)
diff --git a/debian/patches/0140-avahi.patch b/debian/patches/0140-avahi.patch
index b666bff..799b350 100644
--- a/debian/patches/0140-avahi.patch
+++ b/debian/patches/0140-avahi.patch
@@ -9,7 +9,7 @@ Index: trunk/backend/net.c
===================================================================
--- trunk.orig/backend/net.c
+++ trunk/backend/net.c
-@@ -769,7 +769,7 @@ net_avahi_browse_callback (AvahiServiceB
+@@ -798,7 +798,7 @@ net_avahi_browse_callback (AvahiServiceB
{
case AVAHI_BROWSER_FAILURE:
DBG (1, "net_avahi_browse_callback: %s\n", avahi_strerror (avahi_client_errno (avahi_service_browser_get_client (b))));
@@ -18,7 +18,7 @@ Index: trunk/backend/net.c
return;
case AVAHI_BROWSER_NEW:
-@@ -834,7 +834,7 @@ net_avahi_callback (AvahiClient *c, Avah
+@@ -863,7 +863,7 @@ net_avahi_callback (AvahiClient *c, Avah
if (avahi_browser == NULL)
{
DBG (1, "net_avahi_callback: could not create service browser: %s\n", avahi_strerror (avahi_client_errno (c)));
@@ -27,7 +27,7 @@ Index: trunk/backend/net.c
}
break;
-@@ -857,14 +857,14 @@ net_avahi_callback (AvahiClient *c, Avah
+@@ -886,14 +886,14 @@ net_avahi_callback (AvahiClient *c, Avah
if (avahi_client == NULL)
{
DBG (1, "net_avahi_init: could not create Avahi client: %s\n", avahi_strerror (error));
@@ -44,7 +44,7 @@ Index: trunk/backend/net.c
}
break;
}
-@@ -1043,12 +1043,12 @@ sane_init (SANE_Int * version_code, SANE
+@@ -1072,12 +1072,12 @@ sane_init (SANE_Int * version_code, SANE
continue;
}
#if WITH_AVAHI
@@ -59,7 +59,7 @@ Index: trunk/backend/net.c
#endif /* WITH_AVAHI */
}
-@@ -1094,12 +1094,12 @@ sane_init (SANE_Int * version_code, SANE
+@@ -1123,12 +1123,12 @@ sane_init (SANE_Int * version_code, SANE
continue;
#endif /* ENABLE_IPV6 */
#if WITH_AVAHI
@@ -74,7 +74,7 @@ Index: trunk/backend/net.c
#endif /* WITH_AVAHI */
}
free (copy);
-@@ -1517,11 +1517,11 @@ sane_open (SANE_String_Const full_name,
+@@ -1546,11 +1546,11 @@ sane_open (SANE_String_Const full_name,
"sane_open: device %s not found, trying to register it anyway\n",
nd_name);
#if WITH_AVAHI
diff --git a/debian/patches/0145-avahi.patch b/debian/patches/0145-avahi.patch
index a5d98ef..c63aea5 100644
--- a/debian/patches/0145-avahi.patch
+++ b/debian/patches/0145-avahi.patch
@@ -9,7 +9,7 @@ Index: trunk/backend/net.c
===================================================================
--- trunk.orig/backend/net.c
+++ trunk/backend/net.c
-@@ -962,10 +962,6 @@ sane_init (SANE_Int * version_code, SANE
+@@ -991,10 +991,6 @@ sane_init (SANE_Int * version_code, SANE
first_device = NULL;
first_handle = NULL;
@@ -20,7 +20,7 @@ Index: trunk/backend/net.c
auth_callback = authorize;
/* Return the version number of the sane-backends package to allow
-@@ -1117,6 +1113,11 @@ sane_init (SANE_Int * version_code, SANE
+@@ -1146,6 +1142,11 @@ sane_init (SANE_Int * version_code, SANE
DBG (2, "sane_init: connect timeout set to %d seconds from env\n", connect_timeout);
}
diff --git a/debian/patches/0610-fix_groff_font_warnings.patch b/debian/patches/0610-fix_groff_font_warnings.patch
new file mode 100644
index 0000000..8d20c2a
--- /dev/null
+++ b/debian/patches/0610-fix_groff_font_warnings.patch
@@ -0,0 +1,55 @@
+Description: Fix non portable font
+Author: Jörg Frings-Fürst <debian@jff.email>
+Bug: https://gitlab.com/sane-project/backends/-/issues/738
+Last-Update: 2024-03-03
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/doc/sane-hp5590.man
+===================================================================
+--- trunk.orig/doc/sane-hp5590.man
++++ trunk/doc/sane-hp5590.man
+@@ -45,7 +45,7 @@ or
+ Valid command line options and their syntax can be listed by using:
+ .IP
+ .nf
+-\f[C]
++\f[I]
+ scanimage --help -d hp5590:interface:device
+ \f[R]
+ .fi
+@@ -63,7 +63,7 @@ on the first scanner identified.
+ Use the command:
+ .IP
+ .nf
+-\f[C]
++\f[I]
+ scanimage -L
+ \f[R]
+ .fi
+@@ -255,7 +255,7 @@ to be included in
+ .I hp5590.conf
+ .IP
+ .nf
+-\f[C]
++\f[I]
+ device hp5590 {
+ # Device matching
+ filter = \[dq]\[ha]hp5590.*\[dq]
+@@ -285,7 +285,7 @@ device hp5590 {
+ \f[B]scan_action.script\f[R]
+ .IP
+ .nf
+-\f[C]
++\f[I]
+ #!/bin/bash
+ echo device = $SCANBD_DEVICE
+ echo action = $SCANBD_ACTION
+@@ -319,7 +319,7 @@ variable controls the debug level for th
+ Higher debug levels increase the verbosity of the output:
+ .IP
+ .nf
+-\f[C]
++\f[I]
+ 10 - generic processing
+ 20 - verbose backend messages
+ 40 - HP5590 high-level commands
diff --git a/debian/patches/series b/debian/patches/series
index ac4a4b6..b03678d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@
0060-cross.patch
0605-fix_groff-warnings.patch
0200-disable-check-equal-stderr.patch
+0610-fix_groff_font_warnings.patch
diff --git a/debian/sane-utils.install b/debian/sane-utils.install
index c6afd3e..1718f2f 100644
--- a/debian/sane-utils.install
+++ b/debian/sane-utils.install
@@ -4,3 +4,4 @@ usr/bin/sane-find-scanner
usr/bin/scanimage
usr/sbin/saned
usr/bin/umax_pp
+usr/share/doc/libsane/saned/saned.install.md usr/share/doc/sane-utils/saned.install.md
diff --git a/debian/sane-utils.links b/debian/sane-utils.links
index 50ffd0e..8f6000d 100644
--- a/debian/sane-utils.links
+++ b/debian/sane-utils.links
@@ -1 +1 @@
-/dev/null /lib/systemd/system/saned.service
+/dev/null /usr/lib/systemd/system/saned.service
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 21:54:56 +0000