Package: toilet
Version: 0.3-1.3
Severity: normal
Tags: patch pending
Dear maintainer,
I've prepared an NMU for toilet (versioned as 0.3-1.4) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.
Regards,
SR
diff -Nru toilet-0.3/debian/changelog toilet-0.3/debian/changelog
--- toilet-0.3/debian/changelog 2021-01-01 10:35:07.000000000 -0400
+++ toilet-0.3/debian/changelog 2021-12-25 10:30:38.000000000 -0400
@@ -1,3 +1,19 @@
+toilet (0.3-1.4) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Bump debhelper compat level to 13 (Closes: #965845)
+ - Use minimal dh debian/rules.
+ - Enables autoreconf by default (Closes: #876126)
+ - Drop autotools-dev Build-Depends, no longer explicitly needed.
+ * Patch: AM_INIT_AUTOMAKE([foreign]), required to autoreconf.
+ * Declare Rules-Requires-Root: no.
+ * Remove legacy Alioth Vcs fields.
+ * Bump Standards-Version to 4.6.0, no changes needed.
+ * Remove ancient figlet conflicts, no longer needed.
+ * Add a smoketest autopkgtest.
+
+ -- Stefano Rivera <stefa...@debian.org> Sat, 25 Dec 2021 10:30:38 -0400
+
toilet (0.3-1.3) unstable; urgency=medium
* Non maintainer upload by the Reproducible Builds team.
@@ -9,7 +25,7 @@
* Non-maintainer upload.
* use dh_autotools-dev to update config.sub.
-
+
[ Helmut Grohne]
* sets PKG_CONFIG_LIBDIR correct for cross building (Closes: #876126)
@@ -21,7 +37,7 @@
* Fix FTBFS when building only architeture-independent packages
(closes: #805961). Thanks to Santiago Vila for the bug report and the
patch.
-
+
-- Jakub Wilk <jw...@debian.org> Mon, 22 Aug 2016 21:05:36 +0200
toilet (0.3-1) unstable; urgency=low
@@ -57,4 +73,3 @@
* Initial release (Closes: #390037).
-- Sam Hocevar (Debian packages) <sam+...@zoy.org> Thu, 16 Nov 2006 03:32:10 +0100
-
diff -Nru toilet-0.3/debian/compat toilet-0.3/debian/compat
--- toilet-0.3/debian/compat 2010-02-08 21:34:52.000000000 -0400
+++ toilet-0.3/debian/compat 1969-12-31 20:00:00.000000000 -0400
@@ -1 +0,0 @@
-5
diff -Nru toilet-0.3/debian/control toilet-0.3/debian/control
--- toilet-0.3/debian/control 2018-03-14 00:44:09.000000000 -0400
+++ toilet-0.3/debian/control 2021-12-25 10:30:38.000000000 -0400
@@ -2,17 +2,15 @@
Section: libs
Priority: optional
Maintainer: Sam Hocevar <s...@debian.org>
-Build-Depends: debhelper (>= 5.0), pkg-config, libcaca-dev (>= 0.99.beta18), zlib1g-dev, autotools-dev
-Standards-Version: 3.9.3
-XS-Vcs-Svn: svn://svn.debian.org/sam-hocevar/pkg-misc/unstable/toilet
-XS-Vcs-Browser: http://svn.debian.org/wsvn/sam-hocevar/pkg-misc/unstable/toilet/
+Build-Depends: debhelper-compat (= 13), pkg-config, libcaca-dev (>= 0.99.beta18), zlib1g-dev
+Standards-Version: 4.6.0
+Rules-Requires-Root: no
Package: toilet
Section: text
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, toilet-fonts
Suggests: figlet
-Conflicts: figlet (<= 2.2.1-4)
Replaces: caca-utils
Description: display large colourful characters in text mode
TOIlet prints text using large characters made of smaller characters.
diff -Nru toilet-0.3/debian/patches/automake-foreign.patch toilet-0.3/debian/patches/automake-foreign.patch
--- toilet-0.3/debian/patches/automake-foreign.patch 1969-12-31 20:00:00.000000000 -0400
+++ toilet-0.3/debian/patches/automake-foreign.patch 2021-12-25 10:30:38.000000000 -0400
@@ -0,0 +1,17 @@
+Author: Stefano Rivera <stefa...@debian.org>
+Description: Set foreign flag for automake
+ We don't have an AUTHORS file, don't expect one.
+ Removed package name and version from AM_INIT_AUTOMAKE call, this is
+ deprecated in favour of AC_INIT.
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -6,7 +6,7 @@
+ AC_CONFIG_AUX_DIR(.auto)
+ AC_CANONICAL_SYSTEM
+
+-AM_INIT_AUTOMAKE(toilet, 0.3)
++AM_INIT_AUTOMAKE([foreign])
+ AM_CONFIG_HEADER(config.h)
+
+ AM_PROG_CC_C_O
diff -Nru toilet-0.3/debian/patches/series toilet-0.3/debian/patches/series
--- toilet-0.3/debian/patches/series 2018-03-14 00:44:09.000000000 -0400
+++ toilet-0.3/debian/patches/series 2021-12-25 10:30:38.000000000 -0400
@@ -1 +1,2 @@
no-set-pkg-config-libdir-to-null.patch
+automake-foreign.patch
diff -Nru toilet-0.3/debian/rules toilet-0.3/debian/rules
--- toilet-0.3/debian/rules 2018-03-14 00:32:57.000000000 -0400
+++ toilet-0.3/debian/rules 2021-12-25 10:30:38.000000000 -0400
@@ -1,91 +1,9 @@
#!/usr/bin/make -f
#export DH_VERBOSE=1
-export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-# FOR AUTOCONF 2.52 AND NEWER ONLY
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
- confflags += --build $(DEB_HOST_GNU_TYPE)
-else
- confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-endif
+%:
+ dh $@
-confflags += --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- dh_autotools-dev_updateconfig
- ./configure $(confflags) --prefix=/usr
- touch configure-stamp
-
-build: build-arch build-indep
-
-build-arch: configure-stamp build-arch-stamp
-build-arch-stamp:
- dh_testdir
- $(MAKE)
- touch build-arch-stamp
-
-build-indep: configure-stamp build-indep-stamp
-build-indep-stamp:
- dh_testdir
- touch build-indep-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-arch-stamp build-indep-stamp configure-stamp
- sed -i -e 's/.*if(!c.*for/ for/' src/filter.c
- [ ! -f Makefile ] || $(MAKE) distclean
- dh_autotools-dev_restoreconfig
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs usr/bin usr/share/man/man1 -ptoilet
- dh_installdirs usr/share/figlet -ptoilet-fonts
- $(MAKE) install DESTDIR=`pwd`/debian/tmp
- dh_install --sourcedir=debian/tmp --list-missing
-
-# Build architecture-independent files here.
-binary-indep: build install
- dh_installdocs -i -A README TODO NEWS
- dh_installmenu -i
- dh_installcron -i
- dh_installinfo -i
- dh_installmime -i
- dh_installchangelogs -i ChangeLog
- dh_link -i
- dh_strip -i
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_shlibdeps -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_installdocs -a -A README TODO NEWS
- dh_installmenu -a
- dh_installcron -a
- dh_installinfo -a
- dh_installmime -a
- dh_installchangelogs -a ChangeLog
- dh_link -a
- dh_strip -a
- dh_compress -a
- dh_fixperms -a
- dh_installdeb -a
- dh_shlibdeps -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+override_dh_installdocs:
+ dh_installdocs -A NEWS README TODO
diff -Nru toilet-0.3/debian/tests/control toilet-0.3/debian/tests/control
--- toilet-0.3/debian/tests/control 1969-12-31 20:00:00.000000000 -0400
+++ toilet-0.3/debian/tests/control 2021-12-25 10:30:38.000000000 -0400
@@ -0,0 +1,2 @@
+Tests: smoketest
+Depends: toilet
diff -Nru toilet-0.3/debian/tests/smoketest toilet-0.3/debian/tests/smoketest
--- toilet-0.3/debian/tests/smoketest 1969-12-31 20:00:00.000000000 -0400
+++ toilet-0.3/debian/tests/smoketest 2021-12-25 10:30:38.000000000 -0400
@@ -0,0 +1,17 @@
+#!/bin/sh
+set -euf
+cd "$AUTOPKGTEST_TMP"
+
+cat >expected <<EOF
+
+ # ""# ""#
+ # mm mmm # # mmm
+ #" # #" # # # #" "#
+ # # #"""" # # # #
+ # # "#mm" "mm "mm "#m#"
+
+
+EOF
+
+toilet hello | sed -e 's/ *$//' > output
+diff -Naur expected output
