[Pkg-voip-commits] r7440 - in /mumble-django/trunk/debian: copyright python-django-mumble.install

[svedrin-guest at alioth.debian.org]

Author: svedrin-guest
Date: Thu Jul 23 19:40:47 2009
New Revision: 7440

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7440
Log:
on the other hand, m-d doesn't absolutely need them. removed, and removed the copyright notice.

Modified:
    mumble-django/trunk/debian/copyright
    mumble-django/trunk/debian/python-django-mumble.install

Modified: mumble-django/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/copyright?rev=7440&op=diff
==============================================================================
--- mumble-django/trunk/debian/copyright (original)
+++ mumble-django/trunk/debian/copyright Thu Jul 23 19:40:47 2009
@@ -87,43 +87,6 @@
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL-3'.
 
-===============================================================================
-
-
-The .ice files in the directory "pyweb/mumble" have been obtained from Mumble's
-source package, which can be downloaded from http://mumble.sf.net.
-
-Upstream Author:
-    Thorvald Natvig <thorvald at natvig.com>
-
-Copyright:
-    <Copyright © 2005-2009, Thorvald Natvig>
-
-License:
-    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 the Mumble Developers 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 ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-    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.
 
 ===============================================================================
 

Modified: mumble-django/trunk/debian/python-django-mumble.install
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/python-django-mumble.install?rev=7440&op=diff
==============================================================================
--- mumble-django/trunk/debian/python-django-mumble.install (original)
+++ mumble-django/trunk/debian/python-django-mumble.install Thu Jul 23 19:40:47 2009
@@ -1,7 +1,6 @@
 # Python code
 pyweb/mumble/templatetags/*	/usr/share/python-support/python-django-mumble/mumble/templatetags
 pyweb/mumble/*.py		/usr/share/python-support/python-django-mumble/mumble
-pyweb/mumble/*.ice		/usr/share/python-support/python-django-mumble/mumble
 
 # Templates
 template/mumble/*		/usr/share/pyshared-data/python-django-mumble/template/mumble