Hi all, I plan to NMU to fix RC bugs #965835 and #999110
The debdiff is attached. My plan is I'll wait until 20th Dec and then upload to delay/10 queue. Yours, Paul
diff -Nru tcd-utils-20061127/debian/changelog
tcd-utils-20061127/debian/changelog
--- tcd-utils-20061127/debian/changelog 2022-12-13 08:35:09.000000000 +0800
+++ tcd-utils-20061127/debian/changelog 2022-12-13 08:10:54.000000000 +0800
@@ -1,3 +1,12 @@
+tcd-utils (20061127-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Use DebSrc3.0 (quilt) format.
+ * Bump debhelper compat to 12 (Closes: #965835)
+ * debian/rules: Use dh (Closes: #999110)
+
+ -- Ying-Chun Liu (PaulLiu) <paul...@debian.org> Tue, 13 Dec 2022 08:10:54
+0800
+
tcd-utils (20061127-2) unstable; urgency=low
* Bug fix: "tcd-utils: FTBFS: checking for tcd.h... no". Forgot to add
diff -Nru tcd-utils-20061127/debian/compat tcd-utils-20061127/debian/compat
--- tcd-utils-20061127/debian/compat 2022-12-13 08:35:09.000000000 +0800
+++ tcd-utils-20061127/debian/compat 1970-01-01 08:00:00.000000000 +0800
@@ -1 +0,0 @@
-5
diff -Nru tcd-utils-20061127/debian/control tcd-utils-20061127/debian/control
--- tcd-utils-20061127/debian/control 2022-12-13 08:35:09.000000000 +0800
+++ tcd-utils-20061127/debian/control 2022-12-13 08:10:54.000000000 +0800
@@ -1,8 +1,8 @@
Source: tcd-utils
Section: science
-Priority: extra
+Priority: optional
Maintainer: Peter S Galbraith <p...@debian.org>
-Build-Depends: debhelper (>= 5), autotools-dev, libtcd-dev
+Build-Depends: debhelper-compat (= 12), libtcd-dev
Standards-Version: 3.7.2
Package: tcd-utils
@@ -13,4 +13,4 @@
tcd-utils are command-line tools for converting Tide Constituent Database
(TCD) files to and from other formats. They are used to create tidal
harmonics files used by XTide (see the xtide package), such as those found
- in the xtide-data package.
\ 檔案末沒有 newline 字元
+ in the xtide-data package.
diff -Nru tcd-utils-20061127/debian/rules tcd-utils-20061127/debian/rules
--- tcd-utils-20061127/debian/rules 2022-12-13 08:35:09.000000000 +0800
+++ tcd-utils-20061127/debian/rules 2022-12-13 08:10:54.000000000 +0800
@@ -15,87 +15,8 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+%:
+ dh $@
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
-config.status: configure
- dh_testdir
- # Add here commands to configure the package.
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
--prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
-
-
-build: build-stamp
-
-build-stamp: config.status
- dh_testdir
-
- $(MAKE)
-
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
- -$(MAKE) distclean
- rm -f config.sub config.guess
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- $(MAKE) DESTDIR=$(CURDIR)/debian/tcd-utils install
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installexamples
-# dh_install
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_python
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_perl
-# dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+override_dh_auto_configure:
+ dh_auto_configure -- --prefix=/usr --mandir=\$${prefix}/share/man
--infodir=\$${prefix}/share/info
diff -Nru tcd-utils-20061127/debian/source/format
tcd-utils-20061127/debian/source/format
--- tcd-utils-20061127/debian/source/format 1970-01-01 08:00:00.000000000
+0800
+++ tcd-utils-20061127/debian/source/format 2022-12-13 08:10:54.000000000
+0800
@@ -0,0 +1 @@
+3.0 (quilt)
OpenPGP_0x44173FA13D058888.asc
Description: OpenPGP public key
OpenPGP_signature
Description: OpenPGP digital signature
