[SCM] tinyows branch, master, updated. debian/0.9.0-2-40-g0ce88fb

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit e0a74f86d7fb8d89ba05e4bd55f4daa32f25a8e4
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jul 21 19:07:48 2013 +0200

    Update copyright to dep5 format.

diff --git a/debian/changelog b/debian/changelog
index 598e0ce..cd8c4d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ tinyows (1.1.0-3) UNRELEASED; urgency=low
   * Use minimal dh rules with autoreconf.
   * Install NEWS as upstream changelog.
   * Set all hardening flags in CFLAGS, the only variable used by Makefile.
+  * Update copyright to dep5 format.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Sun, 21 Jul 2013 15:37:59 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 6a903c5..01ddc9d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,43 +1,49 @@
-This package was debianized by Intevation GmbH <christopher.bertels at intevation.de> on
-Thu, 22 Apr 2010 16:41:09 +0200.
-
-It was downloaded from http://tinyows.org
-
-Upstream Author(s):
-
-    Barbara Philippot
-    Olivier Courtin
-
-Copyright:
-
-    Barbara Philippot
-    Olivier Courtin
-
-License:
-
-    Copyright (c) <2007-2009> <Barbara Philippot - Olivier Courtin>
-    
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation 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 THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-    IN THE SOFTWARE.
-
-The Debian packaging is:
-
-    Copyright (C) 2010 Intevation GmbH <christopher.bertels at intevation.de>
-
-and is licensed under the GPL version 3, 
-see `/usr/share/common-licenses/GPL-3'.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: TinyOWS
+Upstream-Contact: Barbara Philippot, Olivier Courtin and the MapServer team.
+Source: http://www.mapserver.org/tinyows
+
+Files: *
+Copyright: 2007-2012, Barbara Philippot - Olivier Courtin
+License: MIT/X11 (BSD like)
+
+Files: debian/*
+Copyright: 2010, Intevation GmbH <christopher.bertels at intevation.de>
+License: GPL-3.0+
+
+License: MIT/X11 (BSD like)
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation 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 THE 
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS 
+ IN THE 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 program 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 full text of the GNU General Public
+ License version 3 can be found in the file
+ `/usr/share/common-licenses/GPL-3'.

-- 
A simple WFS-T server