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

Bug#775668: marked as done (unblock: pkg-php-tools/1.28)

Your message dated Sun, 18 Jan 2015 11:42:46 +0000
with message-id <20150118114246.GR29709@lupin.home.powdarrmonkey.net>
and subject line Re: Bug#775668: unblock: pkg-php-tools/1.28
has caused the Debian Bug report #775668,
regarding unblock: pkg-php-tools/1.28
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
775668: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=775668
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
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>

--- End Message ---
--- Begin Message --- 
On Sun, Jan 18, 2015 at 12:34:34PM +0100, Mathieu Parent wrote:
> 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.

Unblocked.

-- 
Jonathan Wiltshire                                      jmw@debian.org
Debian Developer                         http://people.debian.org/~jmw

4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC  74C3 5394 479D D352 4C51

Attachment: signature.asc
Description: Digital signature


--- End Message ---
Reply to: