[DRE-commits] [SCM] ruby-httpclient.git branch, master, updated. debian/2.2.4-1

[Gunnar Wolf]

The following commit has been merged in the master branch:
commit 5984cb049f2112b67dd3fe01f1f99d1302b364cf
Author: Gunnar Wolf <gwolf at gwolf.org>
Date:   Thu Mar 8 17:36:20 2012 -0600

    Minor packaging changes
    
    * Transitional packages should be priority:extra
    * Standards-version 3.9.2→3.9.3 (no changes)
    * Corrected debian/copyright to properly comply with DEP5

diff --git a/debian/changelog b/debian/changelog
index fdef16c..817c479 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 ruby-httpclient (2.2.4-1) unstable; urgency=low
 
   * New upstream version
+  * Transitional packages should be priority:extra
+  * Standards-version 3.9.2→3.9.3 (no changes)
+  * Corrected debian/copyright to properly comply with DEP5
 
- -- Gunnar Wolf <gwolf at debian.org>  Thu, 08 Mar 2012 17:17:24 -0600
+ -- Gunnar Wolf <gwolf at debian.org>  Thu, 08 Mar 2012 17:25:43 -0600
 
 ruby-httpclient (2.2.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 455a6e8..4576c3f 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.al
 Uploaders: Antonio Terceiro <terceiro at debian.org>, Ryan Niebur <ryanryan52 at gmail.com>, Gunnar Wolf <gwolf at debian.org>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.7~)
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-httpclient.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-httpclient.git;a=summary
 Homepage: http://github.com/nahi/httpclient
@@ -40,6 +40,7 @@ Description: HTTP client library for ruby (ruby 1.8 version)
 
 Package: libhttp-access2-ruby
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-httpclient
 Description: Transitional package for ruby-httpclient
@@ -48,6 +49,7 @@ Description: Transitional package for ruby-httpclient
 
 Package: libhttpclient-ruby
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-httpclient
 Description: Transitional package for ruby-httpclient
@@ -56,6 +58,7 @@ Description: Transitional package for ruby-httpclient
 
 Package: libhttpclient-ruby1.8
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-httpclient
 Description: Transitional package for ruby-httpclient
@@ -64,6 +67,7 @@ Description: Transitional package for ruby-httpclient
 
 Package: libhttpclient-ruby1.9.1
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-httpclient
 Description: Transitional package for ruby-httpclient
@@ -72,6 +76,7 @@ Description: Transitional package for ruby-httpclient
 
 Package: libhttp-access2-ruby1.8
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-httpclient
 Description: Transitional package for ruby-httpclient
diff --git a/debian/copyright b/debian/copyright
index 6c3212f..84c37a4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,14 +1,23 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=173
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: httpclient
 Source: https://github.com/nahi/httpclient
 
 Files: *
 Copyright: (C) 2000-2011  NAKAMURA, Hiroshi  <nahi at ruby-lang.org>.
-License:
+License: GPL-2+ or Ruby
+
+Files: debian/*
+Copyright: © 2002-2006 Fumitoshi UKAY <ukai at debian.or.jp>
+	   © 2009-2012 Ryan Niebur <ryanryan52 at gmail.com>
+	   © 2010-2012 Gunnar Wolf <gwolf at debian.org>
+	   © 2011-2012 Antonio Terceiro <terceiro at debian.org>
+License: GPL-2+ or Ruby
+
+License: Ruby
  This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
  redistribute it and/or modify it under the same terms of Ruby's license;
  either the dual license version in 2003, or any later version.
-Comment:
+ .
  Ruby license follows.
  .
  Ruby is copyrighted free software by Yukihiro Matsumoto <matz at netlab.co.jp>.
@@ -60,12 +69,12 @@ Comment:
     WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
     PURPOSE.
 
-Comment:
- On Debian systems, a copy of the GNU General Public License can be found in
- /usr/share/common-licenses/GPL.
-
-Files: debian/*
-Copyright: Antonio Terceiro <terceiro at debian.org>
-License:
- The Debian packaging is licensed under the same terms as the original
- package.
+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; either
+ version 2 of the License, or (at your option) any later
+ version.
+ .
+ On Debian systems, a copy of the GNU General Public License v2 can be found in
+ /usr/share/common-licenses/GPL-2

-- 
ruby-httpclient.git