Followup-For: Bug #979301
Control: tag -1 patch pending
Hi,
I've uploaded the attached NMU to DELAYED/5. It updates the package to
debhelper-compat (= 13) and sanitizes the debhelper usage.
Andreas
diff -Nru namazu2-2.0.21/debian/changelog namazu2-2.0.21/debian/changelog
--- namazu2-2.0.21/debian/changelog 2021-01-03 16:43:47.000000000 +0100
+++ namazu2-2.0.21/debian/changelog 2021-01-26 00:54:07.000000000 +0100
@@ -1,3 +1,13 @@
+namazu2 (2.0.21-22.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Switch to debhelper-compat (= 13).
+ * Sanitize debhelper usage. (Closes: #979301, #980776)
+ * Don't skip the tests, but ignore failures for now.
+ * Minor cleanups.
+
+ -- Andreas Beckmann <a...@debian.org> Tue, 26 Jan 2021 00:54:07 +0100
+
namazu2 (2.0.21-22.1) unstable; urgency=medium
* Non maintainer upload by the Reproducible Builds team.
@@ -22,7 +32,7 @@
namazu2 (2.0.21-20) unstable; urgency=medium
* debian/emacsen-*: Update from new deb-make template.
- * debian/patches/0001-fix-old-backquote.patch: Remove ancienct backquote
+ * debian/patches/0001-fix-old-backquote.patch: Remove ancient backquote
-- NOKUBI Takatsugu <k...@daionet.gr.jp> Thu, 05 Jan 2017 07:18:32 +0000
@@ -321,7 +331,7 @@
namazu2 (2.0.13-4) unstable; urgency=low
- * Moved "dh_movefiles -pnamazu2-common" from binary-indep target to
+ * Moved "dh_movefiles -pnamazu2-common" from binary-indep target to
install target, closes Bug#260745.
-- NOKUBI Takatsugu <k...@daionet.gr.jp> Thu, 22 Jul 2004 09:16:55 +0900
@@ -489,7 +499,7 @@
* changed package structure
Added namazu2-index-tools (separated from namazu2)
Removed libfile-mmagic-perl, it is going it's own package, ITPed.
-
+
-- Takuo KITAME <kit...@northeye.org> Thu, 6 Apr 2000 10:00:57 +0900
namazu2 (2.0-2) unstable; urgency=low
@@ -503,5 +513,3 @@
* Initial Release.
-- Takuo KITAME <kit...@northeye.org> Mon, 21 Feb 2000 10:35:05 +0900
-
-
diff -Nru namazu2-2.0.21/debian/compat namazu2-2.0.21/debian/compat
--- namazu2-2.0.21/debian/compat 2019-04-17 09:29:57.000000000 +0200
+++ namazu2-2.0.21/debian/compat 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-9
diff -Nru namazu2-2.0.21/debian/control namazu2-2.0.21/debian/control
--- namazu2-2.0.21/debian/control 2019-04-17 09:29:57.000000000 +0200
+++ namazu2-2.0.21/debian/control 2021-01-26 00:54:03.000000000 +0100
@@ -2,12 +2,27 @@
Section: text
Priority: optional
Maintainer: NOKUBI Takatsugu <k...@daionet.gr.jp>
-Build-Depends: debhelper (>= 9), perl, kakasi, chasen, libnkf-perl,
libfile-mmagic-perl, libtext-kakasi-perl, tk, lynx, file, dh-autoreconf
+Build-Depends:
+ debhelper-compat (= 13),
+ perl,
+ kakasi,
+ chasen,
+ libnkf-perl,
+ libfile-mmagic-perl,
+ libtext-kakasi-perl,
+ tk,
+ lynx,
+ file,
+Rules-Requires-Root: no
Standards-Version: 3.9.7
Package: namazu2
Architecture: any
-Depends: ${shlibs:Depends}, namazu2-common, ${misc:Depends}
+Depends:
+ ${perl:Depends},
+ ${shlibs:Depends},
+ namazu2-common (= ${source:Version}),
+ ${misc:Depends}
Suggests: www-browser, apache2, namazu2-index-tools, emacsen-common, tk
Conflicts: namazu (<< 2.0), namazu-el, tknamazu
Provides: namazu
@@ -50,6 +65,7 @@
This package including only document files, also message catalogue.
Package: libnmz7
+Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: full text search engine - shared library
@@ -61,10 +77,10 @@
and/or another utilities.
Package: libnmz7-dev
+Section: libdevel
Architecture: any
Depends: libnmz7 (= ${binary:Version}), ${misc:Depends}
Conflicts: libnmz3-dev
-Section: libdevel
Description: full text search engine - header files and static libraries
Namazu is a full text search engine which is usable via CGI. It features
a simple and easy setup, and is written in C and Perl. Namazu uses the
diff -Nru namazu2-2.0.21/debian/copyright namazu2-2.0.21/debian/copyright
--- namazu2-2.0.21/debian/copyright 2019-04-17 09:29:57.000000000 +0200
+++ namazu2-2.0.21/debian/copyright 2021-01-26 00:23:28.000000000 +0100
@@ -20,4 +20,4 @@
GNU General Public License for more details.
On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
diff -Nru namazu2-2.0.21/debian/dirs namazu2-2.0.21/debian/dirs
--- namazu2-2.0.21/debian/dirs 2019-04-17 09:29:57.000000000 +0200
+++ namazu2-2.0.21/debian/dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-etc/namazu
-var/lib/namazu/index
-usr/share/doc/namazu2-common
-usr/share/emacs/site-lisp/namazu
diff -Nru namazu2-2.0.21/debian/docs namazu2-2.0.21/debian/docs
--- namazu2-2.0.21/debian/docs 2019-04-17 09:29:57.000000000 +0200
+++ namazu2-2.0.21/debian/docs 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-INSTALL
-NEWS
-README
-README-ja
-TODO
-ChangeLog.1
diff -Nru namazu2-2.0.21/debian/libfile-mmagic-perl.files
namazu2-2.0.21/debian/libfile-mmagic-perl.files
--- namazu2-2.0.21/debian/libfile-mmagic-perl.files 2019-04-17
09:29:57.000000000 +0200
+++ namazu2-2.0.21/debian/libfile-mmagic-perl.files 1970-01-01
01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/lib/perl5
-usr/share/man/man3/File::MMagic.3pm
diff -Nru namazu2-2.0.21/debian/libnmz7-dev.manpages
namazu2-2.0.21/debian/libnmz7-dev.manpages
--- namazu2-2.0.21/debian/libnmz7-dev.manpages 1970-01-01 01:00:00.000000000
+0100
+++ namazu2-2.0.21/debian/libnmz7-dev.manpages 2021-01-25 22:07:04.000000000
+0100
@@ -0,0 +1 @@
+debian/nmz-config.1
diff -Nru namazu2-2.0.21/debian/libnmz7.install
namazu2-2.0.21/debian/libnmz7.install
--- namazu2-2.0.21/debian/libnmz7.install 2019-04-17 09:29:57.000000000
+0200
+++ namazu2-2.0.21/debian/libnmz7.install 2021-01-25 23:19:56.000000000
+0100
@@ -1,2 +1 @@
usr/lib/*/libnmz.so.*
-
diff -Nru namazu2-2.0.21/debian/namazu2-common.docs
namazu2-2.0.21/debian/namazu2-common.docs
--- namazu2-2.0.21/debian/namazu2-common.docs 1970-01-01 01:00:00.000000000
+0100
+++ namazu2-2.0.21/debian/namazu2-common.docs 2021-01-25 23:18:51.000000000
+0100
@@ -0,0 +1 @@
+usr/share/doc/namazu2-common/*
diff -Nru namazu2-2.0.21/debian/namazu2-doc.install
namazu2-2.0.21/debian/namazu2-doc.install
--- namazu2-2.0.21/debian/namazu2-doc.install 2019-04-17 09:29:57.000000000
+0200
+++ namazu2-2.0.21/debian/namazu2-doc.install 1970-01-01 01:00:00.000000000
+0100
@@ -1,2 +0,0 @@
-usr/share/locale
-usr/share/doc/namazu2-doc
diff -Nru namazu2-2.0.21/debian/namazu2-index-tools.dirs
namazu2-2.0.21/debian/namazu2-index-tools.dirs
--- namazu2-2.0.21/debian/namazu2-index-tools.dirs 2019-04-17
09:29:57.000000000 +0200
+++ namazu2-2.0.21/debian/namazu2-index-tools.dirs 2021-01-25
23:10:16.000000000 +0100
@@ -1,2 +1 @@
var/lib/namazu/index
-
diff -Nru namazu2-2.0.21/debian/namazu2-index-tools.install
namazu2-2.0.21/debian/namazu2-index-tools.install
--- namazu2-2.0.21/debian/namazu2-index-tools.install 2019-04-17
09:29:57.000000000 +0200
+++ namazu2-2.0.21/debian/namazu2-index-tools.install 2021-01-25
23:20:40.000000000 +0100
@@ -7,6 +7,5 @@
usr/bin/adnmz
usr/bin/lnnmz
usr/bin/nmzmerge
-usr/share/man/man1/mknmz.1
usr/share/namazu
etc/namazu/mknmzrc
diff -Nru namazu2-2.0.21/debian/namazu2-index-tools.manpages
namazu2-2.0.21/debian/namazu2-index-tools.manpages
--- namazu2-2.0.21/debian/namazu2-index-tools.manpages 1970-01-01
01:00:00.000000000 +0100
+++ namazu2-2.0.21/debian/namazu2-index-tools.manpages 2021-01-25
23:20:37.000000000 +0100
@@ -0,0 +1 @@
+usr/share/man/man1/mknmz.1
diff -Nru namazu2-2.0.21/debian/namazu2.dirs namazu2-2.0.21/debian/namazu2.dirs
--- namazu2-2.0.21/debian/namazu2.dirs 1970-01-01 01:00:00.000000000 +0100
+++ namazu2-2.0.21/debian/namazu2.dirs 2021-01-25 23:10:23.000000000 +0100
@@ -0,0 +1 @@
+var/lib/namazu/index
diff -Nru namazu2-2.0.21/debian/namazu2.links
namazu2-2.0.21/debian/namazu2.links
--- namazu2-2.0.21/debian/namazu2.links 1970-01-01 01:00:00.000000000 +0100
+++ namazu2-2.0.21/debian/namazu2.links 2021-01-25 23:08:31.000000000 +0100
@@ -0,0 +1 @@
+usr/share/tknamazu/tknamazurc etc/namazu/tknamazurc
diff -Nru namazu2-2.0.21/debian/namazu2.manpages
namazu2-2.0.21/debian/namazu2.manpages
--- namazu2-2.0.21/debian/namazu2.manpages 1970-01-01 01:00:00.000000000
+0100
+++ namazu2-2.0.21/debian/namazu2.manpages 2021-01-25 23:53:57.000000000
+0100
@@ -0,0 +1 @@
+usr/share/man/man1/namazu.1
diff -Nru namazu2-2.0.21/debian/patches/0002-escape-brackets.patch
namazu2-2.0.21/debian/patches/0002-escape-brackets.patch
--- namazu2-2.0.21/debian/patches/0002-escape-brackets.patch 1970-01-01
01:00:00.000000000 +0100
+++ namazu2-2.0.21/debian/patches/0002-escape-brackets.patch 2021-01-25
22:57:21.000000000 +0100
@@ -0,0 +1,21 @@
+From: NOKUBI Takatsugu <k...@daionet.gr.jp>
+Date: Wed, 17 Apr 2019 07:15:18 +0000
+Subject: escape brackets
+
+---
+ filter/hnf.pl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/filter/hnf.pl b/filter/hnf.pl
+index 76a7079..781db94 100644
+--- a/filter/hnf.pl
++++ b/filter/hnf.pl
+@@ -244,7 +244,7 @@ sub get_uri ($$) {
+ $uri = '?%year%month%hiday#%year%month%day0'; # for hns-1.x
+ }
+ $uri =~ s/%%/\34/g;
+- $uri =~ s/%{?([a-z]+)}?/$param{$1}/g;
++ $uri =~ s/%\{?([a-z]+)\}?/$param{$1}/g;
+ $uri =~ s/\34/%/g;
+ $uri = $hnf::diary_uri . $uri;
+ $uri =~ s/%7E/~/i;
diff -Nru namazu2-2.0.21/debian/patches/0002-escape-branckets.patch
namazu2-2.0.21/debian/patches/0002-escape-branckets.patch
--- namazu2-2.0.21/debian/patches/0002-escape-branckets.patch 2019-04-17
09:29:57.000000000 +0200
+++ namazu2-2.0.21/debian/patches/0002-escape-branckets.patch 1970-01-01
01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-From: NOKUBI Takatsugu <k...@daionet.gr.jp>
-Date: Wed, 17 Apr 2019 07:15:18 +0000
-Subject: escape branckets
-
----
- filter/hnf.pl | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/filter/hnf.pl b/filter/hnf.pl
-index 76a7079..781db94 100644
---- a/filter/hnf.pl
-+++ b/filter/hnf.pl
-@@ -244,7 +244,7 @@ sub get_uri ($$) {
- $uri = '?%year%month%hiday#%year%month%day0'; # for hns-1.x
- }
- $uri =~ s/%%/\34/g;
-- $uri =~ s/%{?([a-z]+)}?/$param{$1}/g;
-+ $uri =~ s/%\{?([a-z]+)\}?/$param{$1}/g;
- $uri =~ s/\34/%/g;
- $uri = $hnf::diary_uri . $uri;
- $uri =~ s/%7E/~/i;
diff -Nru namazu2-2.0.21/debian/patches/series
namazu2-2.0.21/debian/patches/series
--- namazu2-2.0.21/debian/patches/series 2019-04-17 09:29:57.000000000
+0200
+++ namazu2-2.0.21/debian/patches/series 2021-01-25 22:57:47.000000000
+0100
@@ -1,2 +1,2 @@
0001-fix-old-backquote.patch
-0002-escape-branckets.patch
+0002-escape-brackets.patch
diff -Nru namazu2-2.0.21/debian/rules namazu2-2.0.21/debian/rules
--- namazu2-2.0.21/debian/rules 2019-04-17 09:29:57.000000000 +0200
+++ namazu2-2.0.21/debian/rules 2021-01-26 00:31:47.000000000 +0100
@@ -4,32 +4,28 @@
#export DH_VERBOSE=1
export DEB_BUILD_MAINT_OPTIONS := hardening=+all
-export DEB_BUILD_OPTIONS=nocheck
%:
- dh $@ --with autoreconf
+ dh $@
override_dh_auto_configure:
- dh_auto_configure -- --prefix=/usr \
- --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info \
- --sysconfdir=/etc \
- --localstatedir=/var/lib \
- --libexecdir=/usr/lib/cgi-bin
- (cd tknamazu && ./configure --prefix=/usr
--with-namazu=$(CURDIR)/src/namazu --with-mknmz=$(CURDIR)/scripts/mknmz)
+ dh_auto_configure -- \
+ --localstatedir=/var/lib \
+ --libexecdir=/usr/lib/cgi-bin
+ dh_auto_configure --sourcedirectory=tknamazu -- \
+ --with-namazu=$(CURDIR)/src/namazu \
+ --with-mknmz=$(CURDIR)/scripts/mknmz
override_dh_auto_clean:
- [ ! -f tknamazu/Makefile ] || (cd tknamazu && $(MAKE) distclean)
+ dh_auto_clean --sourcedirectory=tknamazu
dh_auto_clean
+override_dh_auto_test:
+ -dh_auto_test --no-parallel
+
override_dh_auto_install:
- #dh_auto_install -- prefix=$(CURDIR)/debian/tmp/usr \
- # sysconfdir=$(CURDIR)/debian/tmp/etc \
- # localstatedir=$(CURDIR)/debian/tmp/var \
- # libexecdir=$(CURDIR)/debian/tmp/usr/lib/cgi-bin
- make mkinstalldirs
- dh_auto_install
- cd tknamazu && $(MAKE) install prefix=$(CURDIR)/debian/tmp/usr
+ dh_auto_install
+ dh_auto_install --sourcedirectory=tknamazu
mv $(CURDIR)/debian/tmp/etc/namazu/namazurc-sample \
$(CURDIR)/debian/tmp/etc/namazu/namazurc
@@ -53,49 +49,24 @@
mv $(CURDIR)/debian/tmp/usr/bin/tknamazu.new
$(CURDIR)/debian/tmp/usr/bin/tknamazu
chmod +x $(CURDIR)/debian/tmp/usr/bin/tknamazu
-
mkdir -p $(CURDIR)/debian/tmp/usr/share/emacs/site-lisp/namazu/
cp lisp/gnus*.el lisp/namazu.el
$(CURDIR)/debian/tmp/usr/share/emacs/site-lisp/namazu/
- #dh_movefiles --sourcedir=debian/tmp
- -find debian/tmp/usr -type d -empty | xargs rmdir -p > /dev/null 2>&1
+ -find debian/tmp/usr -type d -empty | xargs -r rmdir -p
rm -rf $(CURDIR)/debian/tmp/var/namazu
# Bug#125643
rm -rf $(CURDIR)/debian/tmp/usr/share/locale/ja_JP.SJIS
- # Bug#260745
- dh_movefiles -pnamazu2-common --sourcedir=debian/tmp
usr/share/doc/namazu2-common
- dh_movefiles -a -pnamazu2 --sourcedir=debian/tmp
-
-override_dh_installchangelogs:
- dh_installchangelogs -pnamazu2-common
- dh_installchangelogs -plibnmz7 -plibnmz7-dev ChangeLog
- -test -d $(CURDIR)/debian/libnmz7-dev && \
- cp debian/copyright
$(CURDIR)/debian/libnmz7-dev/usr/share/doc/libnmz7-dev/ && \
- cp debian/copyright $(CURDIR)/debian/libnmz7/usr/share/doc/libnmz7/
- -rm -f
$(CURDIR)/debian/namazu2-common/usr/share/doc/namazu2-common/changelog
override_dh_installdocs:
- dh_installdocs -i -XCOPYING -XINSTALL -XINSTALL-ja -XABOUT-NLS
-
-override_dh_installexamples:
- dh_installexamples -a -XCOPYING -XINSTALL -XINSTALL-ja
+ # HACK! --link-doc is no longer allowed between arch:any and arch:all
packages
+ mkdir -p debian/namazu2/usr/share/doc
+ ln -s namazu2-common debian/namazu2/usr/share/doc/namazu2
+ dh_installdocs -pnamazu2-index-tools --link-doc=namazu2-common
+ dh_installdocs --remaining-packages
override_dh_installemacsen:
dh_installemacsen --priority=50
-override_dh_installman:
- dh_installman man/namazu.1
- dh_installman -plibnmz7-dev debian/nmz-config.1
-
-override_dh_link:
- -rm -rf
$(CURDIR)/debian/namazu2-index-tools/usr/share/doc/namazu2-index-tools
- dh_link -pnamazu2-index-tools /usr/share/doc/namazu2-common
/usr/share/doc/namazu2-index-tools
- dh_link -a /usr/share/doc/namazu2-common /usr/share/doc/namazu2
- dh_link -a /usr/share/tknamazu/tknamazurc /etc/namazu/tknamazurc
-override_dh_makeshlibs:
- dh_makeshlibs -a -plibnmz7
-
-override_dh_shlibdeps:
- dh_shlibdeps -a -l$(CURDIR)/debian/libnmz7/usr/lib -- -Llibnmz7
-
+override_dh_missing:
+ dh_missing --list-missing
diff -Nru namazu2-2.0.21/debian/shlibs.local namazu2-2.0.21/debian/shlibs.local
--- namazu2-2.0.21/debian/shlibs.local 2019-04-17 09:29:57.000000000 +0200
+++ namazu2-2.0.21/debian/shlibs.local 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-libnmz 3 libnmz3
