[DRE-commits] [SCM] ruby-stamp.git branch, master, updated. upstream/0.5.0-7-gf18508b

[Daniel Martí]

The following commit has been merged in the master branch:
commit 452e3400869205b551cfb43c762b114937e16b79
Author: Daniel Martí <mvdan at mvdan.cc>
Date:   Sun Jun 2 17:46:10 2013 +0000

    Fill debian/copyright

diff --git a/debian/copyright b/debian/copyright
index 6b053a1..d7c9419 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,28 +1,46 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: stamp
-Source: FIXME <http://example.com/>
+Source: https://github.com/jeremyw/stamp
 
 Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: GPL-2+ (FIXME)
+Copyright: 2011 Jeremy Weiskotten <jeremy at weiskotten.com>
+License: Expat
 
 Files: debian/*
 Copyright: 2013 Daniel Martí <mvdan at mvdan.cc>
-License: GPL-2+ (FIXME)
-Comment: the Debian packaging is licensed under the same terms as the original package.
+License: GPL-3+
 
-License: GPL-2+ (FIXME)
+License: Expat
+ 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 to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+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 2 of the License, or (at your option) any later
+ 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
+ PURPOSE. See the GNU General Public License for more
  details.
  .
  You should have received a copy of the GNU General Public
@@ -31,5 +49,5 @@ License: GPL-2+ (FIXME)
  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 version 3 can be found in the file
+ `/usr/share/common-licenses/GPL-3'.

-- 
ruby-stamp.git