[SCM] Debian packaging of libmojolicious-perl branch, master, updated. debian/2.23-1-32-g7fe411c

Sun May 27 18:26:23 UTC 2012

The following commit has been merged in the master branch:
commit d2368d7c2eafebfd4981cfc6026906dee0537e6b
Author: gregor herrmann <gregoa at debian.org>
Date:   Sun May 27 20:15:42 2012 +0200

    debian/copyright: update to Copyright-Format 1.0.

diff --git a/debian/copyright b/debian/copyright
index 5f74994..bb5cbdb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=179
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Mojolicious
 Upstream-Contact: Sebastian Riedel <sri at cpan.org>
 Source: http://search.cpan.org/dist/Mojolicious/
-Upstream-Name: Mojolicious
 
 Files: *
 Copyright: 2008-2012, Sebastian Riedel <sri at cpan.org>
@@ -33,6 +33,25 @@ Copyright: 2010-2011, Jonathan Yu <jawnsy at cpan.org>
  2011, Salvatore Bonaccorso <carnil at debian.org>
 License: Artistic or GPL-1+
 
+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
+ .
+ Files produced as output though the use of this software, including generated
+ copies of boilerplate templates provided with this software, shall not be
+ considered Derivative Works, but shall be considered the original work of the
+ Licensor.
+ .
+ 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 2.0 License 
+ can be found in `/usr/share/common-licenses/Apache-2.0'
+
 License: Artistic
  This program is free software; you can redistribute it and/or modify
  it under the terms of the Artistic License, which comes with Perl.
@@ -40,15 +59,6 @@ License: Artistic
  On Debian systems, the complete text of the Artistic License
  can be found in `/usr/share/common-licenses/Artistic'.
 
-License: GPL-1+
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 1, or (at your option)
- any later version.
- .
- On Debian systems, the complete text of version 1 of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-1'.
-
 License: Artistic-2.0
  Copyright (c) 2000-2006, The Perl Foundation.
  .
@@ -240,46 +250,6 @@ License: Artistic-2.0
       DAMAGES ARISING IN ANY WAY OUT OF THE USE OF THE PACKAGE, EVEN
       IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-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
- .
- Files produced as output though the use of this software, including generated
- copies of boilerplate templates provided with this software, shall not be
- considered Derivative Works, but shall be considered the original work of the
- Licensor.
- .
- 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 2.0 License 
- can be found in `/usr/share/common-licenses/Apache-2.0'
-
-License: MIT
- 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: CC-By-SA-3.0
   THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
   COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
@@ -622,3 +592,34 @@ License: CC-By-SA-3.0
         granted under this License, such additional rights are deemed to
         be included in the License; this License is not intended to
         restrict the license of any rights under applicable law.
+
+License: GPL-1+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 1, or (at your option)
+ any later version.
+ .
+ On Debian systems, the complete text of version 1 of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-1'.
+
+License: MIT
+ 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.
+

-- 
Debian packaging of libmojolicious-perl

