[lintian] 01/03: dh-php5 is replaced by dh-php, and php5-dev by php-dev
This is an automated email from the git hooks/post-receive script.
jwilk pushed a commit to branch master
in repository lintian.
commit a18da7ae439a2dff9d57335c300d731e22d4469a
Author: Mathieu Parent <Mathieu.PARENT@nantesmetropole.fr>
Date: Thu Mar 3 10:56:23 2016 +0100
dh-php5 is replaced by dh-php, and php5-dev by php-dev
Note that php-dev currently depends on php7.0-dev
---
checks/phppear.desc | 4 ++--
checks/phppear.pm | 18 +++++++++---------
t/tests/phppear-pear/tags | 6 +++---
t/tests/phppear-pearok/debian/debian/control.in | 2 +-
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/checks/phppear.desc b/checks/phppear.desc
index ccf7a57..5f659b6 100644
--- a/checks/phppear.desc
+++ b/checks/phppear.desc
@@ -50,7 +50,7 @@ Tag: pecl-package-requires-build-dependency
Severity: normal
Certainty: possible
Info: The package is a PECL package but its control file doesn't have
- php5-dev or dh-php5 as a build dependency.
+ php-dev or dh-php as a build dependency.
Tag: composer-package-without-pkg-php-tools-builddep
Severity: wishlist
@@ -75,7 +75,7 @@ Severity: normal
Certainty: possible
Info: The package uses pkg-php-tools but dh command is called without
--with phppear or --with phpcomposer. A PECL package should also have
- --with php5.
+ --with php.
.
pkg-php-tools db addons are the recommended tool for building PHP PEAR or
Composer packages. For more information, install it and read the included
diff --git a/checks/phppear.pm b/checks/phppear.pm
index 0295c37..6cf28cc 100644
--- a/checks/phppear.pm
+++ b/checks/phppear.pm
@@ -101,12 +101,12 @@ sub run {
}
close($package_xml_fd);
if ($package_type eq 'extsrc') { # PECL package
- if (!$bdepends->implies('php5-dev')) {
+ if (!$bdepends->implies('php-dev')) {
tag 'pecl-package-requires-build-dependency',
- 'php5-dev';
+ 'php-dev';
}
- if (!$bdepends->implies('dh-php5')) {
- tag 'pecl-package-requires-build-dependency','dh-php5';
+ if (!$bdepends->implies('dh-php')) {
+ tag 'pecl-package-requires-build-dependency','dh-php';
}
if (!$bdepends->implies('pkg-php-tools (>= 1.5~)')) {
tag
@@ -152,7 +152,7 @@ sub run {
my $has_buildsystem_phppear = 0;
my $has_addon_phppear = 0;
my $has_addon_phpcomposer= 0;
- my $has_addon_php5 = 0;
+ my $has_addon_php = 0;
my $rules_fd = $rules->open;
while (<$rules_fd>) {
while (s,\\$,, and defined(my $cont = <$rules_fd>)) {
@@ -172,8 +172,8 @@ m/^\t\s*dh\s.*--with(?:=|\s+)(?:\S+,)*phpcomposer(?:,\S+)*\s/
) {
$has_addon_phpcomposer = 1;
}
- if (m/^\t\s*dh\s.*--with(?:=|\s+)(?:\S+,)*php5(?:,\S+)*\s/) {
- $has_addon_php5 = 1;
+ if (m/^\t\s*dh\s.*--with(?:=|\s+)(?:\S+,)*php(?:,\S+)*\s/) {
+ $has_addon_php = 1;
}
}
close($rules_fd);
@@ -186,8 +186,8 @@ m/^\t\s*dh\s.*--with(?:=|\s+)(?:\S+,)*phpcomposer(?:,\S+)*\s/
if (!$has_addon_phppear) {
tag 'missing-pkg-php-tools-addon', 'phppear';
}
- if (($package_type eq 'extsrc') and not $has_addon_php5) {
- tag 'missing-pkg-php-tools-addon', 'php5';
+ if (($package_type eq 'extsrc') and not $has_addon_php) {
+ tag 'missing-pkg-php-tools-addon', 'php';
}
}
if ( !defined($package_xml)
diff --git a/t/tests/phppear-pear/tags b/t/tests/phppear-pear/tags
index e01731b..2c8f29b 100644
--- a/t/tests/phppear-pear/tags
+++ b/t/tests/phppear-pear/tags
@@ -1,6 +1,6 @@
I: phppear-pear source: pear-package-not-using-substvar ${phppear:description}
I: phppear-pear source: pear-package-not-using-substvar ${phppear:summary}
-W: phppear-pear source: missing-pkg-php-tools-addon php5
+W: phppear-pear source: missing-pkg-php-tools-addon php
W: phppear-pear source: missing-pkg-php-tools-addon phppear
W: phppear-pear source: missing-pkg-php-tools-buildsystem phppear
W: phppear-pear source: pear-package-but-missing-dependency Breaks
@@ -9,5 +9,5 @@ W: phppear-pear source: pear-package-but-missing-dependency Recommends
W: phppear-pear source: pear-package-feature-requires-newer-pkg-php-tools (>= 1.4~) for package2.xml
W: phppear-pear source: pear-package-feature-requires-newer-pkg-php-tools (>= 1.5~) for PECL support
W: phppear-pear source: pear-package-feature-requires-newer-pkg-php-tools (>= 1~) for package name overrides
-W: phppear-pear source: pecl-package-requires-build-dependency dh-php5
-W: phppear-pear source: pecl-package-requires-build-dependency php5-dev
+W: phppear-pear source: pecl-package-requires-build-dependency dh-php
+W: phppear-pear source: pecl-package-requires-build-dependency php-dev
diff --git a/t/tests/phppear-pearok/debian/debian/control.in b/t/tests/phppear-pearok/debian/debian/control.in
index 7021cfc..ea2f6e9 100755
--- a/t/tests/phppear-pearok/debian/debian/control.in
+++ b/t/tests/phppear-pearok/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 9), pkg-php-tools, php5-dev, dh-php5
+Build-Depends: debhelper (>= 9), pkg-php-tools, php-dev, dh-php
Package: {$source}
Architecture: {$architecture}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: