Control: tag -1 + pending

Hi,

ni...@thykier.net wrote:
> The package forg is using a debhelper compat level of 3 or less
> according to lintian.  These compat levels have been deprecated for
> the past ~10 years and debhelper will remove support for them in the near
> future (as declared in [1]).

In this case the cause was that forg is using "export DH_COMPAT=2".

>  * Please migrate the package to a supported debhelper compat level.
>    - Compat 9 is recommended

I've prepared the attached non-maintainer upload (NMU) to address this
issue.

> If you are using other deprecated debhelper features (such as omitting
> the debian/compat file), please consider fixing those while you are at
> it.

I've allowed myself to do that, too, for this NMU. The NMU also
includes fixes for some more issues which popped up only after the
last maintainer upload.

For that reason, I'll upload it only to DELAYED/5 after this mail --
despite of fixing an over two months old bug (which gained RC severity
about 3 weeks ago) and John having declared a low NMU threshold.

John: Feel free to tell me if I should delay the NMU longer or
fast-forward it. In case you should be not happy with any of the
non-RC changes, please tell me, too.

The debdiff:

diff -u forg-0.5.1/debian/rules forg-0.5.1/debian/rules
--- forg-0.5.1/debian/rules
+++ forg-0.5.1/debian/rules
@@ -5,18 +5,17 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatability version to use.
-export DH_COMPAT=2
-
 configure: configure-stamp
 configure-stamp:
        dh_testdir
        # Add here commands to configure the package.
-       
+
 
        touch configure-stamp
 
-build: configure-stamp build-stamp
+build: build-arch build-indep
+build-arch:
+build-indep: configure-stamp build-stamp
 build-stamp:
        dh_testdir
 
@@ -32,14 +31,14 @@
        rm -f build-stamp configure-stamp
 
        # Add here commands to clean up after the build process.
-       -$(MAKE) clean
+       dh_auto_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/forg.
@@ -65,7 +64,7 @@
 #      dh_installpam
 #      dh_installinit
        dh_installcron
-       dh_installmanpages
+       dh_installman
        dh_installinfo
 #      dh_undocumented
        dh_installchangelogs 
diff -u forg-0.5.1/debian/control forg-0.5.1/debian/control
--- forg-0.5.1/debian/control
+++ forg-0.5.1/debian/control
@@ -5,11 +5,10 @@
-Build-Depends: debhelper (>> 5.0.37.2), python (>= 2.6.6-3~)
+Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), dh-python
 Standards-Version: 3.7.2
 
 Package: forg
 Architecture: all
-Depends: ${python:Depends}, python-tk, python-pmw, python-imaging-tk
+Depends: ${misc:Depends}, ${python:Depends}, python-tk, python-pmw, 
python-imaging-tk
 Description: Graphical Gopher Browser
- forg is a new graphical browser for gopher written in python.
+ forg is a new graphical browser for gopher written in Python.
  It will let you browse the world-wide gopherspace and handles
  various types of media, including HTML and video.
-
diff -u forg-0.5.1/debian/changelog forg-0.5.1/debian/changelog
--- forg-0.5.1/debian/changelog
+++ forg-0.5.1/debian/changelog
@@ -1,3 +1,21 @@
+forg (0.5.1-7.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Convert to debhelper compatibility level 9 (Closes: #800172).
+    + Magically fixes lintian warning no-upstream-changelog.
+    + Replace "dh_clean -k" with "dh_prop"
+    + Replace "dh_installmanpages" with "dh_installman".
+    + Add dependency on ${misc:Depends}.
+    + Use dh_auto_clean instead of "-$(MAKE) clean". (Fixes lintian warning
+      debian-rules-ignores-make-clean-error.)
+    + Add recommended debian/rules targets build-indep and build-arch.
+  * Build-depend on dh-python. (Fixes dh_python2 warning.)
+  * Fix lintian warning capitalization-error-in-description (python vs
+    Python) and remove trailing newline from debian/control.
+  * Add man-page written by Robert Marder. (Closes: #453526)
+
+ -- Axel Beckert <a...@debian.org>  Sun, 06 Dec 2015 22:46:49 +0100
+
 forg (0.5.1-7.1) unstable; urgency=low
 
   * Non-maintainer upload.
only in patch2:
unchanged:
--- forg-0.5.1.orig/debian/compat
+++ forg-0.5.1/debian/compat
@@ -0,0 +1 @@
+9
only in patch2:
unchanged:
--- forg-0.5.1.orig/debian/forg.1
+++ forg-0.5.1/debian/forg.1
@@ -0,0 +1,28 @@
+.TH FORG 1 "29 Nov 2007"
+.SH NAME
+\fBforg\fP \- graphical gopher:// client
+
+.SH SYNOPSIS
+.B forg
+.RI [gopher-url]
+.SH DESCRIPTION
+.B forg
+is a graphical gopher client written in Python. It includes bookmarking, 
browser-style navigation, launching specific file types with user-specified 
programs, and Gopher+ compliance.
+
+.LP
+.SH OPTIONS
+
+.TP
+\fBgopher\-url\fR
+Specifies the initial URL to open when 
+.B forg
+starts. If this is not specified, 
+.B forg
+will load the home page as set in ~/.forg/forgrc or will load the built in 
default of gopher://gopher.floodgap.com:70/.
+.B forg
+requires that an absolute URI be used; thus the gopher:// protocol part is 
required. The port number nor any path information needs to be specified, 
however.
+.SH BUGS
+If you find a bug, please report it using the Debian Bug Tracker at 
http://bugs.debian.org/forg.
+.SH AUTHORS
+David Allen (m...@idatar.com)
+
only in patch2:
unchanged:
--- forg-0.5.1.orig/debian/manpages
+++ forg-0.5.1/debian/manpages
@@ -0,0 +1 @@
+debian/forg.1

The following is the debdiff on the resulting binary package:

$ debdiff ../forg_0.5.1-7.1_all.deb 
/var/cache/pbuilder/result/forg_0.5.1-7.2_all.deb
[The following lists of changes regard files as different if they have
different names, permissions or owners.]

Files in second .deb but not in first
-------------------------------------
-rw-r--r--  root/root   /usr/share/doc/forg/changelog.gz
-rw-r--r--  root/root   /usr/share/man/man1/forg.1.gz

Control files: lines which differ (wdiff format)
------------------------------------------------
Depends: [-python-] {+python:any+} (>= [-2.6.6-7~),-] {+2.7.5-5~),+} python-tk, 
python-pmw, python-imaging-tk
 forg is a new graphical browser for gopher written in [-python.-] {+Python.+}
Installed-Size: [-341-] {+335+}
Version: [-0.5.1-7.1-] {+0.5.1-7.2+}

                Regards, Axel
-- 
 ,''`.  |  Axel Beckert <a...@debian.org>, http://people.debian.org/~abe/
: :' :  |  Debian Developer, ftp.ch.debian.org Admin
`. `'   |  4096R: 2517 B724 C5F6 CA99 5329  6E61 2FF9 CD59 6126 16B5
  `-    |  1024D: F067 EA27 26B9 C3FC 1486  202E C09E 1D89 9593 0EDE

Attachment: signature.asc
Description: Digital signature

Reply via email to