[DRE-commits] [SCM] ruby-addressable.git branch, master, updated. upstream/2.2.6-20-gf09bbea

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 32690f7be225bbb5fd55dcf615c3709f27d68e7e
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Fri Jun 29 09:32:10 2012 +0200

    Convert debian/copyright to DEP-5 copyright-format/1.0

diff --git a/debian/copyright b/debian/copyright
index c943b58..8103dbf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,25 +1,45 @@
-This work was packaged for Debian by:
-     
-   Deepak Tripathi <deepak at debian.org>  on Wed, 13 Oct 2010 22:13:02 +0530
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: addressable
+Source: http://addressable.rubyforge.org/
 
-It was downloaded from:
-   
-   http://addressable.rubyforge.org/
+Files: *
+Copyright: Copyright (c) 2006-2011 Bob Aman <bob at sporkmonger.com>
+License: Apache-2.0
 
-Upstream Author(s):
-   
-   Bob Aman <bob at sporkmonger.com>
+Files: debian/*
+Copyright: 2010 Deepak Tripathi <deepak at debian.org>
+License: GPL-2+
 
-Copyright:
+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.
+ .
+ On Debian systems, the full text of the Apache License version 2.0 can be
+ found in the file `/usr/share/common-licenses/Apache-2.0'.
 
-   Copyright (c) 2006-2011 Bob Aman <bob at sporkmonger.com>
- 
-License:
-
-   Licensed under Apache version 2. In Debian GNU/Linux you can find the 
-   full license copy at /usr/share/common-licenses/Apache-2.0
-
---
-The Debian packaging is:
-   Copyright (C) 2010 Deepak Tripathi <deepak at debian.org> and is licensed
-   under the GPL version 2 or later, see `/usr/share/common-licenses/GPL-2'.
\ No newline at end of file
+License: GPL-2+
+ 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 2 of the License, or
+ (at your option) any later version.
+ .
+ This program 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 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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ On Debian systems, the full text of the GNU General Public License
+ version 2 can be found in the file `/usr/share/common-licenses/GPL-2'. 

-- 
ruby-addressable.git