r36823 - in /packages/scilab/trunk/debian: changelog control copyright

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Mon Aug 16 14:06:46 2010
New Revision: 36823

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36823
Log:
  * Update copyright file to fix lintian warning:
    copyright-refers-to-deprecated-bsd-license-file
  * Standards-Version updated to version 3.9.1

Modified:
    packages/scilab/trunk/debian/changelog
    packages/scilab/trunk/debian/control
    packages/scilab/trunk/debian/copyright

Modified: packages/scilab/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/changelog?rev=36823&op=diff
==============================================================================
--- packages/scilab/trunk/debian/changelog (original)
+++ packages/scilab/trunk/debian/changelog Mon Aug 16 14:06:46 2010
@@ -3,8 +3,11 @@
   * Remove option -fwritable-string. writable-string.diff (Closes: #593114)
   * Fix a problem in the detection of sparc for sivp sparcstartup.diff
     (Closes: #591541)
-
- -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 16 Aug 2010 13:29:20 +0200
+  * Update copyright file to fix lintian warning:
+    copyright-refers-to-deprecated-bsd-license-file
+  * Standards-Version updated to version 3.9.1
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 16 Aug 2010 16:03:13 +0200
 
 scilab (5.2.2-2) unstable; urgency=low
 

Modified: packages/scilab/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/control?rev=36823&op=diff
==============================================================================
--- packages/scilab/trunk/debian/control (original)
+++ packages/scilab/trunk/debian/control Mon Aug 16 14:06:46 2010
@@ -23,7 +23,7 @@
  libjlatexmath-java (>= 0.8), 
 # Xcos
  libjgraphx-java (>= 1.2.0.8), libhdf5-serial-dev, libjhdf5-java (>= 2.6)
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Homepage: http://www.scilab.org
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/scilab/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/scilab/trunk/

Modified: packages/scilab/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/copyright?rev=36823&op=diff
==============================================================================
--- packages/scilab/trunk/debian/copyright (original)
+++ packages/scilab/trunk/debian/copyright Mon Aug 16 14:06:46 2010
@@ -530,8 +530,6 @@
 /usr/share/common-licenses/GPL
 The complete text of the Artistic License can be found in
 /usr/share/common-licenses/Artistic
-The complete text of the BSD License can be found in
-/usr/share/common-licenses/BSD
 
 Here is the list of other licenses by libs:
 
@@ -932,6 +930,21 @@
 
 License: 
 BSD 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. All advertising materials mentioning features or use of this software
+    must display the following acknowledgement:
+    This product includes software developed by the University of
+    California, Berkeley and its contributors.
+ 4. Neither the name of the University nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
 
 Linpack:
 ========
@@ -1217,9 +1230,24 @@
 
 Copyright:
 2002-2004 Samit Basu
-
-License:
-BSD
+1997-2002, Makoto Matsumoto and Takuji Nishimura
+
+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 names of its contributors may not be used to endorse or promote 
+ products derived from this software without specific prior written 
+ permission.
+
 
 kiss:
 =====