[SCM] epr-api branch, master, updated. debian/2.2-1-11-ge357abe

[Antonio Valentino]

The following commit has been merged in the master branch:
commit 7d80294875be8969200182edd53bc2d379b3a82d
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Sun Mar 11 11:06:53 2012 +0100

    Copyright file checked with cme

diff --git a/debian/changelog b/debian/changelog
index cb01aa3..7df537a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ epr-api (2.2-3) UNRELEASED; urgency=low
 
   * Use versioned copyright format uri.
 
- -- Antonio Valentino <antonio.valentino at tiscali.it>  Sat, 05 Nov 2011 17:36:20 +0100
+ -- Antonio Valentino <antonio.valentino at tiscali.it>  Sun, 11 Mar 2012 11:03:54 +0100
 
 epr-api (2.2-2) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 9179276..f5d1d40 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=202
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: epr-api
 Source: http://github.com/bcdev/epr-api
 
@@ -10,27 +10,10 @@ Files: debian/*
 Copyright: 2010-2011 Antonio Valentino <antonio.valentino at tiscali.it>
 License: GPL-3.0+
 
-License: GPL-3.0+
- 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 3 of the License, or
- (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
-
 Files: src/examples/tiff*.h
 Copyright: 1988-1997 Sam Leffler
            1991-1997 Silicon Graphics, Inc.
-License:
+License: other
  Permission to use, copy, modify, distribute, and sell this software and
  its documentation for any purpose is hereby granted without fee, provided
  that (i) the above copyright notices and this permission notice appear in
@@ -50,3 +33,20 @@ License:
  LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  OF THIS SOFTWARE.
 
+License: GPL-3.0+
+ 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 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+

-- 
ENVISAT Product Reader API for C