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

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit 6d8e56ff756b85a56380f14cc7e165e0dae7595a
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Sat May 19 15:43:22 2012 +0200

    debian/copyright: reworked to fit the Debian copyright format version 1.0.

diff --git a/debian/changelog b/debian/changelog
index 3f1833a..486f6c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,7 +26,7 @@ camping (2.1.498-1) UNRELEASED; urgency=low
     - Added an alternative depend on ruby-tilt, so the user can choose
       between Mab and Tilt.
     - Added a suggest on thin as an alternative to mongrel.
-  * debian/copyright: reworked to fit the DEP5 format. 
+  * debian/copyright: reworked to fit the Debian copyright format version 1.0.
   * debian/ruby-test.rb: added to run the test apps from test/.
 
  -- Paul van Tilburg <paulvt at debian.org>  Mon, 30 Jan 2012 12:11:39 +0100
diff --git a/debian/copyright b/debian/copyright
index 653a92b..9435480 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,11 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: camping
+Upstream-Conact: camping-list at rubyforge.org
 Source: http://camping.rubyforge.org/
 
 Files: *
 Copyright: 2006, Why the lucky stiff <why at whytheluckystiff.net>
-License:
+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
@@ -24,7 +25,7 @@ License:
 
 Files: debian/*
 Copyright: 2011, Paul van Tilburg <paulvt at debian.org>
-License:
+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, version 2 of the License, or (at your opinion)

-- 
camping.git