[DRE-commits] [ruby-odbc] 08/09: update to format 1.0

[Jonas Genannt]

This is an automated email from the git hooks/post-receive script.

hggh-guest pushed a commit to branch master
in repository ruby-odbc.

commit cbb4f61c09bcd91c3ed7f0f285f4cb1d23043e44
Author: Jonas Genannt <jonas at brachium-system.net>
Date:   Mon Dec 16 20:32:12 2013 +0100

    update to format 1.0
---
 debian/copyright | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index e45650b..0c2b68f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,21 +4,21 @@ Upstream-Contact: Christian Werner <chw at ch-werner.de>
 Source: http://www.ch-werner.de/rubyodbc/
 
 Files: ext/init.c ext/utf8/init.c
-Copyright: Copyright (c) 2006-2007 Christian Werner <chw at ch-werner.de>
-License: GPL-2 | other
+Copyright: 2006-2007 Christian Werner <chw at ch-werner.de>
+License: GPL-2 or other
 
 Files: ext/odbc.c
-Copyright: Copyright (c) 2001-2011 Christian Werner <chw at ch-werner.de>
-Copyright: Portions copyright (c) 2004 Ryszard Niewisiewicz <micz at fibernet.pl>
-Copyright: Portions copyright (c) 2006 Carl Blakeley <cblakeley at openlinksw.co.uk>
-License: GPL-2 | other
+Copyright: 2001-2011 Christian Werner <chw at ch-werner.de>
+           2004 Ryszard Niewisiewicz <micz at fibernet.pl>
+           2006 Carl Blakeley <cblakeley at openlinksw.co.uk>
+License: GPL-2 or other
 
 Files: ext/utf8/odbc.c
-Copyright: Copyright (c) 2001-2011 Christian Werner <chw at ch-werner.de>
-License: GPL-2 | other
+Copyright: 2001-2011 Christian Werner <chw at ch-werner.de>
+License: GPL-2 or other
 
 Files: debian/*
-Copyright: Copyright 2004-2009, Daigo Moriwaki <daigo at debian.org>
+Copyright: 2004-2009 Daigo Moriwaki <daigo at debian.org>
 License: GPL-2+
 
 License: GPL-2
@@ -41,47 +41,47 @@ 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.
-
+  .
   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) give non-standard binaries non-standard names, with
           instructions on where to get the original software distribution.
-
+  .
        d) make other distribution arrangements with the author.
-
+  .
   3. You may distribute the software in object code or binary form,
      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.
-
+  .
        b) accompany the distribution with the machine-readable source of
           the software.
-
+  .
        c) give non-standard binaries 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 
+  .
+  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.
-
+  .
   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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-odbc.git