[DRE-commits] [SCM] gem2deb.git branch, master, updated. 4abb098ec818b5d2359805c58536ef140d1e4e5a

[Lucas Nussbaum]

The following commit has been merged in the master branch:
commit 4abb098ec818b5d2359805c58536ef140d1e4e5a
Author: Lucas Nussbaum <lucas at lucas-nussbaum.net>
Date:   Sun Mar 13 11:07:36 2011 +0100

    Generate a better debian/copyright template.

diff --git a/debian/TODO b/debian/TODO
index f64e0d8..eb7659f 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -2,8 +2,6 @@ it should be possible to rewrite shebangs to something else than ruby1.8
 
 handle the cases of termios and ncurses (extconf.rb in root dir)
 
-Generate a basic debian/copyright using DEP5
-
 21:38 < Mithrandir> lucas: gem fetch yajl-ruby; gem2deb yajl-ruby-0.8.1.gem errors out with a duplicate Package field
 21:49 < Mithrandir> after building yajl (which is a compiled extension) and doing require 'yajl', I get LoadError: no such file to load -- yajl/yajl
 21:49 < Mithrandir> I think that's because the .so is in /usr/lib/ruby/vendor_ruby/1.8/x86_64-linux/yajl.so
diff --git a/debian/changelog b/debian/changelog
index d5df3b5..534bec5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,9 @@ gem2deb (0.1.1) experimental; urgency=low
   * Add Vcs-* fields after moving to PRE repo
   * Document that gem2deb can download the gem using gem fetch
   * gem2tgz gemname now downloads the gem if needed.
+  * Generate a better debian/copyright template.
 
- -- Lucas Nussbaum <lucas at lucas-nussbaum.net>  Sat, 12 Mar 2011 09:01:21 +0100
+ -- Lucas Nussbaum <lucas at lucas-nussbaum.net>  Sun, 13 Mar 2011 11:07:20 +0100
 
 gem2deb (0.1.0) experimental; urgency=low
 
diff --git a/lib/gem2deb/dh_make_ruby.rb b/lib/gem2deb/dh_make_ruby.rb
index 4b3b03f..f2dd76a 100644
--- a/lib/gem2deb/dh_make_ruby.rb
+++ b/lib/gem2deb/dh_make_ruby.rb
@@ -396,6 +396,38 @@ Description: <%= short_description ? short_description : 'FIXME' %>
 7
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> debian/copyright
 FIXME. fill-in with DEP5 copyright file. http://dep.debian.net/deps/dep5/
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173
+Upstream-Name: <%= gem_name %>
+Source: FIXME (URL where source can be downloaded)
+
+Files: *
+Copyright: Copyright 1998 John Doe <jdoe at example.com>
+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'.
+
+Files: debian/*
+Copyright: Copyright 1998 Jane Smith <jsmith at example.net>
+License:
+ [LICENSE TEXT]
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> debian/watch
 version=3
 http://pkg-ruby-extras.alioth.debian.org/cgi-bin/gemwatch/<%= gem_name %> .*/<%= gem_name %>-(.*).tar.gz

-- 
gem2deb.git