[Pkg-mysql-commits] r1724 - mysql-workbench-oss/trunk/debian

[Norbert Tretkowski]

Author: nobse
Date: 2009-09-03 10:40:23 +0000 (Thu, 03 Sep 2009)
New Revision: 1724

Modified:
   mysql-workbench-oss/trunk/debian/copyright
   mysql-workbench-oss/trunk/debian/rules
Log:
Copyright

Modified: mysql-workbench-oss/trunk/debian/copyright
===================================================================
--- mysql-workbench-oss/trunk/debian/copyright	2009-09-03 10:20:11 UTC (rev 1723)
+++ mysql-workbench-oss/trunk/debian/copyright	2009-09-03 10:40:23 UTC (rev 1724)
@@ -7,7 +7,7 @@
 It was downloaded from http://dev.mysql.com/workbench/
 
 Copyright: 
-	(c) 2006-2008 MySQL AB, 2009 Sun Microsystems, Inc. 
+	(c) 2000-2008 MySQL AB, 2009 Sun Microsystems, Inc. 
 
 License:
 	This package is free software; you can redistribute it and/or modify
@@ -197,7 +197,7 @@
 == Scintilla ==
 
 Copyright:
-	(c) 1998-2003 by Neil Hodgson
+	(c) 1998-2009 by Neil Hodgson
 
 License:
 
@@ -215,3 +215,38 @@
 	WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER 
 	TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE 
 	OR PERFORMANCE OF THIS SOFTWARE. 
+
+
+
+== SilverCity ==
+
+Copyright:
+	(c) 2002 by Brian Quinlan
+
+License:
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions
+	are met:
+	1. Redistributions of source code must retain the above copyright
+	   notice, this list of conditions and the following disclaimer.
+	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.
+	3. The name of the author may not be used to endorse or promote products
+	   derived from this software without specific prior written permission.
+
+	THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
+
+	Portions of SilverCity are based on Scintilla. See above for Scintilla
+	license.

Modified: mysql-workbench-oss/trunk/debian/rules
===================================================================
--- mysql-workbench-oss/trunk/debian/rules	2009-09-03 10:20:11 UTC (rev 1723)
+++ mysql-workbench-oss/trunk/debian/rules	2009-09-03 10:40:23 UTC (rev 1724)
@@ -102,6 +102,7 @@
 	@rm -rf /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)/ext/cppconn/CMakeFiles/
 	@rm -rf /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)/ext/curl/
 	@rm -rf /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)/ext/libsigc++/
+	@rm -rf /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)/ext/scintilla/doc/
 	@rm -rf /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)/ext/scintilla/macosx/
 	@rm -rf /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)/frontend/mac/
 	@rm -rf /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)/frontend/windows/