[pkg-eucalyptus-commits] r197 - mule/trunk/debian

[Charles Plessy]

Author: plessy
Date: 2012-04-18 00:31:24 +0000 (Wed, 18 Apr 2012)
New Revision: 197

Modified:
   mule/trunk/debian/changelog
   mule/trunk/debian/copyright
Log:
Normalised debian/copyright with config-model.


Modified: mule/trunk/debian/changelog
===================================================================
--- mule/trunk/debian/changelog	2012-04-18 00:27:18 UTC (rev 196)
+++ mule/trunk/debian/changelog	2012-04-18 00:31:24 UTC (rev 197)
@@ -1,5 +1,11 @@
-mule (2.0.1-4) precise; urgency=low
+mule (2.0.1-4) UNRELEASED; urgency=low
 
+  * Team upload.
+
+  [ Charles Plessy ]
+  * Normalised debian/copyright with config-model.
+
+  [ Brian Thomason ]
   * Converted to Debian source format 3.0 (quilt)
   * Reordered modules in debian/build.xml so that they would build properly
   * Added mule-management-module

Modified: mule/trunk/debian/copyright
===================================================================
--- mule/trunk/debian/copyright	2012-04-18 00:27:18 UTC (rev 196)
+++ mule/trunk/debian/copyright	2012-04-18 00:31:24 UTC (rev 197)
@@ -1,21 +1,57 @@
-http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Source: https://svn.codehaus.org/mule/tags/mule-2.0.1
+http: //dep.debian.net/deps/dep5/
 
 Files: *
-Authors:
-	Robert Harder <rob at iharder.net>
-	Alexander Day Chaffee <alex at purpletech.com>
-	Gary Gregory <ggregory at seagullsw.com>
-	Stephen Colebourne
-	Ross Mason <ross.mason at symphonysoft.com>
-	Carlos Quiroz <tibu at users.sourceforge.net>
-	and all authors who contributed with no
-	remnant in the source code.
 Copyright: © 2003-2007 MuleSource Inc.
            Portions Copyright (C) The MX4J Contributors.
 License: CPAL-1.0
+Authors: 
+ Robert Harder <rob at iharder.net>
+ Alexander Day Chaffee <alex at purpletech.com>
+ Gary Gregory <ggregory at seagullsw.com>
+ Stephen Colebourne
+ Ross Mason <ross.mason at symphonysoft.com>
+ Carlos Quiroz <tibu at users.sourceforge.net>
+ and all authors who contributed with no
+ remnant in the source code.
 
+Files: tools/bobberplus/*
+Copyright: © 2001-2004 The Apache Software Foundation
+License: Apache-2.0
+ 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.
+Comment: On Debian systems, the complete text of the Apache version 2.0 license
+ can be found in “/usr/share/common-licenses/Apache-2.0”.
+
+Files: modules/management/src/main/resources/org/mule/module/management/agent/http/xsl/*
+Copyright: © MuleSource, Inc.
+           © The MX4J Contributors.
+License: MX4J-10 and CPAL-1.0
+Authors: 
+ Carlos Quiroz (tibu at users.sourceforge.net)
+ Brett Knights
+ Bronwen Cassidy (shadow12 at users.sourceforge.net)
+ Lachezar Dobrev (l.dobrev at lsnsoft.com)
+
+Files: debian/*
+Copyright: © 2010 Eucalyptus <grze at eucalyptus.com>
+    © 2010 University of Luebeck, Germany <moeller at debian.org>
 License: CPAL-1.0
+Authors: 
+ Chris Grzegorczyk <grze at eucalyptus.com>
+ Steffen Moeller <moeller at debian.org>
+
+License: CPAL-1.0
   Common Public Attribution License Version 1.0 (CPAL)
  .
  1. "Definitions"
@@ -507,33 +543,6 @@
  defined in the CPAL as a work which combines Covered Code or portions thereof
  with code not governed by the terms of the CPAL.
 
-Files: tools/bobberplus/*
-Copyright: © 2001-2004 The Apache Software Foundation
-License: Apache-2.0
- 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.
-Comment: On Debian systems, the complete text of the Apache version 2.0 license
- can be found in “/usr/share/common-licenses/Apache-2.0”.
-
-Files: modules/management/src/main/resources/org/mule/module/management/agent/http/xsl/*
-Copyright: © MuleSource, Inc.
-           © The MX4J Contributors.
-Authors:
-	Carlos Quiroz (tibu at users.sourceforge.net)
-	Brett Knights
-	Bronwen Cassidy (shadow12 at users.sourceforge.net)
-	Lachezar Dobrev (l.dobrev at lsnsoft.com)
-License: MX4J-10 and CPAL-1.0
-
 License: MX4J-10
  The MX4J License, Version 1.0
  .
@@ -581,10 +590,3 @@
  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
 
-Files: debian/*
-Authors:
-	Chris Grzegorczyk <grze at eucalyptus.com>
-	Steffen Moeller <moeller at debian.org>
-Copyright: © 2010 Eucalyptus <grze at eucalyptus.com>
-	   © 2010 University of Luebeck, Germany <moeller at debian.org>
-License: CPAL-1.0