[SCM] epr-api branch, master, updated. debian/2.2-1-4-gf6cd2b8

Mon Aug 1 19:38:24 UTC 2011

The following commit has been merged in the master branch:
commit f6cd2b88ee10f29cf032afed7e9a8f8dc31dcf9a
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Mon Aug 1 21:37:35 2011 +0200

    Copyright file converted to DEP5 format

diff --git a/debian/changelog b/debian/changelog
index 2a7031d..4edea35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ epr-api (2.2-2) UNRELEASED; urgency=low
   * Removed build dependency from quilt: it is superfluous with source
     format 3.0
   * Fixed watch file
+  * Copyright file converted to DEP5 format
 
- -- Antonio Valentino <antonio.valentino at tiscali.it>  Mon, 01 Aug 2011 21:23:02 +0200
+ -- Antonio Valentino <antonio.valentino at tiscali.it>  Mon, 01 Aug 2011 21:35:45 +0200
 
 epr-api (2.2-1) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 1611b1a..3c1f091 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,66 +1,52 @@
-This work was packaged for Debian by:
-
-    Antonio Valentino <antonio.valentino at tiscali.it> on Sun, 31 Oct 2010 18:25:24 +0100
-
-It was downloaded from:
-
-    http://github.com/bcdev/epr-api
-
-Upstream Author(s):
-
-    Brockmann Consult <info at brockmann-consult.de>
-
-Copyright:
-
-    Copyright (C) 2002 by Brockmann Consult (info at brockmann-consult.de)
-
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: epr-api
+Source: http://github.com/bcdev/epr-api
+
+Files: *
+Copyright: 2002 Brockmann Consult <info at brockmann-consult.de>
+License: GPL-3.0+
+
+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:
+ 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
+ all copies of the software and related documentation, and (ii) the names of
+ Sam Leffler and Silicon Graphics may not be used in any advertising or
+ publicity relating to the software without the specific, prior written
+ permission of Sam Leffler and Silicon Graphics.
+ .
+ THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ .
+ IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ OF THIS SOFTWARE.
 
-    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".
-
-The Debian packaging is:
-
-    Copyright (C) 2010 Antonio Valentino <antonio.valentino at tiscali.it>
-
-and is licensed under the GPL version 3, see above.
-
-
-
-src/examples/tiff.h,
-src/examples/tiffio.h:
-
-    Copyright (c) 1988-1997 Sam Leffler
-    Copyright (c) 1991-1997 Silicon Graphics, Inc.
-
-    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
-    all copies of the software and related documentation, and (ii) the names of
-    Sam Leffler and Silicon Graphics may not be used in any advertising or
-    publicity relating to the software without the specific, prior written
-    permission of Sam Leffler and Silicon Graphics.
-
-    THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
-    WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-
-    IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
-    ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
-    OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-    WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
-    LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-    OF THIS SOFTWARE.

-- 
ENVISAT Product Reader API for C

