[DRE-commits] r3641 - packages/libodbc-ruby/trunk/debian

[Daigo Moriwaki]

Author: daigo
Date: 2009-06-20 05:40:01 +0000 (Sat, 20 Jun 2009)
New Revision: 3641

Modified:
   packages/libodbc-ruby/trunk/debian/changelog
   packages/libodbc-ruby/trunk/debian/copyright
Log:
* debian/copyright: 
  - Changed the GPL reference to /usr/share/common-licenses/GPL-2, which is
    what the upstream includes in its package.
  - Changed the file format.

Modified: packages/libodbc-ruby/trunk/debian/changelog
===================================================================
--- packages/libodbc-ruby/trunk/debian/changelog	2009-06-19 09:06:25 UTC (rev 3640)
+++ packages/libodbc-ruby/trunk/debian/changelog	2009-06-20 05:40:01 UTC (rev 3641)
@@ -1,6 +1,9 @@
-libodbc-ruby (0.9997-2) UNRELEASED; urgency=low
+libodbc-ruby (0.9997-2) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * debian/copyright: 
+    - Changed the GPL reference to /usr/share/common-licenses/GPL-2, which is
+      what the upstream includes in its package.
+    - Changed the file format.
 
  -- Daigo Moriwaki <daigo at debian.org>  Sun, 14 Jun 2009 22:42:16 +0900
 

Modified: packages/libodbc-ruby/trunk/debian/copyright
===================================================================
--- packages/libodbc-ruby/trunk/debian/copyright	2009-06-19 09:06:25 UTC (rev 3640)
+++ packages/libodbc-ruby/trunk/debian/copyright	2009-06-20 05:40:01 UTC (rev 3641)
@@ -1,17 +1,27 @@
-This package was debianized by Daigo Moriwaki <beatles at sgtpepper.net> on
-Sun,  1 Feb 2004 11:59:31 +0900.
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=420
+Upstream-Name: ruby-odbc
+Upstream-Maintainer: Christian Werner <chw at ch-werner.de>
+Upstream-Source: http://www.ch-werner.de/rubyodbc/
 
-It was downloaded from http://www.ch-werner.de/rubyodbc/
+Files: *
+Copyright: Copyright 2001-2009, Christian Werner <chw at ch-werner.de>
+Copyright: Copyright 2004, Ryszard Niewisiewicz <micz at fibernet.pl>
+Copyright: Copyright 2006, Carl Blakeley <cblakeley at openlinksw.co.uk>
+License: GPL-2+ | other
 
-Upstream Author: Christian Werner <chw at ch-werner.de>
+Files: debian/* 
+Copyright: Copyright 2004-2009, Daigo Moriwaki <daigo at debian.org>
+License: GPL-2+
 
-Copyright:
+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 version 2 or later.
+ .
+ On Debian systems the full text of the GNU General Public License version 2 can
+ be found in `/usr/share/common-licenses/GPL-2'.
 
-Ruby/ODBC is copyrighted free software by Christian Werner <chw at ch-werner.de>
-You can redistribute it and/or modify it under either the terms of the GPL
-(on Debian systems, the complete text of the GPL License can be found in 
-/usr/share/common-licenses/GPL), or the conditions below:
-
+License: other
   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.
@@ -21,8 +31,8 @@
 
        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.
@@ -36,11 +46,11 @@
      provided that you do at least ONE of the following:
 
        a) distribute the binaries and library files of the software,
-	  together with instructions (in the manual page or equivalent)
-	  on where to get the original distribution.
+          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.
+          the software.
 
        c) give non-standard binaries non-standard names, with
           instructions on where to get the original software distribution.