rev 18456 - trunk/packages/koffice/debian

[Ana Beatriz Guerrero López]

Author: ana
Date: 2010-07-11 19:42:30 +0000 (Sun, 11 Jul 2010)
New Revision: 18456

Modified:
   trunk/packages/koffice/debian/changelog
   trunk/packages/koffice/debian/control
   trunk/packages/koffice/debian/copyright
Log:
koffice 2.1.1 ready to upload


Modified: trunk/packages/koffice/debian/changelog
===================================================================
--- trunk/packages/koffice/debian/changelog	2010-07-11 18:56:28 UTC (rev 18455)
+++ trunk/packages/koffice/debian/changelog	2010-07-11 19:42:30 UTC (rev 18456)
@@ -21,8 +21,10 @@
     - Add libsqlite3-dev, libpq-dev, libpqxx3-dev, libxbase2.0-dev for kexi.
     - Add libgif-dev, libopenjpeg-dev and libfftw3-dev.
   * Update installed files and lintian overrides.
-  * Update to Standards-Version 3.8.4, no changes required.
+  * Update to Standards-Version 3.9.0, no changes required.
   * Remove README.Debian, koffice 2 is not so unstable anymore.
+  * Update debian/copyright, years and remove reference to BSD license, include
+    BSD license instead.
   * Bump pkg-kde-tools build dependency to (>= 0.9) for HTML_INSTALL_DIR, move
     documentation from usr/share/doc/kde4 references to usr/share/doc/kde.
 

Modified: trunk/packages/koffice/debian/control
===================================================================
--- trunk/packages/koffice/debian/control	2010-07-11 18:56:28 UTC (rev 18455)
+++ trunk/packages/koffice/debian/control	2010-07-11 19:42:30 UTC (rev 18456)
@@ -16,7 +16,7 @@
  libxslt1-dev, libqt4-opengl-dev (>= 4.5.0), 
  pstoedit, libgmm++-dev, libfftw3-dev,
  libsqlite3-dev, libpq-dev, libpqxx3-dev, libxbase2.0-dev
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Homepage: http://www.koffice.org/
 
 Package: koffice

Modified: trunk/packages/koffice/debian/copyright
===================================================================
--- trunk/packages/koffice/debian/copyright	2010-07-11 18:56:28 UTC (rev 18455)
+++ trunk/packages/koffice/debian/copyright	2010-07-11 19:42:30 UTC (rev 18456)
@@ -59,7 +59,7 @@
 
 Copyright: 
     Unless something else is mentioned, copyright is
-    © 1999-2008, The KOffice Team http://www.koffice.org
+    © 1999-2010, The KOffice Team http://www.koffice.org
     Check the header of every file for more detailed copyright information.
 
 
@@ -81,8 +81,30 @@
 
   Kivio basic flowcharting stencils:
 
-    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. 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.
+
   KOffice libraries:
 
     LGPL in the most part.
@@ -109,11 +131,10 @@
   above can be found in:
   `/usr/share/common-licenses/GPL' (GNU General Public License), 
   `/usr/share/common-licenses/LGPL' (GNU Lesser General Public License), 
-  `/usr/share/common-licenses/GFDL-1.2' (GNU Free Documentation License) 
-  `/usr/share/common-licenses/BSD' (BSD License).
+  `/usr/share/common-licenses/GFDL-1.2' (GNU Free Documentation License).
 
 
 
 
-The Debian packaging is © 2007-2009, Debian Qt/KDE Maintainers and
+The Debian packaging is © 2007-2010, Debian Qt/KDE Maintainers and
 is licensed under the GPL, see `/usr/share/common-licenses/GPL'.