Commit f8fc4b51 authored by Felix Lechner's avatar Felix Lechner

Fix two tests for debhelper update 12.4, which dropped manual sequencing commands.

Two tests fail to build in unstable because a new debhelper version
there dropped support for manual sequencing. The relevant changelog
entry is:

  * dh: Retroactively remove support for manual dh sequence
    operators (--until, --after, --before and --remaining).
    This breaks about 8 source packages that still rely on this
    feature and have not yet migrated away.  (Closes: #932537)
    Please see the debhelper bug for relevant bug numbers and
    package names.

Two tests for the tag 'dh-manual-sequence-control-obsolete' could no
longer built due to build failure. Removed the manual sequencing and
adjusted the expected tags in both.

If the tag 'dh-manual-sequence-control-obsolete' cannot be tested in
another way, it will probably be removed from Lintian.

Gbp-Dch: ignore
parent 06cddaef
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
binary: binary-arch binary-indep binary: binary-arch binary-indep
binary-arch: binary-arch:
binary-indep: binary-indep:
dh binary-indep --until dh_prep
-dh_clideps -dh_clideps
-dh_gtkmodules -dh_gtkmodules
dh_lisp || true dh_lisp || true
...@@ -20,6 +19,6 @@ else ...@@ -20,6 +19,6 @@ else
dh_pysupport dh_pysupport
endif endif
endif endif
dh binary-indep --remaining dh binary-indep
-dh_strip_nondeterminism -dh_strip_nondeterminism
-dh_scour -dh_scour
...@@ -8,6 +8,4 @@ debhelper-no-depends (source): missing-build-dependency-for-dh_-command dh_gtkmo ...@@ -8,6 +8,4 @@ debhelper-no-depends (source): missing-build-dependency-for-dh_-command dh_gtkmo
debhelper-no-depends (source): missing-build-dependency-for-dh_-command dh_dpatch_patch => dpatch debhelper-no-depends (source): missing-build-dependency-for-dh_-command dh_dpatch_patch => dpatch
debhelper-no-depends (source): missing-build-dependency-for-dh_-command dh_clideps => cli-common-dev debhelper-no-depends (source): missing-build-dependency-for-dh_-command dh_clideps => cli-common-dev
debhelper-no-depends (source): missing-build-dependency debhelper | debhelper-compat debhelper-no-depends (source): missing-build-dependency debhelper | debhelper-compat
debhelper-no-depends (source): dh-manual-sequence-control-obsolete dh until
debhelper-no-depends (source): dh-manual-sequence-control-obsolete dh remaining
debhelper-no-depends (source): debhelper-but-no-misc-depends debhelper-no-depends debhelper-no-depends (source): debhelper-but-no-misc-depends debhelper-no-depends
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
binary: binary-arch binary-indep binary: binary-arch binary-indep
binary-arch: binary-arch:
binary-indep: binary-indep:
dh binary-indep --until dh_prep
-dh_clideps -dh_clideps
-dh_gtkmodules -dh_gtkmodules
dh_lisp || true dh_lisp || true
...@@ -20,6 +19,6 @@ else ...@@ -20,6 +19,6 @@ else
dh_pysupport dh_pysupport
endif endif
endif endif
dh binary-indep --remaining dh binary-indep
-dh_strip_nondeterminism -dh_strip_nondeterminism
-dh_scour -dh_scour
...@@ -8,6 +8,4 @@ debhelper-no-depends (source): missing-build-dependency-for-dh_-command dh_gtkmo ...@@ -8,6 +8,4 @@ debhelper-no-depends (source): missing-build-dependency-for-dh_-command dh_gtkmo
debhelper-no-depends (source): missing-build-dependency-for-dh_-command dh_dpatch_patch => dpatch debhelper-no-depends (source): missing-build-dependency-for-dh_-command dh_dpatch_patch => dpatch
debhelper-no-depends (source): missing-build-dependency-for-dh_-command dh_clideps => cli-common-dev debhelper-no-depends (source): missing-build-dependency-for-dh_-command dh_clideps => cli-common-dev
debhelper-no-depends (source): missing-build-dependency debhelper | debhelper-compat debhelper-no-depends (source): missing-build-dependency debhelper | debhelper-compat
debhelper-no-depends (source): dh-manual-sequence-control-obsolete dh until
debhelper-no-depends (source): dh-manual-sequence-control-obsolete dh remaining
debhelper-no-depends (source): debhelper-but-no-misc-depends debhelper-no-depends debhelper-no-depends (source): debhelper-but-no-misc-depends debhelper-no-depends
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment