From 81242a81e3be5806970cf68aa9fc075886b443ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 19 Aug 2021 07:19:48 +0200 Subject: Switch from gtk2 to gtk-3 --- debian/changelog | 7 +++++++ debian/control | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ffc2877..1e8da84 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +sane-frontends (1.0.14-17) UNRELEASED; urgency=medium + + * Switch from gtk2 to gtk-3 (Closes: #967735): + - debian/control: Change libgtk2.0-dev to libgtk-3-dev. + + -- Jörg Frings-Fürst Fri, 25 Sep 2020 08:56:08 +0200 + sane-frontends (1.0.14-16) unstable; urgency=medium * debian/watch: Fix to new gitlab download structure. diff --git a/debian/control b/debian/control index 37890fb..7ae4ffa 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Rules-Requires-Root: no Build-Depends: debhelper-compat (= 13), libgimp2.0-dev, - libgtk2.0-dev, + libgtk-3-dev, libsane-dev Homepage: http://www.sane-project.org Vcs-Git: git://jff.email/opt/git/sane-frontends.git -- cgit v1.2.3 From 95d323d21ebece74f6741bbd50cdf11003bb83ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 17 Feb 2023 09:33:57 +0100 Subject: Revert "Switch from gtk2 to gtk-3" This reverts commit 81242a81e3be5806970cf68aa9fc075886b443ed. --- debian/changelog | 7 ------- debian/control | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1e8da84..ffc2877 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,3 @@ -sane-frontends (1.0.14-17) UNRELEASED; urgency=medium - - * Switch from gtk2 to gtk-3 (Closes: #967735): - - debian/control: Change libgtk2.0-dev to libgtk-3-dev. - - -- Jörg Frings-Fürst Fri, 25 Sep 2020 08:56:08 +0200 - sane-frontends (1.0.14-16) unstable; urgency=medium * debian/watch: Fix to new gitlab download structure. diff --git a/debian/control b/debian/control index 7ae4ffa..37890fb 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Rules-Requires-Root: no Build-Depends: debhelper-compat (= 13), libgimp2.0-dev, - libgtk-3-dev, + libgtk2.0-dev, libsane-dev Homepage: http://www.sane-project.org Vcs-Git: git://jff.email/opt/git/sane-frontends.git -- cgit v1.2.3 From fe397f4137fcb7d427641836984ca6bbbd45b4c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 17 Feb 2023 15:53:35 +0100 Subject: d/p/0001-fix_missing_sane-config.patch: Fix FTBFS --- debian/changelog | 8 ++++++++ debian/patches/0001-fix_missing_sane-config.patch | 7 +++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index ffc2877..12b045c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +sane-frontends (1.0.14-17) UNRELEASED; urgency=medium + + * debian/patches/0001-fix_missing_sane-config.patch: + - Fix FTBFS (Closes: #1031453). + Thanks to Lucas Nussbaum + + -- Jörg Frings-Fürst Fri, 17 Feb 2023 15:40:19 +0100 + sane-frontends (1.0.14-16) unstable; urgency=medium * debian/watch: Fix to new gitlab download structure. diff --git a/debian/patches/0001-fix_missing_sane-config.patch b/debian/patches/0001-fix_missing_sane-config.patch index 8804be0..5ad31e5 100644 --- a/debian/patches/0001-fix_missing_sane-config.patch +++ b/debian/patches/0001-fix_missing_sane-config.patch @@ -7,15 +7,14 @@ Index: trunk/configure.in =================================================================== --- trunk.orig/configure.in +++ trunk/configure.in -@@ -112,7 +112,10 @@ fi +@@ -112,7 +112,9 @@ fi AC_CHECK_TOOL(RANLIB, ranlib, :) -AM_PATH_SANE(1.0.0, HAVE_SANE=yes, ) -+PKG_CHECK_MODULES([SANE], [sane-backends >= 1.0.0]) ++PKG_CHECK_MODULES([SANE], [sane-backends >= 1.0.0], [HAVE_SANE=yes]) +PKG_CHECK_VAR([SANE_PREFIX], [sane-backends >= 1.0.0], [prefix]) -+PKG_CHECK_VAR([SANE_LDFLAGS], [sane-backends >= 1.0.0], [ldflags], -+ [HAVE_SANE=yes]) ++PKG_CHECK_VAR([SANE_LDFLAGS], [sane-backends >= 1.0.0], [ldflags]) dnl Print error message if sane is missing if test "x${HAVE_SANE}" = "x"; then echo "**********************************************************************" -- cgit v1.2.3 From 99312bc9c63b7884d2d43e83ea8245e979a74c2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 17 Feb 2023 15:56:52 +0100 Subject: Declare compliance with Debian Policy 4.6.2.0 --- debian/changelog | 1 + debian/control | 2 +- debian/patches/0001-fix_missing_sane-config.patch | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 12b045c..d710c42 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ sane-frontends (1.0.14-17) UNRELEASED; urgency=medium * debian/patches/0001-fix_missing_sane-config.patch: - Fix FTBFS (Closes: #1031453). Thanks to Lucas Nussbaum + * Declare compliance with Debian Policy 4.6.2.0 (No changes needed). -- Jörg Frings-Fürst Fri, 17 Feb 2023 15:40:19 +0100 diff --git a/debian/control b/debian/control index 37890fb..5359c13 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: sane-frontends Section: graphics Priority: optional Maintainer: Jörg Frings-Fürst -Standards-Version: 4.5.0 +Standards-Version: 4.6.2.0 Rules-Requires-Root: no Build-Depends: debhelper-compat (= 13), diff --git a/debian/patches/0001-fix_missing_sane-config.patch b/debian/patches/0001-fix_missing_sane-config.patch index 5ad31e5..2240cba 100644 --- a/debian/patches/0001-fix_missing_sane-config.patch +++ b/debian/patches/0001-fix_missing_sane-config.patch @@ -2,7 +2,7 @@ Description: Fix FTBFS against libsane-dev >= 1.0.25-3 Fix missing sane-config Author: Andreas Metzler Reviewed-by: Jörg Frings-Fürst -Last-Update: 2017-01-28 +Last-Update: 2023-02-17 Index: trunk/configure.in =================================================================== --- trunk.orig/configure.in -- cgit v1.2.3 From af4fc9cf839bd22d730a914ee58d99cef83ec4ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 17 Feb 2023 15:59:51 +0100 Subject: d/copyright: Add year 2023 to myself --- debian/changelog | 2 ++ debian/copyright | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d710c42..eb6e062 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ sane-frontends (1.0.14-17) UNRELEASED; urgency=medium - Fix FTBFS (Closes: #1031453). Thanks to Lucas Nussbaum * Declare compliance with Debian Policy 4.6.2.0 (No changes needed). + * debian/copyright: + + Add year 2023 to myself. -- Jörg Frings-Fürst Fri, 17 Feb 2023 15:40:19 +0100 diff --git a/debian/copyright b/debian/copyright index ed38bb2..16becba 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-2019 Jörg Frings-Fürst + 2014-2023 Jörg Frings-Fürst License: GPL-2+ with sane exception Files: include/*.h -- cgit v1.2.3 From 1dff4470d3995f0425bbb50b54f03926e35d9df3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 17 Feb 2023 16:53:31 +0100 Subject: Remove superficial test --- debian/changelog | 4 +++- debian/tests/control | 4 ---- 2 files changed, 3 insertions(+), 5 deletions(-) delete mode 100644 debian/tests/control diff --git a/debian/changelog b/debian/changelog index eb6e062..6a4e618 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,9 @@ sane-frontends (1.0.14-17) UNRELEASED; urgency=medium Thanks to Lucas Nussbaum * Declare compliance with Debian Policy 4.6.2.0 (No changes needed). * debian/copyright: - + Add year 2023 to myself. + - Add year 2023 to myself. + * debian/tests/control: + - Remove superficial test. -- Jörg Frings-Fürst Fri, 17 Feb 2023 15:40:19 +0100 diff --git a/debian/tests/control b/debian/tests/control deleted file mode 100644 index 3eab6ff..0000000 --- a/debian/tests/control +++ /dev/null @@ -1,4 +0,0 @@ -# smoke test -Test-Command: scanadf -V && xcam -V -Depends: sane -Restrictions: superficial -- cgit v1.2.3 From bd3bc37eff5a876090778b2dceb24b774116e61d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 17 Feb 2023 16:56:28 +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 6a4e618..4895669 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -sane-frontends (1.0.14-17) UNRELEASED; urgency=medium +sane-frontends (1.0.14-17) unstable; urgency=medium * debian/patches/0001-fix_missing_sane-config.patch: - Fix FTBFS (Closes: #1031453). @@ -9,7 +9,7 @@ sane-frontends (1.0.14-17) UNRELEASED; urgency=medium * debian/tests/control: - Remove superficial test. - -- Jörg Frings-Fürst Fri, 17 Feb 2023 15:40:19 +0100 + -- Jörg Frings-Fürst Fri, 17 Feb 2023 16:55:10 +0100 sane-frontends (1.0.14-16) unstable; urgency=medium -- cgit v1.2.3