Package: pygopherd
Version: 2.0.18.3+nmu4
Followup-For: Bug #800204
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.
- Remove example doc-base file.
- Don't allow $(MAKE) clean to ignore errors.
* debian/compat: Indicate compatibility level of 9.
* debian/control:
- Build-depend on debhelper (>= 9) and dh-python.
- Move python to Build-Depends since clean needs it.
- Depend on ${misc:Depends}.
* debian/conffiles: Remove, since debhelper automatically adds conffiles in
/etc.
* debian/copyright:
- Remove "(s)" from "Upstream Author(s)" to satisfy Lintian.
- Replace old FSF address with new one.
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)
Kernel: Linux 4.4.0-17-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru pygopherd-2.0.18.3+nmu4/debian/compat pygopherd-2.0.18.3+nmu4ubuntu1/debian/compat
--- pygopherd-2.0.18.3+nmu4/debian/compat 1970-01-01 00:00:00.000000000 +0000
+++ pygopherd-2.0.18.3+nmu4ubuntu1/debian/compat 2016-04-08 04:37:42.000000000 +0000
@@ -0,0 +1 @@
+9
diff -Nru pygopherd-2.0.18.3+nmu4/debian/conffiles pygopherd-2.0.18.3+nmu4ubuntu1/debian/conffiles
--- pygopherd-2.0.18.3+nmu4/debian/conffiles 2008-03-02 21:51:01.000000000 +0000
+++ pygopherd-2.0.18.3+nmu4ubuntu1/debian/conffiles 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-/etc/pygopherd/pygopherd.conf
diff -Nru pygopherd-2.0.18.3+nmu4/debian/control pygopherd-2.0.18.3+nmu4ubuntu1/debian/control
--- pygopherd-2.0.18.3+nmu4/debian/control 2013-06-30 12:30:23.000000000 +0000
+++ pygopherd-2.0.18.3+nmu4ubuntu1/debian/control 2016-04-08 06:45:35.000000000 +0000
@@ -2,8 +2,7 @@
Section: net
Priority: optional
Maintainer: John Goerzen <jgoer...@complete.org>
-Build-Depends-Indep: debhelper (>> 5.0.37.2), python (>= 2.6.6-3~)
-Build-Depends: debhelper (>= 5.0.37.2)
+Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), dh-python
Standards-Version: 3.5.2
Homepage: gopher://gopher.quux.org/1/devel/gopher/pygopherd
Vcs-Git: git://git.complete.org/pygopherd
@@ -11,7 +10,7 @@
Package: pygopherd
Architecture: all
-Depends: python, mime-support, logrotate, python-simpletal, ${python:Depends}
+Depends: ${misc:Depends}, python, mime-support, logrotate, python-simpletal, ${python:Depends}
Provides: gopher-server
Description: Modular Multiprotocol Gopher/HTTP/WAP Server in Python
This is an all-new, modern Gopher server. It can serve documents
@@ -28,7 +27,7 @@
Package: pygfarm
Architecture: all
-Depends: pygopherd (>= ${Source-Version}), python-dictclient (>= 1.0.1)
+Depends: ${misc:Depends}, pygopherd (>= ${Source-Version}), python-dictclient (>= 1.0.1)
Description: Collection of add-on modules for Pygopherd
These add-on modules provide additional functionality for
your Pygopherd server.
diff -Nru pygopherd-2.0.18.3+nmu4/debian/copyright pygopherd-2.0.18.3+nmu4ubuntu1/debian/copyright
--- pygopherd-2.0.18.3+nmu4/debian/copyright 2008-04-10 13:56:55.000000000 +0000
+++ pygopherd-2.0.18.3+nmu4ubuntu1/debian/copyright 2016-04-08 05:20:15.000000000 +0000
@@ -3,7 +3,7 @@
It was downloaded from http://quux.org/give-me-gopher/
-Upstream Author(s): John Goerzen <jgoer...@complete.org>
+Upstream Author: John Goerzen <jgoer...@complete.org>
Copyright:
@@ -20,7 +20,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
Debian GNU/Linux may find the GNU General Public License, version 2, in
/usr/share/common-licenses/GPL-2.
diff -Nru pygopherd-2.0.18.3+nmu4/debian/ex.package.doc-base pygopherd-2.0.18.3+nmu4ubuntu1/debian/ex.package.doc-base
--- pygopherd-2.0.18.3+nmu4/debian/ex.package.doc-base 2008-03-02 21:51:01.000000000 +0000
+++ pygopherd-2.0.18.3+nmu4ubuntu1/debian/ex.package.doc-base 1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-Document: pygopherd
-Title: Debian pygopherd Manual
-Author: <insert document author here>
-Abstract: This manual describes what pygopherd is
- and how it can be used to
- manage online manuals on Debian systems.
-Section: unknown
-
-Format: debiandoc-sgml
-Files: /usr/share/doc/pygopherd/pygopherd.sgml.gz
-
-Format: postscript
-Files: /usr/share/doc/pygopherd/pygopherd.ps.gz
-
-Format: text
-Files: /usr/share/doc/pygopherd/pygopherd.text.gz
-
-Format: HTML
-Index: /usr/share/doc/pygopherd/html/index.html
-Files: /usr/share/doc/pygopherd/html/*.html
-
-
diff -Nru pygopherd-2.0.18.3+nmu4/debian/rules pygopherd-2.0.18.3+nmu4ubuntu1/debian/rules
--- pygopherd-2.0.18.3+nmu4/debian/rules 2014-12-09 16:28:12.000000000 +0000
+++ pygopherd-2.0.18.3+nmu4ubuntu1/debian/rules 2016-04-08 04:54:59.000000000 +0000
@@ -6,9 +6,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
PACKAGE=pygopherd
@@ -29,7 +26,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
@@ -47,14 +46,14 @@
-rm -f doc/standards/rfc*
# Add here commands to clean up after the build process.
- -$(MAKE) clean
+ $(MAKE) clean
dh_clean
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
# Add here commands to install the package into debian/pygopherd.
