Merge branch 'fordsa' of https://git.adam-barratt.org.uk/git/mirror/userdir-ldap-cgi

diff --git a/.gitignore b/.gitignore
index 624dd23..0d443e2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-build
 debian/debhelper.log
 debian/files
 debian/tmp/

diff --git a/debian/changelog b/debian/changelog
index 5572b7c..9c57c56 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,14 @@ userdir-ldap-cgi (0.3.43~) UNRELEASED; urgency=medium
     put totp secrets to be picked up.
   * Add totp-fetch-seed.cgi for fetching totp seeds.
 
+  [ Julien Cristau ]
+  * Add build-dependency on libgd-perl.
+  * Remove Stephen Gran from Uploaders.
+  * Fix a few lintian warnings.
+
+  [ Adam D. Barratt ]
+  * Documentation updates and fixes.
+
  -- Tollef Fog Heen <tfheen@debian.org>  Tue, 23 Jul 2019 23:07:19 +0200
 
 userdir-ldap-cgi (0.3.42) unstable; urgency=medium

diff --git a/debian/control b/debian/control
index 084244c..6e968a1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,15 @@ Source: userdir-ldap-cgi
 Section: admin
 Priority: optional
 Maintainer: Debian Administration team <debian-admin@lists.debian.org>
-Build-Depends: debhelper, wml, isoquery, iso-codes, libhtml-parser-perl
+Build-Depends:
+ debhelper (>= 10),
+ wml,
+ isoquery,
+ iso-codes,
+ libhtml-parser-perl,
+ libgd-perl,
 Standards-Version: 3.6.1
-Uploaders: Peter Palfrader <weasel@debian.org>, Stephen Gran <sgran@debian.org>, Martin Zobel-Helas <zobel@debian.org>
+Uploaders: Peter Palfrader <weasel@debian.org>, Martin Zobel-Helas <zobel@debian.org>
 
 Package: userdir-ldap-cgi
 Architecture: all

diff --git a/debian/rules b/debian/rules
index 3ca3dab..f6b9222 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -6,15 +6,16 @@
 package:=userdir-ldap-cgi
 i:=./debian/$(package)
 
-build:
+build: build-indep
+
+build-indep:
        dh_testdir
        $(MAKE) -C html
-       touch build
 
 clean:
        dh_testdir
-       -rm -f build
-       -rm -rf debian/files* core debian/substvars debian/debhelper.log html/*.html
+       dh_clean
+       -rm -rf debian/files* core debian/substvars debian/debhelper.log html/*.html html/domains.tab
 
 instdirs = \
        var/www/userdir-ldap \
@@ -28,7 +29,7 @@ instdirs = \
 binary-indep: build
        dh_testdir
        dh_testroot
-       dh_clean -k
+       dh_prep
        dh_installdirs $(instdirs)
        dh_installdocs
 
@@ -77,4 +78,4 @@ binary-arch: build
 
 binary:        binary-indep binary-arch
 
-.PHONY: binary binary-arch binary-indep clean
+.PHONY: build build-indep binary binary-arch binary-indep clean