The following commit has been merged in the master branch:
commit f0550d3946aa13dbaffacde1b0e045d190548d09
Author: Francesco Paolo Lovergine <fran...@debian.org>
Date:   Sun Feb 26 17:29:04 2012 +0100

    Revised copyright for definitive 1.0 format.

diff --git a/debian/changelog b/debian/changelog
index a32bd99..10ceb40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ gdal (1.9.0-1~exp3) experimental; urgency=low
 
   * Added b-deps and enabled a few new supports: 
     Poppler, Armadillo, OpenJPEG, FreeXL and libZMA.
+  * Revised copyright file for format 1.0.
 
- -- Francesco Paolo Lovergine <fran...@debian.org>  Thu, 23 Feb 2012 12:40:19 
+0100
+ -- Francesco Paolo Lovergine <fran...@debian.org>  Sun, 26 Feb 2012 17:24:24 
+0100
 
 gdal (1.9.0-1~exp2) experimental; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 101207b..5e181d3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,5 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: GDAL/OGR
 Upstream-Contact: The GDAL/OGR project team, Frank Warmerdam 
<warmer...@pobox.com>
 Source: http://www.gdal.org/
 
@@ -11,10 +12,10 @@ License: Expat
  the rights to use, copy, modify, merge, publish, distribute, sublicense,
  and/or sell copies of the Software, and to permit persons to whom the
  Software is furnished to do so, subject to the following conditions:
-
+ .
  The above copyright notice and this permission notice shall be included
  in all copies or substantial portions of the Software.
-
+ .
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@@ -38,7 +39,7 @@ License: BSD
  * Neither the name of Industrial Light & Magic nor the names of
  its contributors may be used to endorse or promote products derived
  from this software without specific prior written permission. 
-
+ .
  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -65,19 +66,19 @@ License: BSD
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
-
+ .
  * Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
-
+ .
  * Redistributions in binary form must reproduce the above
    copyright notice, this list of conditions and the following
    disclaimer in the documentation and/or other materials provided
    with the distribution.
-
+ .
  * Neither the name of Utrecht University nor the names of its contributors
    may be used to endorse or promote products derived from this software
    without specific prior written permission.
-
+ .
  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -96,17 +97,17 @@ License: public-domain
  The degrib and g2clib source code are modified versions of code produced 
  by NOAA NWS and are in the public domain subject to the following
  restrictions:
-
+ .
  http://www.weather.gov/im/softa.htm
-
+ .
  DISCLAIMER The United States Government makes no warranty, expressed or 
  implied, as to the usefulness of the software and documentation for any 
  purpose. The U.S. Government, its instrumentalities, officers, employees, 
  and agents assumes no responsibility (1) for the use of the software and 
  documentation listed below, or (2) to provide technical support to users. 
-
+ .
  http://www.weather.gov/disclaimer.php
-
+ .
   The information on government servers are in the public domain, unless 
  specifically annotated otherwise, and may be used freely by the public so 
  long as you do not 1) claim it is your own (e.g. by claiming copyright for 
@@ -115,7 +116,7 @@ License: public-domain
  then present it as official government material. You also cannot present 
  information of your own in a way that makes it appear to be official 
  government information..
-
+ .
   The user assumes the entire risk related to its use of this data. NWS is 
  providing this data "as is," and NWS disclaims any and all warranties, 
  whether express or implied, including (without limitation) any implied 
@@ -123,7 +124,7 @@ License: public-domain
  event will NWS be liable to you or to any third party for any direct, 
  indirect, incidental, consequential, special or exemplary damages or lost 
  profit resulting from any use or misuse of this data.
-
+ .
   As required by 17 U.S.C. 403, third parties producing copyrighted works 
  consisting predominantly of the material appearing in NWS Web pages must 
  provide notice with such work(s) identifying the NWS material incorporated 
@@ -135,10 +136,10 @@ License: Zlib
  This is version 2005-Feb-10 of the Info-ZIP copyright and license.
  The definitive version of this document should be available at
  ftp://ftp.info-zip.org/pub/infozip/license.html indefinitely.
-
+ .
  For the purposes of this copyright and license, "Info-ZIP" is defined as
  the following set of individuals:
-
+ .
     Mark Adler, John Bush, Karl Davis, Harald Denker, Jean-Michel Dubois,
     Jean-loup Gailly, Hunter Goatley, Ed Gordon, Ian Gorman, Chris Herborth,
     Dirk Haase, Greg Hartwig, Robert Heath, Jonathan Hudson, Paul Kienitz,
@@ -147,19 +148,19 @@ License: Zlib
     Kai Uwe Rommel, Steve Salisbury, Dave Smith, Steven M. Schweda,
     Christian Spieler, Cosmin Truta, Antoine Verheijen, Paul von Behren,
     Rich Wales, Mike White
-
+ .
  This software is provided "as is," without warranty of any kind, express
  or implied.  In no event shall Info-ZIP or its contributors be held liable
  for any direct, indirect, incidental, special or consequential damages
  arising out of the use of or inability to use this software.
-
+ .
  Permission is granted to anyone to use this software for any purpose,
  including commercial applications, and to alter it and redistribute it
  freely, subject to the following restrictions:
-
+ .
      1. Redistributions of source code must retain the above copyright notice,
         definition, disclaimer, and this list of conditions.
-
+ .
      2. Redistributions in binary form (compiled executables) must reproduce
         the above copyright notice, definition, disclaimer, and this list of
         conditions in documentation and/or other materials provided with the
@@ -168,7 +169,7 @@ License: Zlib
         self-extracting archive; that is permitted without inclusion of this
         license, as long as the normal SFX banner has not been removed from
         the binary or disabled.
-
+ .
      3. Altered versions--including, but not limited to, ports to new operating
         systems, existing ports with new graphical interfaces, and dynamic,
         shared, or static library versions--must be plainly marked as such
@@ -180,7 +181,7 @@ License: Zlib
         or "MacZip" without the explicit permission of Info-ZIP.  Such altered
         versions are further prohibited from misrepresentative use of the
         Zip-Bugs or Info-ZIP e-mail addresses or of the Info-ZIP URL(s).
-
+ .
      4. Info-ZIP retains the right to use the names "Info-ZIP," "Zip," "UnZip,"
         "UnZipSFX," "WiZ," "Pocket UnZip," "Pocket Zip," and "MacZip" for its
         own source and binary releases.
@@ -193,7 +194,7 @@ Comment: This code is derived from the code associated with 
the book "An
 License: BSD
  Redistribution and use in source and binary forms, with or without 
  modification, are permitted provided that the following conditions are met:
-
+ .
      * Redistributions of source code must retain the above copyright notice, 
        this list of conditions and the following disclaimer.
      * Redistributions in binary form must reproduce the above copyright 
notice,
@@ -202,7 +203,7 @@ License: BSD
      * Neither the name of the David F. Rogers nor the names of its 
contributors
        may be used to endorse or promote products derived from this software 
        without specific prior written permission.
-
+ .
  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 

-- 
GDAL/OGR library and tools

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to