[DRE-commits] [SCM] rubygems.git branch, master, updated. upstream/1.8.12-40-g1350f42

[Daigo Moriwaki]

The following commit has been merged in the master branch:
commit 41e2698911e47256c83c64214988251ee2f35d77
Author: Daigo Moriwaki <daigo at debian.org>
Date:   Sat Jan 21 14:51:42 2012 +0900

    Fixed lintian warnings of missing-field-in-dep5-copyright and missing-license-paragraph-in-dep5-copyright.

diff --git a/debian/changelog b/debian/changelog
index 5d63ebb..fc59fbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ rubygems (1.8.12-2) unstable; urgency=low
   * debian/control: Build-Depends netbase as well to pass test cases.
     Thanks to Daniel Schepler for reporting and resolving this issue.
     (Closes: #655549)
+  * debian/control: Sections of rubygems1.8 and rubygems-doc are now
+    oldlibs-extra, fixing lintian warnings.
+  * debian/copyright: Fixed lintian warnings.
 
  -- Daigo Moriwaki <daigo at debian.org>  Sat, 21 Jan 2012 14:34:29 +0900
 
diff --git a/debian/copyright b/debian/copyright
index 7f86cc9..2a5034a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -63,9 +63,65 @@ License: Ruby
  Public License can be found in `/usr/share/common-licenses/GPL'.
 
 Files: debian/*
-Copyright: Copyright 2004-2011 Daigo Moriwaki <daigo at debian.org>
-License: same as upstream (Ruby)
+Copyright: Copyright 2004-2012 Daigo Moriwaki <daigo at debian.org>
+License: Ruby
+ This Debian packaging work is copyrighted free software by Daigo Moriwaki.
+ You can redistribute it and/or modify it under either the terms of the GPL
+ (see the GPL.txt file), or the conditions below:
+ .
+   1. You may make and give away verbatim copies of the source form of the
+      software without restriction, provided that you duplicate all of the
+      original copyright notices and associated disclaimers.
+ .
+   2. You may modify your copy of the software in any way, provided that
+      you do at least ONE of the following:
+ .
+        a) place your modifications in the Public Domain or otherwise
+           make them Freely Available, such as by posting said
+ 	  modifications to Usenet or an equivalent medium, or by allowing
+ 	  the author to include your modifications in the software.
+ .
+        b) use the modified software only within your corporation or
+           organization.
+ .
+        c) rename any non-standard executables so the names do not conflict
+ 	  with standard executables, which must also be provided.
+ .
+        d) make other distribution arrangements with the author.
+ .
+   3. You may distribute the software in object code or executable
+      form, provided that you do at least ONE of the following:
+ .
+        a) distribute the executables and library files of the software,
+ 	  together with instructions (in the manual page or equivalent)
+ 	  on where to get the original distribution.
+ .
+        b) accompany the distribution with the machine-readable source of
+ 	  the software.
+ .
+        c) give non-standard executables non-standard names, with
+           instructions on where to get the original software distribution.
+ .
+        d) make other distribution arrangements with the author.
+ .
+   4. You may modify and include the part of the software into any other
+      software (possibly commercial).  
+ .
+   5. The scripts and library files supplied as input to or produced as 
+      output from the software do not automatically fall under the
+      copyright of the software, but belong to whomever generated them, 
+      and may be sold commercially, and may be aggregated with this
+      software.
+ .
+   6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+      IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+      WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+      PURPOSE.
+ -- 
+ On Debian GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL'.
 
-Files: debian/patches/22_add_bash_completion.dpatch
+Files: debian/etc/bash_completion.d/gem1.8
 Copyright: Copyright (c) Michael Schuerig, michael at schuerig.de, 2007-02-24
-Licence: Free for all uses.
+License: Free for all uses.
+ Free for all uses.

-- 
rubygems.git