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

Sat Jul 2 11:37:07 UTC 2011

The following commit has been merged in the master branch:
commit d11d8640b84f0ad8d4404fc25fbb2f0399ff02e2
Author: Nicolas Roudaire <nikrou77 at gmail.com>
Date:   Sat Jul 2 13:36:57 2011 +0200

    Refactoring for license stanza

diff --git a/debian/changelog b/debian/changelog
index c921b1c..31bb382 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>  Sat, 02 Jul 2011 09:59:01 +0200
+ -- Nicolas Roudaire <nikrou77 at gmail.com>  Sat, 02 Jul 2011 13:33:33 +0200
 
diff --git a/debian/copyright b/debian/copyright
index eaee5d3..fcac881 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,64 +1,18 @@
-Format: http://dep.debian.net/deps/dep5
-Name: phing
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=markup&pathrev=174
+Upstream-Name: Phing
 Source: http://phing.info/
 
 Files: *
 Copyright: 2011, Hans Lellelid <hans at xmpl.org>
 	   2011, Michiel Rook <michiel.rook at gmail.com>
 License: LGPL-3
- This package is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public License 
- version 3 as published by the Free Software Foundation.
- .
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- .
- On Debian systems, the complete text of the GNU Lesser General Public License
- version 3 can be found in the file
- `/usr/share/common-licenses/LGPL-3'.
-
-Files: classes/phing/IntrospectionHelper.php classes/phing/TaskContainer.php 
- classes/phing/Task.php classes/phing/listener/DefaultLogger.php 
- classes/phing/listener/NoBannerLogger.php classes/phing/Target.php
- classes/phing/tasks/system/AvailableTask.php classes/phing/TaskAdapter.php
- classes/phing/tasks/system/ConditionTask.php 
- classes/phing/tasks/system/PhingCallTask.php
- classes/phing/tasks/system/condition/NotCondition.php
- classes/phing/tasks/system/condition/AndCondition.php
- classes/phing/tasks/system/condition/ConditionBase.php
- classes/phing/tasks/system/condition/OsCondition.php
- classes/phing/tasks/system/condition/EqualsCondition.php
- classes/phing/tasks/system/condition/OrCondition.php
- classes/phing/parser/ProjectConfigurator.php
- classes/phing/parser/ExpatParser.php
- classes/phing/parser/NestedElementHandler.php
- classes/phing/parser/AbstractHandler.php
- classes/phing/parser/AbstractSAXParser.php
- classes/phing/parser/TaskHandler.php
- classes/phing/parser/DataTypeHandler.php
- classes/phing/parser/Location.php
- classes/phing/parser/TargetHandler.php
- classes/phing/parser/ProjectHandler.php
- classes/phing/parser/RootHandler.php
-Copyright: @copyright 2001,2002 THYRELL.
-License: All rights reserved
-
-Files: classes/phing/filters/TailFilter.php classes/phing/filters/BaseParamFilterReader.php
-Copyright: @copyright © 2003 seasonfive.
-License: All rights reserved
 
 Files: classes/phing/tasks/ext/PatchTask.php
-Copyright: @copyright Mikhail Krasilnikov <mk at 3wstyle>
+Copyright: Mikhail Krasilnikov <mk at 3wstyle>
 License: Apache
 
 Files: classes/phing/tasks/ext/JsMin.php
-Copyright: Copyright (c) 2002 Douglas Crockford
+Copyright: 2002, Douglas Crockford
 License: Expat
 
 Files: etc/coverage-frames.xsl etc/phpunit-noframes.xsl tc/phpunit-frames.xsl
@@ -69,6 +23,47 @@ License: Apache
 Files: debian/*
 Copyright: 2011, Nicolas Roudaire <nikrou77 at gmail.com>
 License: LGPL-3
+
+License: Apache
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+ http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the complete text of the Apache License
+ version 2 can be found in the file
+ `/usr/share/common-licenses/Apache-2.0'.
+
+License: Expat
+ Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
+ .
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+License: LGPL-3
  This package is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public License 
  version 3 as published by the Free Software Foundation.
diff --git a/debian/phing.1 b/debian/phing.1
index 32f7914..b673846 100644
--- a/debian/phing.1
+++ b/debian/phing.1
@@ -97,10 +97,6 @@ search for buildfile towards the root of the filesystem and use it
 .RS 4
 the class to use to handle user input
 .RE
-.SH "BUGS"
-.PP
-Report to bugs to
-dev at phing\&.tigris\&.org\&.
 .SH "AUTHOR"
 .PP
 \fBNicolas Roudaire\fR <\&nikrou77 at gmail\&.com\&>

-- 
Phing repository under the pkg-symfony Debian group

