From 95c2c9b90d22a53cae0ea4b11e8ad2747c78b1b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 13 Mar 2024 20:04:14 +0100 Subject: New d/p/0145-ftbfs-impfuncdef.patch --- debian/changelog | 7 +++++++ debian/patches/0145-ftbfs-impfuncdef.patch | 24 ++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 32 insertions(+) create mode 100644 debian/patches/0145-ftbfs-impfuncdef.patch diff --git a/debian/changelog b/debian/changelog index 4895669..ba1d333 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +sane-frontends (1.0.14-18) UNRELEASED; urgency=medium + + * New debian/patches/0145-ftbfs-impfuncdef.patch. + Fix FTBFS -Werror=implicit-function-declaration. + + -- Jörg Frings-Fürst Wed, 13 Mar 2024 18:23:32 +0100 + sane-frontends (1.0.14-17) unstable; urgency=medium * debian/patches/0001-fix_missing_sane-config.patch: diff --git a/debian/patches/0145-ftbfs-impfuncdef.patch b/debian/patches/0145-ftbfs-impfuncdef.patch new file mode 100644 index 0000000..4e44b6b --- /dev/null +++ b/debian/patches/0145-ftbfs-impfuncdef.patch @@ -0,0 +1,24 @@ +Index: trunk/include/sane/sanei_debug.h +=================================================================== +--- trunk.orig/include/sane/sanei_debug.h ++++ trunk/include/sane/sanei_debug.h +@@ -95,7 +95,8 @@ + #ifdef NDEBUG + + extern void sanei_debug_ndebug (int level, const char *msg, ...); +- ++ ++ + # define DBG_LEVEL (0) + # define DBG_INIT() + # define DBG sanei_debug_ndebug +@@ -167,6 +168,9 @@ DBG_LOCAL (int level, const char *msg, . + # define DBG DBG_LOCAL + + extern void sanei_init_debug (const char * backend, int * debug_level_var); ++ ++/* fix -Werror=implicit-function-declaration */ ++int isfdtype(int fd, int fdtype); + + /** @hideinitializer*/ + # define IF_DBG(x) x diff --git a/debian/patches/series b/debian/patches/series index 64afa25..fb328b5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ +0145-ftbfs-impfuncdef.patch 0001-fix_missing_sane-config.patch 0100-xcam.c_dead_code.patch 0105-scanadf_options_fix.patch -- cgit v1.2.3 From 5962ff86d8ba34378c47de9c7f24a86897451bf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 13 Mar 2024 20:14:08 +0100 Subject: d/copyright: Add year 2024 to myself --- debian/changelog | 2 ++ debian/copyright | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ba1d333..7bc4ad8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ sane-frontends (1.0.14-18) UNRELEASED; urgency=medium * New debian/patches/0145-ftbfs-impfuncdef.patch. Fix FTBFS -Werror=implicit-function-declaration. + * debian/copyright + - Add year 2024 to myself. -- Jörg Frings-Fürst Wed, 13 Mar 2024 18:23:32 +0100 diff --git a/debian/copyright b/debian/copyright index 16becba..faa2000 100644 --- a/debian/copyright +++ b/debian/copyright @@ -15,7 +15,7 @@ License: GPL-2+ with sane exception Files: debian/* Copyright: 1997-2002 Kevin Dalley 2002-2009 Julien BLACHE - 2014-2023 Jörg Frings-Fürst + 2014-2024 Jörg Frings-Fürst License: GPL-2+ with sane exception Files: include/*.h -- cgit v1.2.3 From 74d63ae2102011548a772956f132626e43271a6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 13 Mar 2024 20:36:22 +0100 Subject: Add DEP-3 header --- debian/patches/0145-ftbfs-impfuncdef.patch | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/patches/0145-ftbfs-impfuncdef.patch b/debian/patches/0145-ftbfs-impfuncdef.patch index 4e44b6b..6ff4051 100644 --- a/debian/patches/0145-ftbfs-impfuncdef.patch +++ b/debian/patches/0145-ftbfs-impfuncdef.patch @@ -1,3 +1,10 @@ +Description: Fix FTBFS with enabled -Werror=implicit-function-declaration +Author: Jörg Frings-Fürst +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1066571 +Forwarded: https://gitlab.com/sane-project/frontends/-/issues/37 +Last-Update: 2024-03-13 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ Index: trunk/include/sane/sanei_debug.h =================================================================== --- trunk.orig/include/sane/sanei_debug.h -- cgit v1.2.3 From 1c3fc8a031862d01f4b9c76e9b427f736eb7c1dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 13 Mar 2024 20:45:07 +0100 Subject: d/control: Change to new repository --- debian/changelog | 2 ++ debian/control | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7bc4ad8..c93c12a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ sane-frontends (1.0.14-18) UNRELEASED; urgency=medium Fix FTBFS -Werror=implicit-function-declaration. * debian/copyright - Add year 2024 to myself. + * debian/control: + - Change to new repository. -- Jörg Frings-Fürst Wed, 13 Mar 2024 18:23:32 +0100 diff --git a/debian/control b/debian/control index 5359c13..31eb67c 100644 --- a/debian/control +++ b/debian/control @@ -10,8 +10,8 @@ Build-Depends: libgtk2.0-dev, libsane-dev Homepage: http://www.sane-project.org -Vcs-Git: git://jff.email/opt/git/sane-frontends.git -Vcs-Browser: https://jff.email/cgit/sane-frontends.git +Vcs-Git: git://git.jff.email/sane-frontends.git +Vcs-Browser: https://git.jff.email/cgit/sane-frontends.git Package: sane Architecture: any -- cgit v1.2.3 From e610a9b679e8cee246c59358370d68352ccbdb84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 13 Mar 2024 20:46:22 +0100 Subject: d/changelog: Change distribution to unstable, Change date and time --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c93c12a..82aae91 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -sane-frontends (1.0.14-18) UNRELEASED; urgency=medium +sane-frontends (1.0.14-18) unstable; urgency=medium * New debian/patches/0145-ftbfs-impfuncdef.patch. Fix FTBFS -Werror=implicit-function-declaration. @@ -7,7 +7,7 @@ sane-frontends (1.0.14-18) UNRELEASED; urgency=medium * debian/control: - Change to new repository. - -- Jörg Frings-Fürst Wed, 13 Mar 2024 18:23:32 +0100 + -- Jörg Frings-Fürst Wed, 13 Mar 2024 20:45:20 +0100 sane-frontends (1.0.14-17) unstable; urgency=medium -- cgit v1.2.3 From 3bc27dfebb76ea2089521651aaaf6a14b4f5362e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 13 Mar 2024 20:55:16 +0100 Subject: Add Closes --- debian/changelog | 2 +- debian/files | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 debian/files diff --git a/debian/changelog b/debian/changelog index 82aae91..7e066e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ sane-frontends (1.0.14-18) unstable; urgency=medium * New debian/patches/0145-ftbfs-impfuncdef.patch. - Fix FTBFS -Werror=implicit-function-declaration. + Fix FTBFS -Werror=implicit-function-declaration (Closes: #1066571). * debian/copyright - Add year 2024 to myself. * debian/control: diff --git a/debian/files b/debian/files new file mode 100644 index 0000000..e7f01b4 --- /dev/null +++ b/debian/files @@ -0,0 +1 @@ +sane-frontends_1.0.14-18_source.buildinfo graphics optional -- cgit v1.2.3