debian: Update release notes for lintian-clean upload.

Reviewed-by: Andreas Metzler <ametzler@bebt.de>

diff --git a/Makefile b/Makefile
index 73c4612e287deb1d61861aff3e8bc9a81fdffec8..a03e991ca7af2645b21191cc7a9c0bb6c55cef8e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,12 +24,12 @@ SLOGAN := fortune cookies with tags
 AUTHOR := Andre Noll
 EMAIL := maan@tuebingen.mpg.de
 COPYRIGHT_YEAR := 2019
-PACKAGE_HOMEPAGE := http://people.tuebingen.mpg.de/maan/$(PACKAGE)/
-CLONE_URL := git://git.tuebingen.mpg.de/$(PACKAGE)/
-GITWEB_URL := http://git.tuebingen.mpg.de/$(PACKAGE).git
+PACKAGE_HOMEPAGE := https://people.tuebingen.mpg.de/maan/$(PACKAGE)/
+CLONE_URL := https://git.tuebingen.mpg.de/$(PACKAGE)/
+GITWEB_URL := https://git.tuebingen.mpg.de/$(PACKAGE).git
 LICENSE := GNU GPL version 3
 LICENSE_URL := https://www.gnu.org/licenses/gpl-3.0-standalone.html
-HOME_URL := http://people.tuebingen.mpg.de/maan/
+HOME_URL := https://people.tuebingen.mpg.de/maan/
 
 define DESCRIPTION1 :=
        Like fortune(6), tfortune is a Unix command line utility which prints

diff --git a/configure.ac b/configure.ac
index 57e7d200f35c9bdb9bc64ed9e38a210c7a6b4618..4c67da9496d55aede86858b23296db77d5827a3b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,6 @@ AC_DEFUN([REQUIRE_EXECUTABLE], [
 REQUIRE_EXECUTABLE([m4])
 REQUIRE_EXECUTABLE([flex])
 REQUIRE_EXECUTABLE([bison])
-REQUIRE_EXECUTABLE([lopsubgen])
 
 HAVE_LOPSUB=yes
 AC_CHECK_HEADER(lopsub.h, [], [HAVE_LOPSUB=no])
@@ -24,8 +23,10 @@ AC_CHECK_LIB([lopsub], [lls_merge], [], [HAVE_LOPSUB=no])
 if test $HAVE_LOPSUB == no; then AC_MSG_ERROR([
        The lopsub library is required to build this software, but
        the above checks indicate it is not installed on your system.
-       Run the following command to download a copy.
-               git clone git://git.tuebingen.mpg.de/lopsub.git
+
+       On Debian/Ubuntu systems you mny install the liblopsub-dev package.
+       Alternatively, run the following command to download a copy.
+               git clone https://git.tuebingen.mpg.de/lopsub.git
        Install the library, then run this configure script again.
 
        If you installed lopsub at a non-standard location, make sure to set
@@ -37,4 +38,5 @@ if test $HAVE_LOPSUB == no; then AC_MSG_ERROR([
                export LDFLAGS=-L\$pfx/lib
 ])
 fi
+REQUIRE_EXECUTABLE([lopsubgen])
 AC_OUTPUT

diff --git a/debian/changelog b/debian/changelog
index ef53fa165d680b3606564f176bd0f3bef23c002e..aecfdc6ce9749b7d23689d46c50247c0be41b2dd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,24 @@
-tfortune (1.0.1-1.1) UNRELEASED; urgency=medium
+tfortune (1.0.1-3) unstable; urgency=low
 
-  * Non-maintainer upload.
-  * Fix FTCBFS: (Closes: #-1)
+  * Improved error diagnostics
+  * Switch from git:// and http:// to https://
+  * Fix lintian warnings
+
+ -- Andre Noll <maan@tuebingen.mpg.de>  Wed, 24 Apr 2024 18:00:05 +0200
+
+tfortune (1.0.1-2) unstable; urgency=medium
+
+  [ Helmut Grohne ]
+  * Fix FTCBFS: (Closes: #1032160)
     + Also ask for generating config.h.in, which otherwise goes missing in
       cross builds.
     + Pass --build and --host to configure as we cannot use dh_auto_configure.
     + Also export cross tools for make.
 
- -- Helmut Grohne <helmut@subdivi.de>  Tue, 28 Feb 2023 05:42:58 +0100
+  [ Andre Noll ]
+  * Remove hard-coded dependency on liblopsub1. (Closes: #1068608)
+
+ -- Andre Noll <maan@tuebingen.mpg.de>  Sun, 21 Apr 2024 15:52:20 +0200
 
 tfortune (1.0.1-1) unstable; urgency=low
 

diff --git a/debian/compat b/debian/compat
deleted file mode 100644 (file)
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10

diff --git a/debian/control b/debian/control
index 4981f4a7ca7e46605fa496aa0c84b0adc4b6a5e2..120e727089aaa7d50382970cbdcbbcebb60b17be 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,15 +2,16 @@ Source: tfortune
 Section: games
 Priority: optional
 Maintainer: Andre Noll <maan@tuebingen.mpg.de>
-Build-Depends: m4, flex, bison, debhelper (>= 10.0), autoconf, liblopsub-dev
-Standards-Version: 4.3.0
-Homepage: http://people.tuebingen.mpg.de/maan/tfortune/
-Vcs-Browser: http://git.tuebingen.mpg.de/tfortune.git
-Vcs-Git: git://git.tuebingen.mpg.de/tfortune/
+Build-Depends: m4, flex, bison, debhelper (>= 13), debhelper-compat (=13), autoconf, liblopsub-dev
+Standards-Version: 4.6.2
+Homepage: https://people.tuebingen.mpg.de/maan/tfortune/
+Vcs-Browser: https://git.tuebingen.mpg.de/tfortune.git
+Vcs-Git: https://git.tuebingen.mpg.de/tfortune/
+Rules-Requires-Root: no
 
 Package: tfortune
 Architecture: any
-Depends: ${shlibs:Depends}, liblopsub1, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: tfortunes
 Description: Fortune Cookies with Tags
  Like fortune(6), tfortune is a Unix command line utility which prints

diff --git a/debian/copyright b/debian/copyright
index ed6d353dae2116ce93aff0b81607c586bc50a930..558b00b66a363dd65a6b1f63c5ed5dbcfa2464e1 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,21 @@
-Copyright 2018-2019 Andre Noll <maan@tuebingen.mpg.de>
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: https://people.tuebingen.mpg.de/maan/tfortune/
 
-The code of this package is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License,
-version 3. On Debian GNU systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-3'.
+Files: *
+License: GPL-3
+Copyright: 2018-2019 Andre Noll <maan@tuebingen.mpg.de>
 
-All epigrams provided by the tfortunes package are believed to be in
-the public domain. Please notify the author if there is an epigram
-which is not.
+Files: epigrams/*
+Copyright: none
+License: public-domain
+
+License: GPL-3
+  The code of this package is free software; you can redistribute it
+  and/or modify it under the terms of the GNU General Public License,
+  version 3. On Debian GNU systems, the complete text of the GNU General
+  Public License can be found in `/usr/share/common-licenses/GPL-3'.
+
+License: public-domain
+  All epigrams provided by the tfortunes package are believed to be
+  in the public domain. Please notify the author if there is an epigram
+  which is not.

diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644 (file)
index 0000000..662fe7b
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,39 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+AKCO0h1mPhmUGIBgcCsk6XIVg4uNbA==
+=6OYZ
+-----END PGP PUBLIC KEY BLOCK-----

diff --git a/debian/watch b/debian/watch
new file mode 100644 (file)
index 0000000..26d3e81
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,5 @@
+version=4
+opts="mode=git, gitmode=full, pgpmode=gittag" \
+       https://git.tuebingen.mpg.de/tfortune/ \
+       refs/tags/v@ANY_VERSION@
+

diff --git a/epigrams/en.tfortunes b/epigrams/en.tfortunes
index bb38738e9a92ce94abd1011bd81fe16381f482cd..b5a2252baca9aeaad3b4e3c53ac7c62e15f53c89 100644 (file)
--- a/epigrams/en.tfortunes
+++ b/epigrams/en.tfortunes
@@ -161,7 +161,7 @@ Build a system that even a fool can use, and only a fool will use it.
 In January of 2009 we had our first tech support call where the new
 user needed to be told, "Well, have you tried turning it on?" We
 consider this a huge road sign on our path to becoming a mainstream
-computer company.                        -- http://www.zareason.com
+computer company.
 ---- comp
 login: yes
 password: I don't know, please tell me

diff --git a/index.html.m4 b/index.html.m4
index 3b77ae729aea01cd3b29638a152eaea8dd8b4b72..f7376d90bb3f9e282766ae66e0cdb7d895c423d4 100644 (file)
--- a/index.html.m4
+++ b/index.html.m4
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'
-'http://www.w3.org/TR/html4/loose.dtd'>
+'https://www.w3.org/TR/html4/loose.dtd'>
 
 <!-- SPDX-License-Identifier: GPL-3.0-only */ -->
 <html>

diff --git a/logo.svg b/logo.svg
index d4a70a67a93ed128311116e2efb27c3dd19e769e..a06fa00e773a3c2b3afc8aa25fe3a98b47b4dbfd 100644 (file)
--- a/logo.svg
+++ b/logo.svg
@@ -1,6 +1,6 @@
 <!-- SPDX-License-Identifier: GPL-3.0-only -->
 
-<svg xmlns="http://www.w3.org/2000/svg" height="70" width="100" >
+<svg xmlns="https://www.w3.org/2000/svg" height="70" width="100">
        <g fill="none" stroke-width="4" linecap="round">
                <path
                         d="