summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2024-03-17 13:54:57 +0100
committerJörg Frings-Fürst <debian@jff.email>2024-03-17 13:54:57 +0100
commitd710b300cd31dad02f0650258edc01343613b696 (patch)
tree66855edbfe42e356dd18c499bbbf73c74b1fc4f0
parent95c2c9b90d22a53cae0ea4b11e8ad2747c78b1b2 (diff)
parent0b448b52114a93e125284957d83f68557623e258 (diff)
Merge tag 'debian/1.0.14-18' into developdevelop
bugfix release
-rw-r--r--debian/changelog10
-rw-r--r--debian/control4
-rw-r--r--debian/copyright2
-rw-r--r--debian/files1
-rw-r--r--debian/patches/0145-ftbfs-impfuncdef.patch7
5 files changed, 18 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index ba1d333..7e066e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
-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.
+ Fix FTBFS -Werror=implicit-function-declaration (Closes: #1066571).
+ * debian/copyright
+ - Add year 2024 to myself.
+ * debian/control:
+ - Change to new repository.
- -- Jörg Frings-Fürst <debian@jff.email> Wed, 13 Mar 2024 18:23:32 +0100
+ -- Jörg Frings-Fürst <debian@jff.email> Wed, 13 Mar 2024 20:45:20 +0100
sane-frontends (1.0.14-17) unstable; urgency=medium
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
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 <kevind@rahul.net>
2002-2009 Julien BLACHE <jblache@debian.org>
- 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: include/*.h
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
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 <debian@jff.email>
+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