Bug#775668: unblock: pkg-php-tools/1.28

[Mathieu Parent <sathieu@debian.org>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package pkg-php-tools

This will fixes FTBFS of php-crypt-gpg (#775633) and php-mdb2 (#775634).

The testsuite has also been improved to test #775633.

Patch attached.

unblock pkg-php-tools/1.28

-- System Information:
Debian Release: 8.0
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16.0-4-amd64 (SMP w/2 CPU cores)
Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

diff --git a/debian/changelog b/debian/changelog
index 48b10da..a0004ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pkg-php-tools (1.28) unstable; urgency=medium
+
+  * PEAR: Handle, but ignore OS dependencies (Closes: #775633)
+  * PEAR: Handle "group" dependencies as suggest, and "subpackage" native_types
+    like "package" (Closes: #775634)
+
+ -- Mathieu Parent <sathieu@debian.org>  Sun, 18 Jan 2015 12:15:58 +0100
+
 pkg-php-tools (1.27) unstable; urgency=medium
 
   * Fix phpunit tests:
diff --git a/share/php/pkgtools/phppear/source.php b/share/php/pkgtools/phppear/source.php
index f174b0e..52bcae6 100644
--- a/share/php/pkgtools/phppear/source.php
+++ b/share/php/pkgtools/phppear/source.php
@@ -201,6 +201,9 @@ class Source {
                 case 'optional':
                     $level = 'recommend';
                     break;
+                case 'group':
+                    $level = 'suggest';
+                    break;
                 default:
                     throw new \InvalidArgumentException("Unknown PEAR dependency level: '$native_level'");
             }
@@ -214,6 +217,7 @@ class Source {
                         $name = 'php';
                         break;
                     case 'package':
+                    case 'subpackage':
                         $project = 'pear-'.$deps2->channel;
                         $name = (string) $deps2->name;
                         break;
@@ -221,6 +225,9 @@ class Source {
                         $project = '';
                         $name = 'ext-'.$deps2->name;
                         break;
+                    case 'os':
+                        // We ignore OS dependencies
+                        continue 2;
                     default:
                         throw new \InvalidArgumentException("Unknown PEAR dependency type '$native_type'");
                 }
diff --git a/testsuite/data/pearpkg1/package.xml b/testsuite/data/pearpkg1/package.xml
index 86ce875..1d961b1 100644
--- a/testsuite/data/pearpkg1/package.xml
+++ b/testsuite/data/pearpkg1/package.xml
@@ -73,6 +73,9 @@
     <min>1.1</min>
     <max>1.9</max>
    </package>
+   <os>
+    <name>linux</name>
+   </os>
   </required>
   <optional>
     <extension>