[DRE-commits] [SCM] ruby-columnize.git branch, master, updated. upstream/0.3.6-4-g5d27499

[Praveen Arimbrathodiyil]

The following commit has been merged in the master branch:
commit 5d274994709da087c150348f1aed7b472131f72f
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Nov 4 00:30:31 2012 +0530

    apply corrections by Nandaja

diff --git a/debian/changelog b/debian/changelog
index cdc739c..926accd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ ruby-columnize (0.3.6-2) UNRELEASED; urgency=low
   * Team upload. 
   * Change Vcs filed to team repo.
 
+  [Nandaja Verma]
+  * Update description in debian/control.
+  * Update debian/copyright
+
  -- Praveen Arimbrathodiyil <praveen at debian.org>  Thu, 01 Nov 2012 12:41:43 +0530
 
 ruby-columnize (0.3.6-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index ce140c0..85fe30b 100644
--- a/debian/control
+++ b/debian/control
@@ -15,10 +15,10 @@ Package: ruby-columnize
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
-Description: Module to format an Array as an Array of String aligned in columns
+Description: Ruby library to format arrays as column-aligned strings
  In showing a long lists, sometimes one would prefer to see the value
  arranged aligned in columns. Some examples include listing methods
- of an object or debugger commands.
+ of an object or debugger commands. This Ruby library helps in aligning so.
  .
  See Examples in the rdoc documentation for examples.
 
diff --git a/debian/copyright b/debian/copyright
index d91d92e..78a9b66 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,14 +4,13 @@ Source:://github.com/rocky/columnize
 
 Files: *
 Copyright: 2011 Rocky Bernstein <rockyb at rubyforge.org>
-License: Ruby's License
+License: Ruby | GPL
 
 Files: debian/*
 Copyright: 2012 Nandaja Varma <nandaja.varma at gmail.com>
-License: Ruby's License
+License: Ruby | GPL
 
-License: Ruby's License
- Ruby is copyrighted free software by Yukihiro Matsumoto <matz at netlab.co.jp>.
+License: Ruby
  You can redistribute it and/or modify it under either the terms of the GPL
  (see COPYING.txt file), or the conditions below:
  .
@@ -24,14 +23,14 @@ License: Ruby's License
  .
         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.
+                 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.
+                 with standard executables, which must also be provided.
  .
         d) make other distribution arrangements with the author.
  .
@@ -39,11 +38,13 @@ License: Ruby's License
       form, provided that you do at least ONE of the following:
  .
         a) distribute the executables and library files of the software,
+ .
+        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.
+                 on where to get the original distribution.
  .
         b) accompany the distribution with the machine-readable source of
- 	         the software.
+                 the software.
  .
         c) give non-standard executables non-standard names, with
            instructions on where to get the original software distribution.
@@ -58,9 +59,9 @@ License: Ruby's License
       files under the ./missing directory.  See each file for the copying
       condition.
  .
-   5. The scripts and library files supplied as input to or produced as 
+   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, 
+      copyright of the software, but belong to whomever generated them,
       and may be sold commercially, and may be aggregated with this
       software.
  .
@@ -68,7 +69,28 @@ License: Ruby's License
       IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
       WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
       PURPOSE.
- .
- On Debian systems, the full text of the GNU General Public License 
- can be found in the file `/usr/share/common-licenses/GPL'.
+
+License: GPL
+ 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
+ .
+ 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 package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, 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'.
 
diff --git a/debian/ruby-columnize.docs b/debian/ruby-columnize.docs
index a76f460..b43bf86 100644
--- a/debian/ruby-columnize.docs
+++ b/debian/ruby-columnize.docs
@@ -1,2 +1 @@
-# FIXME: READMEs found
- README.md
+README.md

-- 
ruby-columnize.git