[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#818962: [lintian] Proposed patches for php checks



Control: tag -1 + patch confirmed

Hello,

See the attached patches (0001 to 0004).

Patches 5 and 6 are unrelated.

Regards
-- 
Mathieu
From 4231f1d6bcf8deaa785941b6ed8809aa2127dc79 Mon Sep 17 00:00:00 2001
From: Mathieu Parent <Mathieu.PARENT@nantesmetropole.fr>
Date: Thu, 3 Mar 2016 10:50:36 +0100
Subject: [PATCH 1/6] There is now a php-cli package

---
 checks/scripts.desc                        | 6 +++---
 data/scripts/versioned-interpreters        | 2 +-
 t/tests/legacy-scripts/debian/debian/rules | 4 ++--
 t/tests/legacy-scripts/tags                | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/checks/scripts.desc b/checks/scripts.desc
index ddcc5ed..77590ec 100644
--- a/checks/scripts.desc
+++ b/checks/scripts.desc
@@ -221,9 +221,9 @@ Tag: php-script-but-no-phpX-cli-dep
 Severity: important
 Certainty: certain
 Info: Packages with PHP scripts must depend on a phpX-cli package such as
- php5-cli.  Note that a dependency on a php-cgi package (such as php5-cgi)
- is needlessly strict and forces the user to install a package that isn't
- needed.
+ php-cli or php7.0-cli.  Note that a dependency on a php-cgi package (such
+ as php-cgi or php7.0-cgi) is needlessly strict and forces the user to
+ install a package that isn't needed.
  .
  In some cases a weaker relationship, such as Suggests or Recommends, will
  be more appropriate.
diff --git a/data/scripts/versioned-interpreters b/data/scripts/versioned-interpreters
index fff44c2..05fb366 100644
--- a/data/scripts/versioned-interpreters
+++ b/data/scripts/versioned-interpreters
@@ -73,7 +73,7 @@ guile   => /usr/bin, guile-([\d.]+), guile-$1, 1.6 1.8,
 jruby   => /usr/bin, jruby([\d.]+), jruby$1, 1.0 1.1 1.2
 lua     => /usr/bin, lua([\d.]+), lua$1, 40 50 5.1 5.2
 octave  => /usr/bin, octave([\d.]+), octave$1, 3.0 3.2
-php     => /usr/bin, php(\d+), php$1-cli, 5, @NO_DEFAULT_DEPS@
+php     => /usr/bin, php(\d+), php$1-cli, 5, php-cli
 pike    => /usr/bin, pike([\d.]+), pike$1 | pike$1-core, 7.6 7.8, @NO_DEFAULT_DEPS@
 python  => /usr/bin, python([\d.]+), python$1:any | python$1-minimal:any, 2.7, @SKIP_UNVERSIONED@
 ruby    => /usr/bin, ruby([\d.]+), ruby$1, 1.8 1.9, @SKIP_UNVERSIONED@
diff --git a/t/tests/legacy-scripts/debian/debian/rules b/t/tests/legacy-scripts/debian/debian/rules
index 25b6f9e..a615bd6 100755
--- a/t/tests/legacy-scripts/debian/debian/rules
+++ b/t/tests/legacy-scripts/debian/debian/rules
@@ -63,8 +63,8 @@ binary-indep:
 	install -m 755 init-lsb-other $(tmp)/etc/init.d/lsb-other
 
 	install -m 755 phpfoo $(tmp)/usr/share/scripts/
-	sed 's/php$$/php5/' phpfoo > $(tmp)/usr/share/scripts/php5foo
-	chmod 755 $(tmp)/usr/share/scripts/php5foo
+	sed 's/php$$/php7.0/' phpfoo > $(tmp)/usr/share/scripts/php7.0foo
+	chmod 755 $(tmp)/usr/share/scripts/php7.0foo
 
 	echo "#!/usr/bin/perl" >> $(tmp)/usr/share/scripts/foobar.in
 	chmod 644 $(tmp)/usr/share/scripts/foobar.in
diff --git a/t/tests/legacy-scripts/tags b/t/tests/legacy-scripts/tags
index 3f2854c..d229820 100644
--- a/t/tests/legacy-scripts/tags
+++ b/t/tests/legacy-scripts/tags
@@ -13,7 +13,7 @@ E: scripts: init.d-script-has-unterminated-lsb-section etc/init.d/lsb-broken:15
 E: scripts: missing-dep-for-interpreter jruby => jruby | jruby1.0 | jruby1.1 | jruby1.2 (usr/bin/jruby-broken)
 E: scripts: missing-dep-for-interpreter lefty => graphviz (usr/bin/lefty-foo)
 E: scripts: package-installs-python-bytecode usr/lib/python2.3/site-packages/test.pyc
-E: scripts: php-script-but-no-phpX-cli-dep usr/share/scripts/php5foo
+E: scripts: php-script-but-no-phpX-cli-dep usr/share/scripts/php7.0foo
 E: scripts: php-script-but-no-phpX-cli-dep usr/share/scripts/phpfoo
 E: scripts: python-script-but-no-python-dep usr/bin/py2foo
 E: scripts: python-script-but-no-python-dep usr/bin/pyfoo
-- 
2.6.2

From 9e3f413469c0533a34f397dae77ef5307e4735f9 Mon Sep 17 00:00:00 2001
From: Mathieu Parent <Mathieu.PARENT@nantesmetropole.fr>
Date: Thu, 3 Mar 2016 10:56:23 +0100
Subject: [PATCH 2/6] 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 +++++++++---------
 data/debhelper/dh_addons                        |  2 +-
 data/debhelper/dh_commands                      |  2 +-
 data/debhelper/dh_packages                      |  2 +-
 data/debhelper/maint_commands                   |  2 +-
 data/debhelper/miscDepends_commands             |  2 +-
 t/tests/phppear-pear/tags                       |  6 +++---
 t/tests/phppear-pearok/debian/debian/control.in |  2 +-
 9 files changed, 20 insertions(+), 20 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/data/debhelper/dh_addons b/data/debhelper/dh_addons
index 14f6493..5ebb347 100644
--- a/data/debhelper/dh_addons
+++ b/data/debhelper/dh_addons
@@ -40,7 +40,7 @@ ocaml=dh-ocaml
 parrot=parrot-devel
 perl_dbi=libdbi-perl
 perl_imager=libimager-perl
-php5=dh-php5
+php=dh-php
 phpcomposer=pkg-php-tools
 phppear=pkg-php-tools
 pkgkde_symbolshelper=pkg-kde-tools
diff --git a/data/debhelper/dh_commands b/data/debhelper/dh_commands
index 4ea90fe..51434bb 100644
--- a/data/debhelper/dh_commands
+++ b/data/debhelper/dh_commands
@@ -130,7 +130,7 @@ dh_pdl=pdl
 dh_perl=debhelper
 dh_perl_dbi=libdbi-perl
 dh_perl_imager=libimager-perl
-dh_php5=dh-php5
+dh_php=dh-php
 dh_phpcomposer=pkg-php-tools
 dh_phppear=pkg-php-tools
 dh_pidgin=pidgin-dev
diff --git a/data/debhelper/dh_packages b/data/debhelper/dh_packages
index 87a0ed2..a5159ad 100644
--- a/data/debhelper/dh_packages
+++ b/data/debhelper/dh_packages
@@ -26,7 +26,7 @@ dh-lua
 dh-make
 dh-metainit
 dh-ocaml
-dh-php5
+dh-php
 dh-python
 dh-rebar
 dh-strip-nondeterminism
diff --git a/data/debhelper/maint_commands b/data/debhelper/maint_commands
index e182ced..9fbdfaf 100644
--- a/data/debhelper/maint_commands
+++ b/data/debhelper/maint_commands
@@ -31,7 +31,7 @@ dh_installzopeinstance
 dh_makeshlibs
 dh_metainit
 dh_nativejava
-dh_php5
+dh_php
 dh_pysupport
 dh_suidregister
 dh_systemd_enable
diff --git a/data/debhelper/miscDepends_commands b/data/debhelper/miscDepends_commands
index c42896d..e42de88 100644
--- a/data/debhelper/miscDepends_commands
+++ b/data/debhelper/miscDepends_commands
@@ -20,7 +20,7 @@ dh_linktree
 dh_lisp
 dh_nativejava
 dh_pangomodules
-dh_php5
+dh_php
 dh_phppear
 dh_pidgin
 dh_pyppd
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}
-- 
2.6.2

From 3691da42d597614b7e89b793bd005c75c509dbd0 Mon Sep 17 00:00:00 2001
From: Mathieu Parent <Mathieu.PARENT@nantesmetropole.fr>
Date: Tue, 19 Apr 2016 11:32:57 +0200
Subject: [PATCH 3/6] php-foo.ini is now in /etc/php/*/mods-available/

---
 checks/files.pm                             | 4 ++--
 t/tests/files-general/debian/debian/install | 2 +-
 t/tests/files-general/tags                  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/checks/files.pm b/checks/files.pm
index 78842fc..814abc6 100644
--- a/checks/files.pm
+++ b/checks/files.pm
@@ -518,8 +518,8 @@ sub run {
             elsif ($fname =~ m,^etc/pam.conf, and $pkg ne 'libpam-runtime') {
                 tag 'config-file-reserved', "$fname by libpam-runtime";
             }
-            #----------------- /etc/php5/conf.d
-            elsif ($fname =~ m,^etc/php5/conf.d/.+\.ini$,) {
+            #----------------- /etc/php/7.0/mods-available/*.ini
+            elsif ($fname =~ m,^etc/php/.*/mods-available/.+\.ini$,) {
                 if ($file->is_file) {
                     my $fd = $file->open;
                     while (<$fd>) {
diff --git a/t/tests/files-general/debian/debian/install b/t/tests/files-general/debian/debian/install
index 5e6ef96..dccb61e 100644
--- a/t/tests/files-general/debian/debian/install
+++ b/t/tests/files-general/debian/debian/install
@@ -11,7 +11,7 @@ lintian.conf etc/modprobe.d
 dir usr/share/info
 foo.vcproj usr/lib/foo
 lintian-lib.conf etc/ld.so.conf.d
-php-foo.ini etc/php5/conf.d
+php-foo.ini etc/php/7.0/mods-available
 types usr/share/mime
 mimeinfo.cache usr/share/applications
 file-in-new-top-level-dir new-top-level-dir/
diff --git a/t/tests/files-general/tags b/t/tests/files-general/tags
index 1aa47c4..8becd10 100644
--- a/t/tests/files-general/tags
+++ b/t/tests/files-general/tags
@@ -28,6 +28,6 @@ W: files-general: icon-size-and-directory-name-mismatch usr/share/apps/lintian/i
 W: files-general: icon-size-and-directory-name-mismatch usr/share/apps/lintian/icons/hicolor/64x64/lintian-64x64.png 22x22
 W: files-general: icon-size-and-directory-name-mismatch usr/share/icons/hicolor/22x22/apps/lintian-16x16.png 16x16
 W: files-general: nfs-temporary-file-in-package usr/share/foo/.nfs-fake-tmpfile
-W: files-general: obsolete-comments-style-in-php-ini etc/php5/conf.d/php-foo.ini
+W: files-general: obsolete-comments-style-in-php-ini etc/php/7.0/mods-available/php-foo.ini
 W: files-general: raster-image-in-scalable-directory usr/share/icons/hicolor/scalable/apps/lintian-16x16.png
 W: files-general: windows-devel-file-in-package usr/lib/foo/foo.vcproj
-- 
2.6.2

From d527bd850f87b367a8196a0702edc2f1a29c60e2 Mon Sep 17 00:00:00 2001
From: Mathieu Parent <Mathieu.PARENT@nantesmetropole.fr>
Date: Tue, 19 Apr 2016 11:21:43 +0200
Subject: [PATCH 4/6] Updated checks.pot

---
 po4a/po/checks/checks.pot | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/po4a/po/checks/checks.pot b/po4a/po/checks/checks.pot
index 13a3fe1..458e331 100644
--- a/po4a/po/checks/checks.pot
+++ b/po4a/po/checks/checks.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-03-11 17:44+0000\n"
+"POT-Creation-Date: 2016-04-19 11:04+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14176,7 +14176,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "The package is a PECL package but its control file doesn't have\n"
-"php5-dev or dh-php5 as a build dependency."
+"php-dev or dh-php as a build dependency."
 msgstr ""
 
 #. Please keep the leading space.  Indented lines are used for
@@ -14221,7 +14221,7 @@ msgstr ""
 msgid ""
 "The package uses pkg-php-tools but dh command is called without\n"
 "--with phppear or --with phpcomposer. A PECL package should also have\n"
-"--with php5.\n"
+"--with php.\n"
 "\n"
 "pkg-php-tools db addons are the recommended tool for building PHP PEAR or\n"
 "Composer packages. For more information, install it and read the included\n"
@@ -15162,9 +15162,9 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Packages with PHP scripts must depend on a phpX-cli package such as\n"
-"php5-cli.  Note that a dependency on a php-cgi package (such as php5-cgi)\n"
-"is needlessly strict and forces the user to install a package that isn't\n"
-"needed.\n"
+"php-cli or php7.0-cli.  Note that a dependency on a php-cgi package (such\n"
+"as php-cgi or php7.0-cgi) is needlessly strict and forces the user to\n"
+"install a package that isn't needed.\n"
 "\n"
 "In some cases a weaker relationship, such as Suggests or Recommends, will\n"
 "be more appropriate.\n"
-- 
2.6.2

From eacd4058ca7c37056f28a411c99310543148f92f Mon Sep 17 00:00:00 2001
From: Mathieu Parent <Mathieu.PARENT@nantesmetropole.fr>
Date: Tue, 19 Apr 2016 11:48:55 +0200
Subject: [PATCH 5/6] Fix refresh-debhelper-data (dists/sid/Contents-i386.gz is
 no more)

---
 private/refresh-debhelper-data | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/private/refresh-debhelper-data b/private/refresh-debhelper-data
index 44ca516..22d7002 100755
--- a/private/refresh-debhelper-data
+++ b/private/refresh-debhelper-data
@@ -123,7 +123,7 @@ else
     mkdir -p "$lintian_data/debhelper"
 
     cd "$workdir"
-    wget dists/sid/Contents-i386.gz
+    wget dists/sid/main/Contents-i386.gz
     zgrep -E "$dh_regex" Contents-i386.gz > dh_entries
     cat dh_entries \
         | perl -n -w -E 's#'"$dh_command_perl_regex"'#$1=$2# and print' \
-- 
2.6.2

From ee576f3753e6947c56f0ed05f4fe7615eb7f1fbc Mon Sep 17 00:00:00 2001
From: Mathieu Parent <Mathieu.PARENT@nantesmetropole.fr>
Date: Tue, 19 Apr 2016 12:00:58 +0200
Subject: [PATCH 6/6] Refresh debhelper data

With:
DEB_MIRROR=http://ftp.fr.debian.org/debian private/refresh-debhelper-data ./data

and then replace libgstreamer0.10-dev by libgstreamer1.0-dev
---
 data/debhelper/dh_addons            |  8 +++++++-
 data/debhelper/dh_commands          | 14 +++++++-------
 data/debhelper/dh_packages          |  7 ++++---
 data/debhelper/maint_commands       |  6 ++----
 data/debhelper/miscDepends_commands |  7 ++++---
 5 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/data/debhelper/dh_addons b/data/debhelper/dh_addons
index 5ebb347..0613bd5 100644
--- a/data/debhelper/dh_addons
+++ b/data/debhelper/dh_addons
@@ -1,5 +1,5 @@
 # This file is generated from private/refresh-debhelper-data.
-# It was generated on 2015-09-19 15:08
+# It was generated on 2016-04-19 09:58
 #
 # If the script generates an sufficient/incorrect value for a
 # single item, please have a look at dh_addons-manual.
@@ -13,6 +13,7 @@ aspell_simple=dictionaries-common-dev
 autoreconf=dh-autoreconf
 autotools_dev=autotools-dev
 bash_completion=bash-completion
+buildinfo=dh-buildinfo
 cli=cli-common-dev
 cli_nant=cli-common-dev
 cme_upgrade=cme
@@ -23,10 +24,12 @@ dist_zilla=dh-dist-zilla
 dkms=dkms
 dpatch=dpatch
 eclipse_helper=javahelper
+elpa=dh-elpa
 germinate=germinate
 gir=gobject-introspection
 gnome=gnome-pkg-tools
 golang=dh-golang
+haskell=dh-haskell
 javahelper=javahelper
 jh_maven_repo_helper=maven-repo-helper
 kde=pkg-kde-tools
@@ -36,6 +39,7 @@ linktree=dh-linktree
 lisp=dh-lisp
 lua=dh-lua
 maven_repo_helper=maven-repo-helper
+nodejs=nodejs-dev
 ocaml=dh-ocaml
 parrot=parrot-devel
 perl_dbi=libdbi-perl
@@ -44,6 +48,7 @@ php=dh-php
 phpcomposer=pkg-php-tools
 phppear=pkg-php-tools
 pkgkde_symbolshelper=pkg-kde-tools
+ppp=ppp-dev
 pydeb=python-van.pydeb
 pyppd=pyppd
 pypy=dh-python
@@ -60,6 +65,7 @@ sphinxdoc=sphinx-common
 swi_prolog=swi-prolog-nox
 systemd=dh-systemd
 tex=tex-common
+vdrplugin=vdr-dev
 xine=libxine2-dev
 xsf=xserver-xorg-dev
 xsp=dh-xsp
diff --git a/data/debhelper/dh_commands b/data/debhelper/dh_commands
index 51434bb..ea7ecba 100644
--- a/data/debhelper/dh_commands
+++ b/data/debhelper/dh_commands
@@ -1,5 +1,5 @@
 # This file is generated from private/refresh-debhelper-data.
-# It was generated on 2015-09-19 15:08
+# It was generated on 2016-04-19 09:58
 #
 # If the script generates an sufficient/incorrect value for a
 # single item, please have a look at dh_commands-manual.
@@ -36,7 +36,6 @@ dh_components=pkg-components
 dh_compress=debhelper
 dh_configpackage=config-package-dev
 dh_consoledata=dh-consoledata
-dh_desktop=debhelper
 dh_di_kernel_gencontrol=dh-di
 dh_di_kernel_install=dh-di
 dh_di_numbers=dh-di
@@ -112,19 +111,20 @@ dh_listpackages=debhelper
 dh_lua=dh-lua
 dh_make=dh-make
 dh_makeclilibs=cli-common-dev
+dh_makefont=dh-make
 dh_makeshlibs=debhelper
 dh_md5sums=debhelper
 dh_metainit=dh-metainit
 dh_movefiles=debhelper
 dh_movelibkdeinit=pkg-kde-tools
 dh_nativejava=libgcj-common
+dh_nodejs=nodejs-dev
 dh_numpy3=python3-numpy
 dh_numpy=python-numpy
 dh_ocaml=dh-ocaml
 dh_ocamlclean=dh-ocaml
 dh_ocamldoc=dh-ocaml
 dh_ocamlinit=dh-ocaml
-dh_pangomodules=libpango1.0-dev
 dh_parrot=parrot-devel
 dh_pdl=pdl
 dh_perl=debhelper
@@ -134,11 +134,11 @@ dh_php=dh-php
 dh_phpcomposer=pkg-php-tools
 dh_phppear=pkg-php-tools
 dh_pidgin=pidgin-dev
+dh_ppp=ppp-dev
 dh_prep=debhelper
 dh_pydeb=python-van.pydeb
 dh_pyppd=pyppd
 dh_pypy=dh-python
-dh_pysupport=python-support
 dh_python-ply=python-ply
 dh_python2=python
 dh_python3-ply=python3-ply
@@ -151,7 +151,6 @@ dh_ruby_fixdepends=gem2deb
 dh_ruby_fixdocs=gem2deb
 dh_sameversiondep=pkg-kde-tools
 dh_scour=python-scour
-dh_scrollkeeper=debhelper
 dh_shlibdeps=debhelper
 dh_sip3=python3-sip-dev
 dh_sip=python-sip-dev
@@ -159,16 +158,17 @@ dh_sodeps=pkg-kde-tools
 dh_sphinxdoc=sphinx-common
 dh_strip=debhelper
 dh_strip_nondeterminism=dh-strip-nondeterminism
-dh_suidregister=debhelper
 dh_swi_prolog=swi-prolog-nox
 dh_systemd_enable=dh-systemd
 dh_systemd_start=dh-systemd
 dh_testdir=debhelper
 dh_testroot=debhelper
 dh_ucf=debhelper
-dh_undocumented=debhelper
+dh_update_autotools_config=debhelper
 dh_usrlocal=debhelper
 dh_vagrant_plugin=vagrant
+dh_vdrplugin_depends=vdr-dev
+dh_vdrplugin_enable=vdr-dev
 dh_virtualenv=dh-virtualenv
 dh_xine=libxine2-dev
 dh_xsf_substvars=xserver-xorg-dev
diff --git a/data/debhelper/dh_packages b/data/debhelper/dh_packages
index a5159ad..dd32ba8 100644
--- a/data/debhelper/dh_packages
+++ b/data/debhelper/dh_packages
@@ -1,5 +1,5 @@
 # This file is generated from private/refresh-debhelper-data.
-# It was generated on 2015-09-19 15:08
+# It was generated on 2016-04-19 09:58
 
 apache2-dev
 autotools-dev
@@ -50,23 +50,23 @@ libgcj-common
 libgstreamer1.0-dev
 libgtk2.0-dev
 libimager-perl
-libpango1.0-dev
 libva-dev
 libxine2-dev
 mozilla-devscripts
+nodejs-dev
 parrot-devel
 pdl
 pidgin-dev
 pkg-components
 pkg-kde-tools
 pkg-php-tools
+ppp-dev
 pyppd
 python
 python-numpy
 python-ply
 python-scour
 python-sip-dev
-python-support
 python-van.pydeb
 python3-numpy
 python3-ply
@@ -76,6 +76,7 @@ sphinx-common
 swi-prolog-nox
 tex-common
 vagrant
+vdr-dev
 xml-core
 xserver-xorg-dev
 yorick-dev
diff --git a/data/debhelper/maint_commands b/data/debhelper/maint_commands
index 9fbdfaf..9486e18 100644
--- a/data/debhelper/maint_commands
+++ b/data/debhelper/maint_commands
@@ -1,5 +1,5 @@
 # This file is generated from private/refresh-debhelper-data.
-# It was generated on 2015-09-19 15:08
+# It was generated on 2016-04-19 09:58
 
 dh_apache2
 dh_apparmor
@@ -28,14 +28,12 @@ dh_installxmlcatalogs
 dh_installxsp
 dh_installzope
 dh_installzopeinstance
-dh_makeshlibs
 dh_metainit
 dh_nativejava
 dh_php
-dh_pysupport
-dh_suidregister
 dh_systemd_enable
 dh_systemd_start
 dh_ucf
 dh_usrlocal
+dh_vdrplugin_enable
 dh_virtualenv
diff --git a/data/debhelper/miscDepends_commands b/data/debhelper/miscDepends_commands
index e42de88..bc056e3 100644
--- a/data/debhelper/miscDepends_commands
+++ b/data/debhelper/miscDepends_commands
@@ -1,5 +1,5 @@
 # This file is generated from private/refresh-debhelper-data.
-# It was generated on 2015-09-19 15:08
+# It was generated on 2016-04-19 09:58
 
 dh_apache2
 dh_cme_upgrade
@@ -18,11 +18,12 @@ dh_installxmlcatalogs
 dh_libva
 dh_linktree
 dh_lisp
+dh_makefont
 dh_nativejava
-dh_pangomodules
-dh_php
+dh_nodejs
 dh_phppear
 dh_pidgin
+dh_ppp
 dh_pyppd
 dh_systemd_enable
 dh_ucf
-- 
2.6.2


Reply to: