[DRE-commits] [SCM] ruby-actionmailer-2.3.git branch, master, updated. debian/2.3.14-2-4-gb50ff38

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit 33d1edff3e7cc2e7247a58a96d22059aab6a557a
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Fri Jun 29 19:53:36 2012 +0200

    Fixed copyright to fit the Debian copyright format version 1.0

diff --git a/debian/changelog b/debian/changelog
index b0bcff5..4f03f7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ ruby-actionmailer-2.3 (2.3.14-3) UNRELEASED; urgency=low
     - Bumped build-dependency on gem2deb to >= 0.3.0~.
     - Dropped unneeded alternative depends on lib*-ruby packages.
     - Changed conflicts into breaks.
+  * debian/copyright: fixed to to fit the Debian copyright format version 1.0.
 
  -- Paul van Tilburg <paulvt at debian.org>  Fri, 29 Jun 2012 19:49:51 +0200
 
diff --git a/debian/copyright b/debian/copyright
index be6be6d..7c17a30 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-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: actionmailer
 Upstream-Contact: David Heinemeier Hansson <david at loudthinking.com>
 Source: http://rubygems.org/gems/activesupport
@@ -6,6 +6,12 @@ Source: http://rubygems.org/gems/activesupport
 Files: *
 Copyright: Copyright 2004 David Heinemeier Hansson
 License: Expat
+
+Files: debian/*
+Copyright: Copyright 2011 Ondřej Surý <ondrej at debian.org>
+License: Expat
+
+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
@@ -24,7 +30,3 @@ License: Expat
  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: Copyright 2011 Ondřej Surý <ondrej at debian.org>
-License: Expat

-- 
ruby-actionmailer-2.3.git