[SCM] FreeCAD packaging branch, master, updated. debian/0.9.2646.5.dfsg-1-15-g916630f

[Teemu Ikonen]

The following commit has been merged in the master branch:
commit 8926586b6bcfdedfbe36058bc35d03b1bebf9986
Author: Teemu Ikonen <tpikonen at gmail.com>
Date:   Sat Jul 17 19:03:27 2010 +0200

    copyright: Add a verbatim copy of Tiddlywiki BSD license.
    
    Fixes lintian warning copyright-refers-to-deprecated-bsd-license-file.

diff --git a/debian/copyright b/debian/copyright
index b7da549..a97cf01 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -111,8 +111,34 @@ License: other
 Files: src/Doc/Start_Page.html
 Copyright: 2004-2009 UnaMesa Association
 License: BSD
- On Debian systems, the complete text of the BSD license
- can be found in `/usr/share/common-licenses/BSD'.
+ Copyright (c) UnaMesa Association 2004-2009
+ .
+ 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 UnaMesa Association 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 COPYRIGHT OWNER 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.
 
 Files: src/Doc/Start_Page.html
 Copyright: 2009 John Resig

-- 
FreeCAD packaging