[Pkg-php-commits] r1014 - pear/php-mail/trunk/debian

[Thijs Kinkhorst]

Author: thijs
Date: 2008-03-31 18:48:50 +0000 (Mon, 31 Mar 2008)
New Revision: 1014

Modified:
   pear/php-mail/trunk/debian/changelog
   pear/php-mail/trunk/debian/compat
   pear/php-mail/trunk/debian/control
   pear/php-mail/trunk/debian/copyright
Log:
update debian/copyright, some tweaks


Modified: pear/php-mail/trunk/debian/changelog
===================================================================
--- pear/php-mail/trunk/debian/changelog	2008-03-31 18:40:40 UTC (rev 1013)
+++ pear/php-mail/trunk/debian/changelog	2008-03-31 18:48:50 UTC (rev 1014)
@@ -1,12 +1,15 @@
-php-mail (1.1.14-1) feisty; urgency=low
+php-mail (1.1.14-1) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
+  [ Martin Lohmeier ]
   * new upstream version (Closes: #421841)
   * add debian/watch
   * add Homepage to debian/control
 
- -- Martin Lohmeier <martin at mein-horde.de>  Sun, 24 Jun 2007 12:21:10 +0200
+  [ Thijs Kinkhorst ]
+  * Make debian/copyright current.
 
+ -- Thijs Kinkhorst <thijs at debian.org>  Mon, 31 Mar 2008 20:42:07 +0200
+
 php-mail (1.1.6-2) unstable; urgency=low
 
   * Need to replace php4-pear (<< 4:4.4.0-0), yes the epoch matters.

Modified: pear/php-mail/trunk/debian/compat
===================================================================
--- pear/php-mail/trunk/debian/compat	2008-03-31 18:40:40 UTC (rev 1013)
+++ pear/php-mail/trunk/debian/compat	2008-03-31 18:48:50 UTC (rev 1014)
@@ -1 +1 @@
-4
+5

Modified: pear/php-mail/trunk/debian/control
===================================================================
--- pear/php-mail/trunk/debian/control	2008-03-31 18:40:40 UTC (rev 1013)
+++ pear/php-mail/trunk/debian/control	2008-03-31 18:48:50 UTC (rev 1014)
@@ -2,10 +2,10 @@
 Section: web
 Priority: optional
 Maintainer: Debian PHP Maintainers <pkg-php-maint at lists.alioth.debian.org>
-Uploaders: Adam Conrad <adconrad at 0c3.net>, Ondřej Surý <ondrej at debian.org>
+Uploaders: Thijs Kinkhorst <thijs at debian.org>
 Build-Depends: debhelper (>= 5.0)
 Build-Depends-Indep: php-pear
-Vcs-Svn: svn://svn.debian.org/pkg-php/pear/php-mail/trunk 
+Vcs-Svn: svn://svn.debian.org/pkg-php/pear/php-mail/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-php/pear/php-mail/trunk
 Homepage: http://pear.php.net/package/Mail
 Standards-Version: 3.7.3

Modified: pear/php-mail/trunk/debian/copyright
===================================================================
--- pear/php-mail/trunk/debian/copyright	2008-03-31 18:40:40 UTC (rev 1013)
+++ pear/php-mail/trunk/debian/copyright	2008-03-31 18:48:50 UTC (rev 1014)
@@ -5,6 +5,7 @@
 
 The upstream copyright is held by The PHP Group, and the source is under
 the PHP License, version 2.02, the complete text of which follows:
+====================================================================
 
 -------------------------------------------------------------------- 
                   The PHP License, version 2.02
@@ -81,3 +82,11 @@
 
 For more information on the PHP Group and the PHP project, 
 please see <http://www.php.net>.
+
+====================================================================
+
+This with the exception of RFC822.php, which is
+copyright (c) 2001-2002, Richard Heyes, and licenced under the BSD
+licence. On Debian systems, this licence can be found here:
+/usr/share/common-licenses/BSD
+