[Pkg-xfce-commits] r4550 - desktop/branches/experimental/orage/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-07 17:41:06 +0000 (Sun, 07 Nov 2010)
New Revision: 4550

Modified:
   desktop/branches/experimental/orage/debian/changelog
   desktop/branches/experimental/orage/debian/copyright
Log:
debian/copyright updated to include complete text of BSD license.

Modified: desktop/branches/experimental/orage/debian/changelog
===================================================================
--- desktop/branches/experimental/orage/debian/changelog	2010-11-07 17:35:43 UTC (rev 4549)
+++ desktop/branches/experimental/orage/debian/changelog	2010-11-07 17:41:06 UTC (rev 4550)
@@ -15,8 +15,9 @@
     - 01_fix-build-with-external-ical added, update includes to correctly pick
       system libical.
     - 02_explicit-link-libxfcegui4 added, link explicitly against libxfcegui4. 
+  * debian/copyright updated to include complete text of BSD license.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 07 Nov 2010 18:03:13 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 07 Nov 2010 18:40:48 +0100
 
 orage (4.6.1-1) unstable; urgency=low
 

Modified: desktop/branches/experimental/orage/debian/copyright
===================================================================
--- desktop/branches/experimental/orage/debian/copyright	2010-11-07 17:35:43 UTC (rev 4549)
+++ desktop/branches/experimental/orage/debian/copyright	2010-11-07 17:41:06 UTC (rev 4550)
@@ -41,9 +41,34 @@
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
 The complete text of the GNU Library General Public License can be found
-in `/usr/share/common-licenses/LGPL', and for the BSD license in
-`/usr/share/common-licenses/BSD'. 
+in `/usr/share/common-licenses/LGPL'
 
+The text of the BSD license follows:
+
+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. 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.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+
 The text of Mozilla Public License follows:
 
                           MOZILLA PUBLIC LICENSE