[Git][haskell-team/haskell-devscripts][master] 2 commits: Add perl for runtime; adjust Uploaders; bump Debhelper level and Standards-Version; fix blurb.

[Felix Lechner (@lechner)]

Felix Lechner pushed to branch master at Debian Haskell Group / haskell-devscripts


Commits:
2fada682 by Felix Lechner at 2022-04-04T11:56:51-07:00
Add perl for runtime; adjust Uploaders; bump Debhelper level and Standards-Version; fix blurb.

Lintian complained about the identical short description.

- - - - -
ddc7cca5 by Felix Lechner at 2022-04-04T11:56:51-07:00
Use dh sequencer in d/rules.

- - - - -


2 changed files:

- debian/control
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -5,9 +5,10 @@ Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.or
 Uploaders: Joachim Breitner <nomeata at debian.org>
          , Louis Bettens <louis at bettens.info>
          , Ilias Tsitsimpis <iliastsi at debian.org>
-Build-Depends: debhelper-compat (= 12)
+         , Felix Lechner <felix.lechner at lease-up.com>
+Build-Depends: debhelper-compat (= 13)
 Build-Depends-Indep: perl
-Standards-Version: 4.5.0
+Standards-Version: 4.6.0
 Rules-Requires-Root: no
 Vcs-Browser: https://salsa.debian.org/haskell-team/haskell-devscripts
 Vcs-Git: https://salsa.debian.org/haskell-team/haskell-devscripts.git/
@@ -19,7 +20,6 @@ Depends: dctrl-tools
   , dh-buildinfo
   , ghc
   , cdbs
-  , ${misc:Depends}
   , html-xml-utils
   , ghc-haddock
   , libconst-fast-perl
@@ -28,6 +28,9 @@ Depends: dctrl-tools
   , liblist-someutils-perl
   , libpath-tiny-perl
   , libunicode-utf8-perl
+  , perl
+  , ${misc:Depends}
+  , ${perl:Depends}
 Breaks: haskell-devscripts (<= 0.10.2.3)
 Replaces: haskell-devscripts (<= 0.10.2.3)
 Suggests: haskell-devscripts
@@ -53,7 +56,7 @@ Depends: ${misc:Depends}
   , ghc (>= 8.2)
   , haskell-devscripts-minimal (= ${source:Version})
   , hscolour
-Description: Tools to help Debian developers build Haskell packages
+Description: Debian tools to build Haskell packages (with hscolour)
  This package provides a collection of scripts to help build Haskell
  packages for Debian.  Unlike haskell-utils, this package is not
  expected to be installed on the machines of end users.


=====================================
debian/rules
=====================================
@@ -1,47 +1,21 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# The following file defines DEB_VERSION
+# defines DEB_VERSION
 include /usr/share/dpkg/pkg-info.mk
 
-manpages = $(shell cat debian/manpages)
-
-%.1: %.pod
-	pod2man -c 'Haskell devscripts documentation' -r 'Haskell devscripts $(DEB_VERSION)' $< > $@
-
-%.1: %
-	pod2man -c 'Haskell devscripts documentation' -r 'Haskell devscripts $(DEB_VERSION)' $< > $@
-
-.PHONY: build
-build-indep: $(manpages)
-
-build-arch:
-
-build: build-arch build-indep
-
-install-stamp:
-	dh install
-
-.PHONY: install
-install: install-stamp
-
-binary-indep-stamp: install-stamp
-	dh binary-indep
-	touch $@
-
-.PHONY: binary-indep
-binary-indep: build-indep binary-indep-stamp
+manual_pages := $(shell cat debian/manpages)
+pod2man := pod2man --center 'Haskell devscripts documentation' --release 'Haskell devscripts $(DEB_VERSION)'
 
-.PHONY: binary-arch
-binary-arch: build-arch install-stamp
+%:
+	dh $@
 
-.PHONY: binary
-binary: binary-indep-stamp
+.PHONY: after_dh_auto_build
+execute_after_dh_auto_build:
+	set -e ; for MANUAL_PAGE in $(manual_pages) ; do \
+		BASENAME=$$(basename "$$MANUAL_PAGE" .1) ; \
+		$(pod2man) "$$BASENAME".pod > "$$MANUAL_PAGE" ; \
+	done
 
-.PHONY: clean
-clean:
-	dh clean
-	rm -f $(manpages)
+.PHONY: after_dh_auto_clean
+execute_after_dh_auto_clean:
+	rm -f $(manual_pages)



View it on GitLab: https://salsa.debian.org/haskell-team/haskell-devscripts/-/compare/8d20067a2a3ce3a6c40775e36f8d265520b70922...ddc7cca53a8a888e0db1d845f3c4b561e4964539

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/haskell-devscripts/-/compare/8d20067a2a3ce3a6c40775e36f8d265520b70922...ddc7cca53a8a888e0db1d845f3c4b561e4964539
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20220404/1d5881b7/attachment-0001.htm>