summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog8
-rw-r--r--debian/control2
-rw-r--r--debian/copyright.header10
3 files changed, 19 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 99d9e13c1..79323d364 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+php5 (5.2.6-5) unstable; urgency=high
+
+ * Update debian/copyright to document that the DFSG-unfree email
+ requirement in ext/standard/rand.c has been rescinded by the
+ copyrightholder (Closes: #498621).
+
+ -- Thijs Kinkhorst <thijs@debian.org> Sun, 05 Oct 2008 11:32:35 +0200
+
php5 (5.2.6-4) unstable; urgency=high
[ Sean Finney ]
diff --git a/debian/control b/debian/control
index 25d5d6b2d..bb637179a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: php5
Section: web
Priority: optional
Maintainer: Debian PHP Maintainers <pkg-php-maint@lists.alioth.debian.org>
-Uploaders: Adam Conrad <adconrad@0c3.net>, Jeroen van Wolffelaar <jeroen@wolffelaar.nl>, Ondřej Surý <ondrej@debian.org>, Sean Finney <seanius@debian.org>
+Uploaders: Adam Conrad <adconrad@0c3.net>, Jeroen van Wolffelaar <jeroen@wolffelaar.nl>, Ondřej Surý <ondrej@debian.org>, Sean Finney <seanius@debian.org>, Thijs Kinkhorst <thijs@debian.org>
Build-Depends: apache2-prefork-dev, autoconf, automake1.4, bison, chrpath, debhelper (>= 5), firebird2.0-dev [i386 amd64 powerpc sparc] | firebird1.5-dev [i386 amd64] | firebird2-dev [i386 amd64], flex, freetds-dev, libapr1-dev (>= 1.2.7-8), libbz2-dev, libc-client-dev, libcurl4-openssl-dev | libcurl-dev, libdb4.6-dev, libexpat1-dev (>= 1.95.2-2.1), libfreetype6-dev, libgcrypt11-dev, libgd2-xpm-dev, libgmp3-dev, libjpeg62-dev, libkrb5-dev, libldap2-dev, libmcrypt-dev, libmhash-dev (>= 0.8.8), libmysqlclient15-dev, libncurses5-dev, libpam0g-dev, libpcre3-dev (>= 6.6), libpng12-dev, libpq-dev, libpspell-dev, librecode-dev, libsasl2-dev, libsnmp-dev, libsqlite0-dev, libssl-dev, libt1-dev, libtidy-dev, libtool, libwrap0-dev, libxmltok1-dev, libxml2-dev, libxslt1-dev (>= 1.0.18), quilt, re2c, unixodbc-dev, zlib1g-dev, tzdata
Build-Conflicts: bind-dev
Standards-Version: 3.8.0
diff --git a/debian/copyright.header b/debian/copyright.header
index fab883734..019565204 100644
--- a/debian/copyright.header
+++ b/debian/copyright.header
@@ -27,6 +27,16 @@ Noteworthy/non-trivial patches:
Upstream Authors: The PHP group for PHP5, Andi Gutmans and Zeev Suraski
for libzend
+The file ext/standard/rand.c contains the following clause with a statement
+that isn't compatible with the DFSG:
+ "The code as Shawn received it included the following notice:
+
+ Copyright (C) 1997 Makoto Matsumoto and Takuji Nishimura. When
+ you use this, send an e-mail to <matumoto@math.keio.ac.jp> with
+ an appropriate reference to your work."
+However, this requirement has been rescinded by the copyright holder in
+message <48E334A2.6050301@math.sci.hiroshima-u.ac.jp> to bug #498621.
+
Two different licences apply to this package, one for PHP5, the other for
libzend. Both licences are shown here below.