[DRE-commits] r4968 - trunk/libfacets-ruby/debian

Marc Dequènes duck at alioth.debian.org
Sat Mar 20 13:45:42 UTC 2010 

Author: duck
Date: 2010-03-20 13:45:41 +0000 (Sat, 20 Mar 2010)
New Revision: 4968

Modified:
   trunk/libfacets-ruby/debian/changelog
   trunk/libfacets-ruby/debian/copyright
Log:
[evol] more DEP-5 compliant 'debian/copyright'

Modified: trunk/libfacets-ruby/debian/changelog
===================================================================
--- trunk/libfacets-ruby/debian/changelog	2010-03-19 04:48:18 UTC (rev 4967)
+++ trunk/libfacets-ruby/debian/changelog	2010-03-20 13:45:41 UTC (rev 4968)
@@ -1,9 +1,13 @@
 libfacets-ruby (2.5.2+git20090627-ef2fec+dfsg1-1.2) UNRELEASED; urgency=low
 
+  [ Paul van Tilburg ]
   * Added debian/watch.
 
- -- Paul van Tilburg <paulvt at debian.org>  Sun, 14 Feb 2010 17:47:20 +0100
+  [ Marc Dequènes (Duck) ]
+  * Improved 'debian/copyright' to be more consistant with DEP-5 draft.
 
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Sat, 20 Mar 2010 14:44:49 +0100
+
 libfacets-ruby (2.5.2+git20090627-ef2fec+dfsg1-1) unstable; urgency=low
 
   * Initial release.

Modified: trunk/libfacets-ruby/debian/copyright
===================================================================
--- trunk/libfacets-ruby/debian/copyright	2010-03-19 04:48:18 UTC (rev 4967)
+++ trunk/libfacets-ruby/debian/copyright	2010-03-20 13:45:41 UTC (rev 4968)
@@ -1,22 +1,27 @@
-This package was debianized by Marc Dequènes (Duck) <Duck at DuckCorp.org>
-on Sat, 27 Jun 2009 00:40:58 +0200.
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: libfacets-ruby
+Maintainer: Marc Dequènes (Duck) <Duck at DuckCorp.org>
+Source: http://rubyforge.org/frs/?group_id=804
 
-It was downloaded from the git repository: git://rubyforge.org/facets.git
 
 
-Files: *
+Files: test/*, meta/*, doc/*, demo/*
 Copyright: © 2004-2006 Thomas Sawyer (aka Trans)
            © 2005-2008 TigerOps / Thomas Sawyer (aka Trans)
-License: Ruby License, GPL-2
+License: Ruby or GPL-2
 
+Files: debian/*
+Copyright: © 2009-2010 Marc Dequènes (Duck) <Duck at DuckCorp.org>
+License: GPL-3+
+
 Files: lib/core/facets/lazy.rb
 Copyright: 2005 MenTaLguY <mental at rydia.net>
-License: Ruby License
+License: Ruby
 
 Files: lib/core/facets/string/natcmp.rb
 Copyright: © 2000 by Martin Pool <mbp at humbug.org.au>
            © 2003 Alan Davies <cs96and_AT_yahoo_DOT_co_DOT_uk>
-License: other
+License: other-1
  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
  arising from the use of this software.
@@ -37,47 +42,47 @@
 Copyright: © 2005 Thomas Saywer
            © 2005 Jim Weirich
            © 2005 Daniel Burger
-License: Ruby License
+License: Ruby
 
 Files: lib/lore/facets/logger.rb
 Copyright: © 2005 George Moschovitis
-License: Ruby License
+License: Ruby
 
 Files: lib/lore/facets/ostruct.rb
 Copyright: © 2005 Thomas Sawyer (aka Trans)
            © 2005 George Moschovitis
-License: Ruby License
+License: Ruby
 
 Files: lib/lore/facets/pathname.rb
 Copyright: © 2006 Thomas Sawyer (aka Trans)
            © 2006 Daniel Burger
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/ansicode.rb
 Copyright: © 2004 Florian Fran
            © 2004 Thomas Sawyer (aka Trans)
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/autoarray.rb
 Copyright: © 2005 Brian Schröder
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/autoreload.rb
 Copyright: © 2003 Michael Neumann
            © 2003 George Moschovitis
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/bbcode.rb
 Copyright: © 2002 Thomas-Ivo Heinen
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/binreadable.rb
 Copyright: © 2003 Michael Neumann
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/blankslate.rb
 Copyright: © 2004 by Jim Weirich
-License: other
+License: other-2
  Permission is granted for use, copying, modification, distribution,
  and distribution of modified versions of this work as long as the
  above copyright notice is included.
@@ -91,18 +96,18 @@
            © 2006 Thomas Sawyer (aka Trans)
            © 2006 Nobu Nakada
            © 2006 Ulysses
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/classmethods.rb
 Copyright: © 2005 Nobu Nakada
            © 2005 Thomas Sawyer (aka Trans)
            © 2005 Ulysses
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/cloneable.rb
 Copyright: © 2003-2004 Jim Weirich
            © 2007 Ken Bloom
-License: other
+License: other-3
  This module is free software. You may use, modify, and/or redistribute this
  software under the same terms as Ruby.
  .
@@ -112,30 +117,30 @@
 
 Files: lib/more/facets/coroutine.rb
 Copyright: © 2005 Florian Frank
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/crypt.rb
 Copyright: © 2002 Poul-Henning Kamp
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/daemonize.rb
 Copyright: © 2006 David Heinemeier Hansson
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/dictionary.rb
 Copyright: © 2005 Jan Molic
            © 2005 Thomas Sawyer (aka Trans)
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/elementor.rb
 Copyright: © 2006 Thomas Sawyer (aka Trans)
            © 2006 George Moschovitis
            © 2006 Martin DeMello
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/expirable.rb
 Copyright: © 2004 George Moschovitis
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/filelist.rb
 Copyright: © 2002 Jim Weirich
@@ -144,7 +149,7 @@
 Files: lib/more/facets/heap.rb
 Copyright: © 2005 Thomas Sawyer (aka Trans)
            © 2005 George Moschovitis
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/htmlfilter.rb
 Copyright: © 2007 Thomas Sawyer (aka Trans)
@@ -156,7 +161,7 @@
 Problems: "If you alter, transform, or build upon this work, you may distribute the
  resulting work only under the same or similar license to this one." => at least
  incompatible with the GPL-2 licensing (which is not similar in spirit because far
- more restrictive), and several files and licensed under GPl-2 (without dual licensing)
+ more restrictive), and several files and licensed under GPL-2 (without dual licensing)
 Comment: this file was removed in the Debian package
 
 Files: lib/more/facets/ini.rb
@@ -165,7 +170,7 @@
 
 Files: lib/more/facets/ioredirect.rb
 Copyright: © 2002 Paul Brannan <paul at atdesk.com>
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/linkedlist.rb
 Copyright: © 2006 Kirk Haines
@@ -174,137 +179,137 @@
 Files: lib/more/facets/lrucache.rb
 Copyright: © 2004 George Moschovitis
            © 2004 Anastasios Koutoumanos
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/memoize.rb
 Copyright: © 2005 Robert Feldt
            © 2005 Thomas Sawyer (aka Trans)
            © 2005 rtb
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/memoizer.rb
 Copyright: © 2006 Erik Veenstra
            © 2006 Thomas Sawyer (aka Trans)
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/methodspace.rb
 Copyright: © 2006 Thomas Sawyer (aka Trans)
            © 2006 Pit Captain
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/minitar.rb
 Copyright: © 2004 Mauricio Julio Ferna'ndez Pradier
            © 2004 Austin Ziegler
            © 2001-2004 Satoru Takabayashi <satoru at namazu.org>
-License: Ruby License, GPL-2
+License: Ruby or GPL-2
 
 Files: lib/more/facets/multiton.rb
 Copyright: © 2007 Christoph Rippel
            © 2007 Thomas Sawyer (aka Trans)
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/net/smtp_tls.rb
 Copyright: © 2006 Kyle Maxwell
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/opencollection.rb
 Copyright: © 2005 Thomas Sawyer (aka Trans)
            © 2005 George Moschovitis
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/openobject.rb
 Copyright: © 2005 Thomas Sawyer (aka Trans)
            © 2005 George Moschovitis
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/orderedhash.rb
 Copyright: © 2005 Thomas Sawyer (aka Trans)
            © 2005 George Moschovitis
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/pathlist.rb
 Copyright: © 2005 Jonas Pfenniger
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/platform.rb
 Copyright: © 2007 Eric Hodel
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/pool.rb
 Copyright: © 2004 George Moschovitis
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/pqueue.rb
 Copyright: © 2005 K.Kodam
            © 2005 Ronald Butler
            © 2005 Olivier Renaud
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/progressbar.rb
 Copyright: © 2001 Satoru Takabayashi
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/random.rb
 Copyright: © 2005 Thomas Sawyer (aka Trans)
            © 2005 Ilmari Heikkinen <kig at misfiring.net>
            © 2005 Christian Neukirchen <chneukirchen at gmail.com>
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/rbsystem.rb
 Copyright: © 1999-2002 Minero Aoki <aamine at loveruby.net>
              2005 Thomas Sawyer (aka Trans)
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/semaphore.rb
 Copyright: © 2005 Fukumot
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/settings.rb
 Copyright: © 2005 George Moschovitis
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/snapshot.rb
 Copyright: © 2004 Michael Neumann
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/syncarray.rb
 Copyright: © 2004 George Moschovitis
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/synchash.rb
 Copyright: © 2004 George Moschovitis
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/thread.rb
 Copyright: © 2006 Sean O'Halpin
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facet/timer.rb
 Copyright: © 2004 Thomas Sawyer (aka Trans)
            © 2004 Minero Aoki
            © 2004 Paul Brannan
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/typecast.rb
 Copyright: © 2004 Jonas Pfenniger
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/uninheritable.rb
 Copyright: © 2003 Austin Ziegler
-License: Ruby License
+License: Ruby
 
 Files: lib/more/facets/xoxo.rb
 Copyright: © 2006 Christian Neukirchen
-License: Ruby License
+License: Ruby
 
 Files: web/manual/annotations.rdoc
 Copyright: © 2004-2007 Thomas Sawyer (aka Trans)
            © 2004-2007 George Moschovitis
-License: Ruby License, GPL-2
+License: Ruby or GPL-2
 
 Files: work/consider/lib/more/facets/plugin.rb
 Copyright: © 2006-2007 Frédéric Senault
-License: other
+License: other-4
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -332,7 +337,7 @@
 Files: work/deprecated/lib/more/facets/annotations.rb
 Copyright: © 2005 Thomas Sawyer (aka Trans)
            © 2005 George Moschovitis
-License:  Ruby License, GPL-2
+License: Ruby or GPL-2
 
 Files: work/deprecated/lib/more/facets/duration.rb
 Copyright: © 2006 Matthew Harris <shugotenshi at gmail.com>
@@ -341,17 +346,15 @@
 Files: work/deprecated/lib/more/facets/multiton.rb
 Copyright: © 2005 Ara T. Howard
            © 2005Thomas Sawyer (aka Trans)
-License: Ruby License
+License: Ruby
 
 Files: work/reference/aspects.rb
 Copyright: © 2005 George Moschovitis 
-License: Ruby License
+License: Ruby
 
 
-On Debian systems, the complete text of the GNU General Public License
-version 2 can be found in `/usr/share/common-licenses/GPL-2'.
 
-The complete text of the Ruby License is:
+License: Ruby
  Ruby is copyrighted free software by Yukihiro Matsumoto <matz at netlab.co.jp>.
  You can redistribute it and/or modify it under either the terms of the GPL
  (see COPYING.txt file), or the conditions below:
@@ -410,7 +413,7 @@
       WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
       PURPOSE.
 
-The complete text of the MIT License is:
+License: MIT
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
@@ -429,3 +432,40 @@
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
 
+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 program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, 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: GPL-3
+    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 3 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 program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+    On Debian systems, the full text of the GNU General Public
+    License version 3 can be found in the file
+    `/usr/share/common-licenses/GPL-3'.
+

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