Package: dict-gazetteer2k
Version: 1.0.0-5.2
Followup-For: Bug #800229
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu xenial ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* debian/rules:
- Remove legacy DH_COMPAT export.
- Use dh_prep instead of dh_clean -k.
- Add recommended build-arch and build-indep targets.
* debian/compat: Specify compatibility level of 9.
* debian/control:
- Build-depend on debhelper (>= 9).
- Move debhelper build dependency to Build-Depends, as it's used in clean.
- Depend on ${misc:Depends}.
Thanks for considering the patch.
Logan Rosen
-- System Information:
Debian Release: stretch/sid
APT prefers xenial-updates
APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500,
'xenial'), (100, 'xenial-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.4.0-7-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL
set to en_US.utf8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -u dict-gazetteer2k-1.0.0/debian/control dict-gazetteer2k-1.0.0/debian/control
--- dict-gazetteer2k-1.0.0/debian/control
+++ dict-gazetteer2k-1.0.0/debian/control
@@ -2,12 +2,13 @@
Section: text
Priority: optional
Maintainer: John Goerzen <jgoer...@complete.org>
-Build-Depends-Indep: debhelper (>> 3.0.0), python, miscfiles, python-dictdlib, python-dictclient, dictzip
+Build-Depends: debhelper (>= 9)
+Build-Depends-Indep: python, miscfiles, python-dictdlib, python-dictclient, dictzip
Standards-Version: 3.5.2
Package: dict-gazetteer2k
Architecture: all
-Depends: dict-gazetteer2k-places, dict-gazetteer2k-counties, dict-gazetteer2k-zips
+Depends: ${misc:Depends}, dict-gazetteer2k-places, dict-gazetteer2k-counties, dict-gazetteer2k-zips
Description: Placeholder package to install entire Gazetteer 2000
This package can be used to ensure that you always have the entire
set of files comprising the 2000 Gazetteer installed. You might
@@ -17,6 +18,7 @@
Package: dict-gazetteer2k-places
Architecture: all
+Depends: ${misc:Depends}
Suggests: dict, dictd
Description: Places Database for the 2000 US Gazetteer
This is a database of (primarily) United States cities using
@@ -33,6 +35,7 @@
Package: dict-gazetteer2k-counties
Architecture: all
+Depends: ${misc:Depends}
Suggests: dict, dictd
Description: Counties Database for the 2000 US Gazetteer
This is a database of (primarily) United States counties using
@@ -46,6 +49,7 @@
Package: dict-gazetteer2k-zips
Architecture: all
+Depends: ${misc:Depends}
Suggests: dict, dictd
Description: ZIP and ZCTA database for the 2000 US Gazetteer
This is a database of United States ZIP code information. It
diff -u dict-gazetteer2k-1.0.0/debian/rules dict-gazetteer2k-1.0.0/debian/rules
--- dict-gazetteer2k-1.0.0/debian/rules
+++ dict-gazetteer2k-1.0.0/debian/rules
@@ -5,9 +5,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=3
-
PYTHON=python
BASENAMES=places counties zips
@@ -26,7 +23,9 @@
touch configure-stamp
-build: build-stamp
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
build-stamp: configure-stamp
dh_testdir
@@ -56,7 +55,7 @@
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
for FILE in $(BASENAMES); do \
cp debian/dirs.tmpl debian/dict-gazetteer2k-$$FILE.dirs; \
only in patch2:
unchanged:
--- dict-gazetteer2k-1.0.0.orig/debian/compat
+++ dict-gazetteer2k-1.0.0/debian/compat
@@ -0,0 +1 @@
+9
