[Pkg-symfony-commits] [SCM] Phing repository under the pkg-symfony Debian group branch, master, updated. upstream/2.4.5-7-gcf11a04

[Nicolas Roudaire]

The following commit has been merged in the master branch:
commit cf11a04945d08024ad030c9fc20d3e498839a2de
Author: Nicolas Roudaire <nikrou77 at gmail.com>
Date:   Wed Mar 23 20:36:04 2011 +0100

    Fix copyright and licenses

diff --git a/debian/changelog b/debian/changelog
index ce4daf3..535d34a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,5 +2,5 @@ phing (2.4.5-1) unstable; urgency=low
 
   * Initial release (Closes: #283085)
 
- -- Nicolas Roudaire <nikrou77 at gmail.com>  Sun, 06 Mar 2011 20:19:46 +0100
+ -- Nicolas Roudaire <nikrou77 at gmail.com>  Wed, 23 Mar 2011 20:33:57 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 13e7171..2720db0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,9 +5,7 @@ Source: http://phing.info/
 
 Copyright: 2011, Hans Lellelid <hans at xmpl.org>
 	   2011, Michiel Rook <michiel.rook at gmail.com>
-	   2011, David Giffin <david at giffin.org>
-	   2011, Manuel Holtgrewe <grin at gmx.net>
-	   2011, Mehmet Emre Yilmaz <mehmety at gmail.com>
+
 License: LGPL
  This package is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public License 
@@ -26,40 +24,6 @@ License: LGPL
  version 3 can be found in the file
  `/usr/share/common-licenses/LGPL-3'.
 
-Files: classes/phing/IntrospectionHelper.php, classes/phing/Target.php,
-       classes/phing/TaskContainer.php, classes/phing/listener/DefaultLogger.php
-       classes/phing/listener/NoBannerLogger.php, classes/phing/Task.php, 
-       classes/phing/parser/AbstractHandler.php, classes/phing/TaskAdapter.php,
-       classes/phing/parser/DataTypeHandler.php, 
-       classes/phing/parser/ExpatParser.php,classes/phing/parser/Location.php
-       classes/phing/parser/ProjectConfigurator.php,
-       classes/phing/parser/ProjectHandler.php, 
-       classes/phing/parser/RootHandler.php, 		
-       classes/phing/parser/TargetHandler.php,
-       classes/phing/parser/TaskHandler.php,
-Copyright: 2001-2002, THYRELL. 
-License: All rights reserved
-
-Files: classes/phing/filters/BaseParamFilterReader.php,
-       classes/phing/filters/TailFilter.php
-Copyright: 2003, seasonfive
-License: All rights reserved
-
-Files: classes/phing/input/PropertyFileInputHandler.php
-Copyright: 2002, The Apache Software Foundation.
-License: The Apache Software License, Version 1.1
-
-Files: classes/phing/lib/Zip.php
-Copyright: 1997-2003, The PHP Group
-License: PHP license, version 3.0
- This source file is subject to version 3.0 of the PHP license,
- that is bundled with this package in the file LICENSE, and is 
- available through the world-wide-web at the following url:    
- http://www.php.net/license/3_0.txt.                           
- If you did not receive a copy of the PHP license and are unable to   
- obtain it through the world-wide-web, please send a note to   
- license at php.net so we can mail you a copy immediately.        
-
 Files: debian/*
 Copyright: 2011, Nicolas Roudaire <nikrou77 at gmail.com>
 License: GPL-2
diff --git a/debian/manpage.xml b/debian/manpage.xml
index cc9fdeb..094a69c 100644
--- a/debian/manpage.xml
+++ b/debian/manpage.xml
@@ -76,7 +76,7 @@ man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/
       </author>
     </authorgroup>
     <copyright>
-      <year>2010</year>
+      <year>2011</year>
       <holder>&dhusername;</holder>
     </copyright>
     <legalnotice>
diff --git a/debian/phing.1 b/debian/phing.1
index d94ffe3..32f7914 100644
--- a/debian/phing.1
+++ b/debian/phing.1
@@ -2,12 +2,12 @@
 .\"     Title: PHING
 .\"    Author: Nicolas Roudaire <nikrou77 at gmail.com>
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 02/22/2010
+.\"      Date: 03/23/2011
 .\"    Manual: phing User Manual
 .\"    Source: phing
 .\"  Language: English
 .\"
-.TH "PHING" "1" "02/22/2010" "phing" "phing User Manual"
+.TH "PHING" "1" "03/23/2011" "phing" "phing User Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -109,7 +109,7 @@ Wrote this manpage for the Debian system\&.
 .RE
 .SH "COPYRIGHT"
 .br
-Copyright \(co 2010 Nicolas Roudaire
+Copyright \(co 2011 Nicolas Roudaire
 .br
 .PP
 This manual page was written for the Debian system (and may be used by others)\&.

-- 
Phing repository under the pkg-symfony Debian group