[DRE-commits] [SCM] ruby-domain-name.git branch, master, updated. debian/0.5.2-1-8-g5a9fe68

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 45cead83dbd95f3a308ef4795152daf5e33b74dc
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Thu Jun 28 15:25:25 2012 +0200

    Update debian/copyright Format; to copyright-format/1.0

diff --git a/debian/copyright b/debian/copyright
index 1813248..efaf4a9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: domain_name
 Source: http://github.com/knu/ruby-domain_name
 
@@ -8,24 +8,23 @@ License: BSD-2-clause
 
 Files: lib/domain_name/punycode.rb
 Copyright: © 2000-2002 John Colosi (Verisign)
-	   © 2000-2002 Srikanth Veeramachaneni (VeriSign)
-	   © 2000-2002 Nagesh Chigurupati (Verisign)
-	   © 2000-2002 Praveen Srinivasan(Verisign)
+    © 2000-2002 Srikanth Veeramachaneni (VeriSign)
+    © 2000-2002 Nagesh Chigurupati (Verisign)
+    © 2000-2002 Praveen Srinivasan(Verisign)
 License: BSD-3-clause
 
 Files: lib/domain_name/etld_data.rb
 Copyright: © 2007 Jo Hermans <jo.hermans at gmail.com>
-	   © Ruben Arakelyan <ruben at rubenarakelyan.com>
-	   © Gervase Markham <gerv at gerv.net>
-	   © Pamela Greene <pamg.bugs at gmail.com>
-	   © David Triendl <david at triendl.name>
-	   © Jothan Frakes <jothan at gmail.com>
+    © Ruben Arakelyan <ruben at rubenarakelyan.com>
+    © Gervase Markham <gerv at gerv.net>
+    © Pamela Greene <pamg.bugs at gmail.com>
+    © David Triendl <david at triendl.name>
+    © Jothan Frakes <jothan at gmail.com>
 License: MPL-1.1 or GPL-2 or LGPL-2.1
 
 Files: debian/*
 Copyright: 2012 Gunnar Wolf <gwolf at debian.org>
-License:
- [LICENSE TEXT]
+License: BSD-2-clause
 
 License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without
@@ -82,6 +81,14 @@ License: BSD-3-clause
  This software is licensed under the BSD open source license. For more
  information visit www.opensource.org.
 
+License: GPL-2
+ In Debian systems, the full text of the GNU General Public License version 2
+ can be found in /usr/share/common-licenses/GPL-2
+
+License: LGPL-2.1
+ In Debian systems, the full text of the GNU Lesser General Public License
+ version 2.1 can be found in /usr/share/common-licenses/LGPL-2.1
+
 License: MPL-1.1
  The contents of this file are subject to the Mozilla Public License Version
  1.1 (the "License"); you may not use this file except in compliance with
@@ -107,10 +114,3 @@ License: MPL-1.1
  the provisions above, a recipient may use your version of this file under
  the terms of any one of the MPL, the GPL or the LGPL.
 
-License: GPL-2+
- In Debian systems, the full text of the GNU General Public License version 2
- can be found in /usr/share/common-licenses/GPL-2
-
-License: LGPL-2.1+
- In Debian systems, the full text of the GNU Lesser General Public License
- version 2.1 can be found in /usr/share/common-licenses/LGPL-2.1

-- 
ruby-domain-name.git