Skip to content

Commit a6239ff

Browse files
committed
Support "Build-Depends: dh-sequence-dist-zilla" instead of "dh $@ --with dist-zilla"
Implemented by adding the according Provides. Also adds documentation of this to dh-dist-zilla.pod.
1 parent f83ee6e commit a6239ff

File tree

3 files changed

+20
-6
lines changed

3 files changed

+20
-6
lines changed

debian/changelog

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
dh-dist-zilla (1.4.0) UNRELEASED; urgency=medium
2+
3+
* Support "Build-Depends: dh-sequence-dist-zilla" instead of "dh $@
4+
--with dist-zilla" by adding according Provides. Document this, too.
5+
6+
-- Axel Beckert <abe@debian.org> Fri, 21 Feb 2020 00:54:13 +0100
7+
18
dh-dist-zilla (1.3.7) unstable; urgency=medium
29

310
* Add dependency on debhelper (<< 10.10.6~) | debhelper (>= 11.1.3~) to

debian/control

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Homepage: https://github.com/elmar/dh-dist-zilla
1212
Rules-Requires-Root: no
1313

1414
Package: dh-dist-zilla
15+
Provides: dh-sequence-dist-zilla
1516
Architecture: all
1617
Multi-Arch: foreign
1718
Depends: debhelper (>= 7),

dh-dist-zilla.pod

+12-6
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,24 @@ dh-dist-zilla - debhelper add-on to run dzil (Dist::Zilla) during build
44

55
=head1 DESCRIPTION
66

7-
The dh-dist-zilla package provides a sequence addon for debhelper 7 which
8-
can be used in the following way:
7+
The dh-dist-zilla package provides a sequence addon for debhelper 7
8+
and above which can be used in the following two ways:
9+
10+
In C<debian/rules> since debhelper 7:
911

1012
#!/usr/bin/make -f
1113
export DH_VERBOSE=1
1214
%:
1315
dh $@ --with dist-zilla
1416

15-
This will call C<dzil build> prior to C<dh_auto_configure>, C<dzil clean>
16-
before C<dh_clean> and will add the option C<-D I<build-directory>> to
17-
C<dh_auto_configure>, C<dh_auto_build>, C<dh_auto_install>, and
18-
C<dh_auto_test>.
17+
Since debhelper 11.4 alternatively also just in C<debian/control>:
18+
19+
Build-Depends: dh-sequence-dist-zilla
20+
21+
Both variants will call C<dzil build> prior to C<dh_auto_configure>,
22+
C<dzil clean> before C<dh_clean> and will add the option C<-D
23+
I<build-directory>> to C<dh_auto_configure>, C<dh_auto_build>,
24+
C<dh_auto_install>, and C<dh_auto_test>.
1925

2026
=head2 How to generate the .orig.tar.xz "upstream" tar-ball
2127

0 commit comments

Comments
 (0)