[Pkg-voip-commits] r10616 - /stunserver/trunk/debian/copyright

[kilian at alioth.debian.org]

Author: kilian
Date: Sun Dec 21 23:20:18 2014
New Revision: 10616

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10616
Log:
fixup apache license in debian/copyright

Modified:
    stunserver/trunk/debian/copyright

Modified: stunserver/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-voip/stunserver/trunk/debian/copyright?rev=10616&op=diff
==============================================================================
--- stunserver/trunk/debian/copyright	(original)
+++ stunserver/trunk/debian/copyright	Sun Dec 21 23:20:18 2014
@@ -4,43 +4,19 @@
 Source: http://www.stunprotocol.org/
 
 Files: *
-Copyright: 1995-1998, The Apache Group
-License: Apache-1.0
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
+Copyright: 2011-2013 John Selbie
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
  .
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
+     http://www.apache.org/licenses/LICENSE-2.0
  .
- 2. 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.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
  .
- 3. All advertising materials mentioning features or use of this
-    software must display the following acknowledgment:
-    "This product includes software developed by the Apache Group
-    for use in the Apache HTTP server project (http://www.apache.org/)."
- .
- 4. The names "Apache Server" and "Apache Group" must not be used to
-    endorse or promote products derived from this software without
-    prior written permission.
- .
- 5. Redistributions of any form whatsoever must retain the following
-    acknowledgment:
-    "This product includes software developed by the Apache Group
-    for use in the Apache HTTP server project (http://www.apache.org/)."
- .
- THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
- EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR
- ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- OF THE POSSIBILITY OF SUCH DAMAGE.
+ On Debian systems, the complete text of the Apache License 2.0 can
+ be found in "/usr/share/common-licenses/Apache-2.0"