[SCM] tinyows branch, master, updated. upstream/1.1.0-48-g8f894df

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 8f894dfa718f64fa71db745e166d741d414f0cbf
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jan 4 20:49:08 2014 +0100

    Include OGC Software Notice in copyright, used for OGC schemas and tests.

diff --git a/debian/changelog b/debian/changelog
index 4d5945a..a1eaec4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tinyows (1.1.0-4) UNRELEASED; urgency=low
+
+  * Include OGC Software Notice in copyright, used for OGC schemas and tests.
+
+ -- Bas Couwenberg <sebastic at xs4all.nl>  Sat, 04 Jan 2014 20:48:58 +0100
+
 tinyows (1.1.0-3) unstable; urgency=low
 
   * Upload for Debian closes: #723700.
diff --git a/debian/copyright b/debian/copyright
index 5e2bced..65015ef 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,51 +9,51 @@ License: MIT/X11
 
 Files: schema/ows/1.0.0/*
 Copyright: 2005, 2010, Open Geospatial Consortium, Inc.
-License: OGC
+License: OGC-Software
 
 Files: schema/gml/3.1.1/base/*
 Copyright: 2001, 2005, 2010, Open Geospatial Consortium, Inc.
-License: OGC
+License: OGC-Software
 
 Files: schema/gml/3.1.1/smil/*
 Copyright: 1998-2001, W3C (MIT, INRIA, Keio)
-License: OGC
+License: OGC-Software
 
 Files: schema/gml/2.1.2/geometry.xsd
 Copyright: 2001-2002, OGC
-License: OGC
+License: OGC-Software
 
 Files: schema/gml/2.1.2/feature.xsd
 Copyright: 2002, OGC
-License: OGC
+License: OGC-Software
 
 Files: schema/filter/1.0.0/*
 Copyright: 2002, 2010, Open Geospatial Consortium, Inc.
-License: OGC
+License: OGC-Software
 
 Files: schema/filter/1.1.0/*
 Copyright: 2002-2004, 2010, Open Geospatial Consortium, Inc.
-License: OGC
+License: OGC-Software
 
 Files: schema/xlink/1.0.0/*
 Copyright: 2001, OGC
-License: OGC
+License: OGC-Software
 
 Files: schema/wfs/1.0.0/*
 Copyright: 2002, 2010, Open Geospatial Consortium, Inc.
-License: OGC
+License: OGC-Software
 
 Files: schema/wfs/1.1.0/*
 Copyright: 2002, 2010, Open Geospatial Consortium, Inc.
-License: OGC
+License: OGC-Software
 
 Files: test/wfs_100/cite/*
 Copyright: 2012, Open Geospatial Consortium, Inc.
-License: OGC
+License: OGC-Software
 
 Files: test/wfs_110/cite/*
 Copyright: 2012, Open Geospatial Consortium, Inc.
-License: OGC
+License: OGC-Software
 
 Files: debian/*
 Copyright: 2010, Intevation GmbH <christopher.bertels at intevation.de>
@@ -96,7 +96,9 @@ License: GPL-3.0+
  License version 3 can be found in the file
  `/usr/share/common-licenses/GPL-3'.
 
-License: OGC
+License: OGC-Document
+ Document Notice
+ .
  Public documents on the OGC site are provided by the copyright holders under 
  the following license. The software or Document Type Definitions (DTDs) 
  associated with OGC specifications are governed by the Software Notice. 
@@ -145,3 +147,45 @@ License: OGC
  publicity pertaining to this document or its contents without specific, written
  prior permission. Title to copyright in this document will at all times remain with
  copyright holders.
+
+License: OGC-Software
+ Software Notice 
+ .
+ This OGC work (including software, documents, or other related items) is being
+ provided by the copyright holders under the following license. By obtaining,
+ using and/or copying this work, you (the licensee) agree that you have read,
+ understood, and will comply with the following terms and conditions:
+ .
+ Permission to use, copy, and modify this software and its documentation, with
+ or without modification, for any purpose and without fee or royalty is hereby
+ granted, provided that you include the following on ALL copies of the software
+ and documentation or portions thereof, including modifications, that you make:
+ .
+   1. The full text of this NOTICE in a location viewable to users of the
+      redistributed or derivative work.
+   2. Any pre-existing intellectual property disclaimers, notices, or terms
+      and conditions. If none exist, a short notice of the following form
+      (hypertext is preferred, text is permitted) should be used within the
+      body of any redistributed or derivative code:
+      "Copyright © [$date-of-document] Open Geospatial Consortium, Inc. All
+       Rights Reserved. http://www.opengeospatial.org/ogc/legal"
+      (Hypertext is preferred, but a textual representation is permitted.)
+   3. Notice of any changes or modifications to the OGC files, including the
+      date changes were made. (We recommend you provide URIs to the location
+      from which the code is derived.) 
+ .
+ .
+ THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS
+ MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+ LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR
+ PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE
+ ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+ .
+ COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+ CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+ .
+ The name and trademarks of copyright holders may NOT be used in advertising
+ or publicity pertaining to the software without specific, written prior
+ permission. Title to copyright in this software and any associated
+ documentation will at all times remain with copyright holders.
+

-- 
A simple WFS-T server