[DRE-commits] [rdtool] 03/03: Convert copyright-file to copyright-format/1.0

Cédric Boutillier boutil at moszumanska.debian.org
Tue Sep 9 09:25:53 UTC 2014


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

boutil pushed a commit to branch master
in repository rdtool.

commit 2525a0dddbdbf458593d80e33309016c0667408a
Author: Cédric Boutillier <boutil at debian.org>
Date:   Tue Sep 9 11:16:27 2014 +0200

    Convert copyright-file to copyright-format/1.0
---
 debian/changelog |   1 +
 debian/control   |   2 +-
 debian/copyright | 203 ++++++++++++++++++++++++++++++++++---------------------
 3 files changed, 128 insertions(+), 78 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 97987cc..fc37d4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ rdtool (0.6.38-3) unstable; urgency=medium
   * Make rdtool-elisp depend on emacs instead of the removed emacs23 package.
     Thanks Gabriele Giacone (Closes: #754028)
   * Remove conflict between ruby-rd and old (pre-Squeeze) version of rdtool.
+  * Convert copyright-file to copyright-format/1.0
 
  -- Cédric Boutillier <boutil at debian.org>  Tue, 09 Sep 2014 10:25:51 +0200
 
diff --git a/debian/control b/debian/control
index bf5d550..4ce927f 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.al
 Uploaders: akira yamada <akira at debian.org>, Taku YASUI <tach at debian.org>
 Build-Depends: debhelper (>= 8), gem2deb (>= 0.2.13~), racc
 Standards-Version: 3.9.5
-Homepage: http://uwabami.github.com/rdtool/
+Homepage: https://uwabami.github.com/rdtool/
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/rdtool.git
 Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/rdtool.git;a=summary
 XS-Ruby-Versions: all
diff --git a/debian/copyright b/debian/copyright
index d29186e..2a904bd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,78 +1,127 @@
-This package was debianized by akira yamada <akira at debian.org> on
-Fri, 14 Jan 2000 17:06:02 +0900.
-
-It was downloaded from <URL:http://rubyforge.org/projects/rdtool/>
-
-Upstream Author: MoonWolf <moonwolf at moonwolf.com>
-
-Copyright:
-
-You can use/re-distribute/change RDtool under Ruby's License or GPL.
-This distribute of RDtool include files which is copyrighted by somebody elses,
-and these files can be re-distributed under those own license. These files
-include the condition of those license in themselves.
-
-Ruby's License:
-
-Ruby is copyrighted free software by Yukihiro Matsumoto <matz at netlab.jp>.
-You can redistribute it and/or modify it under either the terms of the GPL
-(see the file GPL), 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) 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).  But some files in the distribution
-     are not written by the author, so that they are not under these terms.
-
-     For the list of those files and their copying conditions, see the
-     file LEGAL.
-
-  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.
-
-GNU General Public License:
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: rdtool
+Source: https://github.com/uwabami/rdtool
+
+Files: *
+Copyright: 2004 MoonWolf <moonwolf at moonwolf.com>
+           2011-2012 Youhei SASAKI <uwabami at gfd-dennou.org>
+License: Ruby or GPL-2+
+
+Files: lib/rd/rd2man-lib.rb
+Copyright: 2000  WATANABE Hirofumi
+           2012 Youhei SASAKI <uwabami at gfd-dennou.org>
+License: Ruby or GPL-2+
+
+Files: lib/rd/{head-filter,rd2html-ext-lib,rd2html-ext-opt}.rb
+Copyright: 2003 Rubikitch
+License: Ruby or GPL-2+
+
+Files: bin/rdswap
+Copyright: 1999 C.Hintze
+License: Ruby or GPL-2+
+
+Files: setup.rb
+Copyright: 2000-2006 Minero Aoki
+License: LGPL-2.1
+
+Files: utils/rd-mode.el
+Copyright: 1999 Koji Arai, Toshiro Kuwabara.
+License: GPL-2+
+
+Files: debian/*
+Copyright: 2000-2009 akira yamada <akira at debian.org>
+License: Ruby or GPL-2+
+Comment: the Debian packaging is licensed under the same terms as the original package.
+
+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; either
+ version 2 of the License, or (at your option) any later
+ version.
+ .
+ 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'.
+
+License: LGPL-2.1
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation,
+ version 2.1 of the License.
+ .
+ This library 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
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+License: Ruby
+ 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).  But some files in the distribution
+    are not written by the author, so that they are not under this terms.
+ .
+    They are gc.c(partly), utils.c(partly), regex.[ch], st.[ch] and some
+    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 
+    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.
 

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



More information about the Pkg-ruby-extras-commits mailing list