[SCM] Debian packaging of libimap-admin-perl branch, master, updated. d41deddfa9c07f3d74bbeed378bc4f3692cde6be

[Florian Schlichting]

The following commit has been merged in the master branch:
commit 8a09b7af8a15e8cc21704aee1067043e69fb19ec
Author: Florian Schlichting <fschlich at zedat.fu-berlin.de>
Date:   Mon Apr 9 22:59:51 2012 +0200

    Bumped Standards-Version to 3.9.3 (use copyright-format 1.0)
    
    Upstream hasn't answered the copyright question posed by jawnsy at
    https://rt.cpan.org/Public/Bug/Display.html?id=49110; this bug is now
    three years old. However, I notice an entry in the upstream changelog
    from 2000: "Added a license line for the debian folks, This module is
    distributed under the Artistic license which is now included in the
    module package (its the same as the perl license)". While this doesn't
    make complete sense (Perl is licensed under Artistic *or* GPL-1+), I
    think the intention is clear enough. And still, we can be paranoid and
    safely go with the most restrictive interpretation, Artistic only.

diff --git a/debian/changelog b/debian/changelog
index eb37386..d391779 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,21 +1,14 @@
 libimap-admin-perl (1.6.7-1) UNRELEASED; urgency=low
 
-  NEEDS copyright information from upstream
-
   [ Jonathan Yu ]
   * New upstream release
     + Add partition support for the rename function
   * Short rules format (dh 7.0.50, quilt 0.46-7)
   * Rewrote control description
-  * Standards-Version 3.8.3 (no changes)
   * Remove duplicate Section/Priority information in binary paragraph
   * Add myself to Copyright and Uploaders
   * Updated copyright information
 
-  [ gregor herrmann ]
-  * debian/control: Changed: Switched Vcs-Browser field to ViewSVN
-    (source stanza).
-
   [ Rene Mayorga ]
   * debian/control: update my email address.
 
@@ -31,6 +24,9 @@ libimap-admin-perl (1.6.7-1) UNRELEASED; urgency=low
   [ Ansgar Burchardt ]
   * debian/control: Convert Vcs-* fields to Git.
 
+  [ Florian Schlichting ]
+  * Bumped Standards-Version to 3.9.3 (use copyright-format 1.0).
+
  -- Ryan Niebur <ryanryan52 at gmail.com>  Tue, 01 Sep 2009 21:19:03 -0700
 
 libimap-admin-perl (1.6.6-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index d450b00..47feeac 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Build-Depends-Indep: perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Niko Tyni <ntyni at iki.fi>, Rene Mayorga <rmayorga at debian.org>,
  Jonathan Yu <jawnsy at cpan.org>
-Standards-Version: 3.8.3
+Standards-Version: 3.9.3
 Homepage: http://search.cpan.org/dist/IMAP-Admin/
 Vcs-Git: git://git.debian.org/pkg-perl/packages/libimap-admin-perl.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/libimap-admin-perl.git
diff --git a/debian/copyright b/debian/copyright
index 5a51a05..47ffabc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,10 @@
-Format-Specification:
-    http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: IMAP-Admin
-Upstream-Maintainer: Eric Estabrooks <eric at urbanrage.com>
-Upstream-Source: http://search.cpan.org/dist/IMAP-Admin
+Upstream-Contact: Eric Estabrooks <eric at urbanrage.com>
+Source: http://search.cpan.org/dist/IMAP-Admin
 
 Files: *
-Copyright: Eric Estabrooks <eric at urbanrage.com>
+Copyright: 1998-2009, Eric Estabrooks <eric at urbanrage.com>
 License: Artistic
 
 Files: debian/*
@@ -15,20 +14,20 @@ Copyright: 2009, Jonathan Yu <jawnsy at cpan.org>
  2004, Joachim Breitner <nomeata at debian.org>
  2003, Daniel Schepler <schepler at debian.org>
  2000, Alan Dorman <mdorman at debian.org>
-License-Alias: Perl
-License: GPL-1+ | Artistic
+License: Artistic or GPL-1+
 
 License: Artistic
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the Artistic License, which comes with Perl.
-    On Debian GNU/Linux systems, the complete text of the Artistic License
-    can be found in `/usr/share/common-licenses/Artistic'
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the Artistic License, which comes with Perl.
+ .
+ On Debian systems, the complete text of the Artistic License can be
+ found in `/usr/share/common-licenses/Artistic'.
 
 License: GPL-1+
-    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 1, or (at your option)
-    any later version.
-    On Debian GNU/Linux systems, the complete text of the GNU General
-    Public License can be found in `/usr/share/common-licenses/GPL'
-
+ 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 1, or (at your option)
+ any later version.
+ .
+ On Debian systems, the complete text of version 1 of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-1'.

-- 
Debian packaging of libimap-admin-perl