summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2020-04-29 08:14:38 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2020-04-29 08:14:38 +0200
commit55a1f6d3b8dcb0493a112602ea277a706554efcd (patch)
tree11c5c244c4a4da4784440ebc3f54b69e39e6b7eb /debian
parente5fe1a505ee9b04815b835db71ed47bd344dff7b (diff)
parent1edcc5bf1014e9f83eaee4e5f241cb53b8799297 (diff)
Merge branch 'release/debian/1.0.29-1_experimental4'debian/1.0.29-1_experimental4
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog6
-rw-r--r--debian/patches/0155-hurd_PATH_MAX.patch19
2 files changed, 24 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index dda03ca..00701ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sane-backends (1.0.29-1~experimental4) experimental; urgency=medium
+
+ * Add HOST_NAME_MAX to debian/patches/0155-hurd_PATH_MAX.patch.
+
+ -- Jörg Frings-Fürst <debian@jff.email> Sat, 25 Apr 2020 15:38:30 +0200
+
sane-backends (1.0.29-1~experimental3) experimental; urgency=medium
* Refresh patches/0155-hurd_PATH_MAX.patch.
diff --git a/debian/patches/0155-hurd_PATH_MAX.patch b/debian/patches/0155-hurd_PATH_MAX.patch
index 88a2614..4a76248 100644
--- a/debian/patches/0155-hurd_PATH_MAX.patch
+++ b/debian/patches/0155-hurd_PATH_MAX.patch
@@ -1,6 +1,6 @@
Description: Add PATH_MAX if undefined
Author: Jörg Frings-Fürst <debian@jff.email>
-Last-Update: 2020-04-01
+Last-Update: 2020-04-17
Index: trunk/backend/escl/escl_capabilities.c
===================================================================
--- trunk.orig/backend/escl/escl_capabilities.c
@@ -345,3 +345,20 @@ Index: trunk/backend/test.c
static SANE_Bool inited = SANE_FALSE;
static SANE_Device **sane_device_list = 0;
static Test_Device *first_test_device = 0;
+Index: trunk/backend/pixma/pixma_bjnp.c
+===================================================================
+--- trunk.orig/backend/pixma/pixma_bjnp.c
++++ trunk/backend/pixma/pixma_bjnp.c
+@@ -110,6 +110,12 @@
+ # define SSIZE_MAX LONG_MAX
+ #endif
+
++#ifndef HOST_NAME_MAX
++ #define HOST_NAME_MAX 64
++#endif
++
++
++
+ /* static data */
+ static bjnp_device_t device[BJNP_NO_DEVICES];
+ static int bjnp_no_devices = 0;