From 631900d55f260bb0fa899fc8b393d9a2af3a3fd8 Mon Sep 17 00:00:00 2001 From: "Jannis M. Hoffmann" Date: Mon, 2 Dec 2024 12:58:37 +0100 Subject: Use dynamic version in hopefully all files of fehqlibs-deb and ucspi-tcp6-deb A known outlier is the changelog of ucspi-tcp6. --- fehqlibs-deb/debian/contrib/qlibs.pc | 9 --------- fehqlibs-deb/debian/contrib/qlibs.pc.in | 9 +++++++++ fehqlibs-deb/debian/rules | 2 ++ fehqlibs-deb/debian/source/format | 1 + fehqlibs-deb/debian/upstream/metadata | 9 +++++++++ ucspi-tcp6-deb/debian/clean | 25 ++++++++++++----------- ucspi-tcp6-deb/debian/install | 36 ++++++++++++++++++--------------- ucspi-tcp6-deb/debian/manpages | 2 -- ucspi-tcp6-deb/debian/rules | 1 + 9 files changed, 55 insertions(+), 39 deletions(-) delete mode 100644 fehqlibs-deb/debian/contrib/qlibs.pc create mode 100644 fehqlibs-deb/debian/contrib/qlibs.pc.in create mode 100644 fehqlibs-deb/debian/source/format create mode 100644 fehqlibs-deb/debian/upstream/metadata mode change 100644 => 100755 ucspi-tcp6-deb/debian/clean mode change 100644 => 100755 ucspi-tcp6-deb/debian/install delete mode 100644 ucspi-tcp6-deb/debian/manpages diff --git a/fehqlibs-deb/debian/contrib/qlibs.pc b/fehqlibs-deb/debian/contrib/qlibs.pc deleted file mode 100644 index 9fd063a..0000000 --- a/fehqlibs-deb/debian/contrib/qlibs.pc +++ /dev/null @@ -1,9 +0,0 @@ -prefix=/usr -includedir=${prefix}/include - -Name: qlibs -Description: qlibs is the foundation of `feh' software -URL: https://www.fehcom.de/ipnet/qlibs.html -Version: 25a -Cflags: -I${includedir}/qlibs -Libs: -lqlibs -ldnsresolv diff --git a/fehqlibs-deb/debian/contrib/qlibs.pc.in b/fehqlibs-deb/debian/contrib/qlibs.pc.in new file mode 100644 index 0000000..1f157a2 --- /dev/null +++ b/fehqlibs-deb/debian/contrib/qlibs.pc.in @@ -0,0 +1,9 @@ +prefix=/usr +includedir=${prefix}/include + +Name: qlibs +Description: qlibs is the foundation of `feh' software +URL: https://www.fehcom.de/ipnet/qlibs.html +Version: @VERSION@ +Cflags: -I${includedir}/qlibs +Libs: -lqlibs -ldnsresolv diff --git a/fehqlibs-deb/debian/rules b/fehqlibs-deb/debian/rules index de332cf..5d5dd1d 100755 --- a/fehqlibs-deb/debian/rules +++ b/fehqlibs-deb/debian/rules @@ -11,11 +11,13 @@ get-orig-source: override_dh_auto_clean: -tar -xf ../fehqlibs_$(UPSTREAM_VERSION).orig.tar.gz --strip-components=1 + rm -f debian/contrib/qlibs.pc $(MAKE) -C src clean sed -i '31,$$d' conf-build override_dh_auto_configure: echo CFLAGS=\"-Iinclude $(CFLAGS)\" >>conf-build + sed "s/@VERSION@/$(UPSTREAM_VERSION)/" debian/contrib/qlibs.pc.in >debian/contrib/qlibs.pc $(MAKE) -C src check override_dh_auto_build: diff --git a/fehqlibs-deb/debian/source/format b/fehqlibs-deb/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/fehqlibs-deb/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/fehqlibs-deb/debian/upstream/metadata b/fehqlibs-deb/debian/upstream/metadata new file mode 100644 index 0000000..0cd5f18 --- /dev/null +++ b/fehqlibs-deb/debian/upstream/metadata @@ -0,0 +1,9 @@ +# +# DEP-12: Per-package machine-readable metadata about Upstream +# Please check * https://dep-team.pages.debian.net/deps/dep12/ +# * https://wiki.debian.org/UpstreamMetadata +Reference: + Author: Erwin Hoffmann + Title: fehQlibs + Year: 2024 + URL: https://www.fehcom.de/ipnet/qlibs.html diff --git a/ucspi-tcp6-deb/debian/clean b/ucspi-tcp6-deb/debian/clean old mode 100644 new mode 100755 index 56caf22..81a4356 --- a/ucspi-tcp6-deb/debian/clean +++ b/ucspi-tcp6-deb/debian/clean @@ -1,12 +1,13 @@ -ucspi-tcp6/ucspi-tcp6-1.13.00/src/ip4_bit.o -ucspi-tcp6/ucspi-tcp6-1.13.00/src/ip6_bit.o -ucspi-tcp6/ucspi-tcp6-1.13.00/src/remoteinfo.o -ucspi-tcp6/ucspi-tcp6-1.13.00/src/rules.o -ucspi-tcp6/ucspi-tcp6-1.13.00/src/argv0 -ucspi-tcp6/ucspi-tcp6-1.13.00/src/argv0.o -ucspi-tcp6/ucspi-tcp6-1.13.00/src/commands.o -ucspi-tcp6/ucspi-tcp6-1.13.00/src/rblsmtpd -ucspi-tcp6/ucspi-tcp6-1.13.00/src/rblsmtpd.o -ucspi-tcp6/ucspi-tcp6-1.13.00/src/date@ -ucspi-tcp6/ucspi-tcp6-1.13.00/src/finger@ -ucspi-tcp6/ucspi-tcp6-1.13.00/src/http@ +#!/usr/bin/dh-exec +ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/ip4_bit.o +ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/ip6_bit.o +ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/remoteinfo.o +ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/rules.o +ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/argv0 +ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/argv0.o +ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/commands.o +ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/rblsmtpd +ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/rblsmtpd.o +ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/date@ +ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/finger@ +ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/http@ diff --git a/ucspi-tcp6-deb/debian/install b/ucspi-tcp6-deb/debian/install old mode 100644 new mode 100755 index ec56e3a..1b43657 --- a/ucspi-tcp6-deb/debian/install +++ b/ucspi-tcp6-deb/debian/install @@ -1,16 +1,20 @@ -ucspi-tcp6/ucspi-tcp6-1.13.00/src/addcr usr/bin -ucspi-tcp6/ucspi-tcp6-1.13.00/src/argv0 usr/bin -ucspi-tcp6/ucspi-tcp6-1.13.00/src/date@ usr/bin -ucspi-tcp6/ucspi-tcp6-1.13.00/src/delcr usr/bin -ucspi-tcp6/ucspi-tcp6-1.13.00/src/finger@ usr/bin -ucspi-tcp6/ucspi-tcp6-1.13.00/src/fixcrio usr/bin -ucspi-tcp6/ucspi-tcp6-1.13.00/src/http@ usr/bin -ucspi-tcp6/ucspi-tcp6-1.13.00/src/mconnect usr/bin -ucspi-tcp6/ucspi-tcp6-1.13.00/src/rblsmtpd usr/bin -ucspi-tcp6/ucspi-tcp6-1.13.00/src/recordio usr/bin -ucspi-tcp6/ucspi-tcp6-1.13.00/src/tcpcat usr/bin -ucspi-tcp6/ucspi-tcp6-1.13.00/src/tcpclient usr/bin -ucspi-tcp6/ucspi-tcp6-1.13.00/src/tcprules usr/bin -ucspi-tcp6/ucspi-tcp6-1.13.00/src/tcprulescheck usr/bin -ucspi-tcp6/ucspi-tcp6-1.13.00/src/tcpserver usr/bin -ucspi-tcp6/ucspi-tcp6-1.13.00/src/who@ usr/bin +#!/usr/bin/dh-exec +ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/addcr usr/bin +ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/argv0 usr/bin +ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/date@ usr/bin +ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/delcr usr/bin +ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/finger@ usr/bin +ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/fixcrio usr/bin +ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/http@ usr/bin +ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/mconnect usr/bin +ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/rblsmtpd usr/bin +ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/recordio usr/bin +ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/tcpcat usr/bin +ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/tcpclient usr/bin +ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/tcprules usr/bin +ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/tcprulescheck usr/bin +ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/tcpserver usr/bin +ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/src/who@ usr/bin + +ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/man/*.1 usr/share/man/man1 +ucspi-tcp6/ucspi-tcp6-${UPSTREAM_VERSION}/man/*.5 usr/share/man/man5 diff --git a/ucspi-tcp6-deb/debian/manpages b/ucspi-tcp6-deb/debian/manpages deleted file mode 100644 index 7ef24ab..0000000 --- a/ucspi-tcp6-deb/debian/manpages +++ /dev/null @@ -1,2 +0,0 @@ -ucspi-tcp6/ucspi-tcp6-1.13.00/man/*.1 -ucspi-tcp6/ucspi-tcp6-1.13.00/man/*.5 diff --git a/ucspi-tcp6-deb/debian/rules b/ucspi-tcp6-deb/debian/rules index 58ae71b..46f9a49 100755 --- a/ucspi-tcp6-deb/debian/rules +++ b/ucspi-tcp6-deb/debian/rules @@ -6,6 +6,7 @@ export DH_VERBOSE = 1 #export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed UPSTREAM_VERSION := $(shell dpkg-parsechangelog --show-field Version | cut -d- -f1) +export UPSTREAM_VERSION get-orig-source: uscan --download-current-version -- cgit v1.2.3