[DRE-commits] [SCM] camping.git branch, master, updated. upstream/2.1-4-gfac3896

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit fac3896a8e432cfd134fdbdedc6b0ed9471b9fa3
Author: Paul van Tilburg <paul at luon.net>
Date:   Sat Sep 24 23:34:29 2011 +0200

    Fixed typos in debian/control and debian/copyright; added missing license.

diff --git a/debian/control b/debian/control
index e2e6d2c..9075b13 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: camping
 Section: web
 Priority: optional
-Maintainers: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Paul van Tilburg <paulvt at debian.org>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.9~), ruby-rack-test
diff --git a/debian/copyright b/debian/copyright
index a6aa495..653a92b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,24 +4,40 @@ Source: http://camping.rubyforge.org/
 
 Files: *
 Copyright: 2006, Why the lucky stiff <why at whytheluckystiff.net>
-License: 
+License:
   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 BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
+  THE AUTHORS 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.
 
 Files: debian/*
-Copyright: 2011 Paul van Tilburg <paulvt at debian.org>
-License: GPL-2+
+Copyright: 2011, Paul van Tilburg <paulvt at debian.org>
+License:
+  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, version 2 of the License, or (at your opinion)
+  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'.

-- 
camping.git