[DRE-commits] [SCM] thin.git branch, master, updated. debian/1.3.1-1-7-g5452625

[Ryan Niebur]

The following commit has been merged in the master branch:
commit 1f1a0156715d246227c4932cd6ffc730f6741913
Author: Ryan Niebur <ryanryan52 at gmail.com>
Date:   Sat Jun 16 03:54:38 2012 -0700

    Fix with machine readable copyright format 1.0

diff --git a/debian/changelog b/debian/changelog
index 5cd995f..da27525 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ thin (1.3.1-2) UNRELEASED; urgency=low
   * Add patch to pass format string as %s to allow for compiling with
     hardnening options (Closes: #676211)
   * Fix debian/gen_init.rb to use FileUtils for supporting Ruby 1.9
+  * Fix with machine readable copyright format 1.0
 
- -- Ryan Niebur <ryan at debian.org>  Sat, 16 Jun 2012 02:01:40 -0700
+ -- Ryan Niebur <ryan at debian.org>  Sat, 16 Jun 2012 03:53:09 -0700
 
 thin (1.3.1-1.1) unstable; urgency=high
 
diff --git a/debian/copyright b/debian/copyright
index ee02be6..d006ef8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,12 +1,12 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: thin
 Upstream-Contact: Marc-Andre Cournoyer <macournoyer at gmail.com>
 Upstream-Source: http://code.macournoyer.com/thin/download/
 
 Files: *
 Copyright: Copyright 2007-2008, Marc-Andre Cournoyer <macournoyer at gmail.com>
-Copyright: Copyright 2008, Kevin Williams <kevwil at gmail.com>
-Copyright: Copyright 2008, James Golick
+ Copyright 2008, Kevin Williams <kevwil at gmail.com>
+ Copyright 2008, James Golick
 License: Ruby
  Upstream said in an email to me:
  I released Thin under the Ruby license.
@@ -14,7 +14,7 @@ License: Ruby
 
 Files: ext/thin_parser/*
 Copyright: Copyright (c) 2005, Zed A. Shaw
-Copyright: Copyright (c) 2008, Marc-Andre Cournoyer
+ Copyright (c) 2008, Marc-Andre Cournoyer
 License: Ruby or GPL-2
 
 Files: debian/*

-- 
thin.git