[DRE-commits] [SCM] ruby-activeresource-2.3.git branch, master, updated. debian/2.3.14-1-6-g0bf518f

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit fc68b84f1ead2ca92147b6eee514f6986655f7ef
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Fri Jun 29 20:07:28 2012 +0200

    Fixed copyright to fit the Debian copyright format version 1.0

diff --git a/debian/changelog b/debian/changelog
index 6bd484b..5b4f387 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ ruby-activeresource-2.3 (2.3.14-2) UNRELEASED; urgency=low
   * debian/control.in:
     - Bumped standards-version to 3.9.3.
     - Bumped build-dependency on gem2deb to >= 0.3.0~.
+  * 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:59:41 +0200
 
diff --git a/debian/copyright b/debian/copyright
index a9d3838..267588e 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: activeresource
 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-activeresource-2.3.git