[SCM] Packaging for cctbx branch, master, updated. upstream/2012.05.08.2305-59-g0793937

[Radostan Riedel]

The following commit has been merged in the master branch:
commit 0793937d1457de1cff8a9f9804b4b886607ca1ed
Author: Radostan Riedel <raybuntu at googlemail.com>
Date:   Tue Jul 31 19:26:40 2012 +0200

    Typo in control and some work on copyright.

diff --git a/debian/control b/debian/control
index 4ad7d5c..2baacc5 100644
--- a/debian/control
+++ b/debian/control
@@ -130,7 +130,7 @@ Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends}
 Description: OpenMP interface for CCTBX.
- This library provides and interface to OpenMP for CCTBX.
+ This library provides an interface to OpenMP for CCTBX.
  .
  This package contains the shared library
 
diff --git a/debian/copyright b/debian/copyright
index 60a70ad..e8591cb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -77,6 +77,20 @@ License: LGPL-3
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser Public License for more details.
 
+Files: cctbx_sources/gui_resources/icons/crystal_project/*
+Author: Everaldo Coelho <contact at everaldo.com>
+Copyright: Copyright © Everaldo Coelho <contact at everaldo.com>
+License: LGPL-2
+
+Files: cctbx_sources/gui_resources/icons/custom/*
+Author: Luc J. Bourhis <cctbx at cci.lbl.gov>
+        Nathaniel Echols <cctbx at cci.lbl.gov>        
+        Ralf W. Grosse-Kunstleve <cctbx at cci.lbl.gov>
+Copyright: Copyright 2006, The Regents of the University of
+ California, through Lawrence Berkeley National Laboratory (subject to
+ receipt of any required approvals from the U.S. Dept. of Energy).
+License: LGPL-2
+
 Files: cctbx_sources/spotfinder/*
 Author: Luc J. Bourhis <cctbx at cci.lbl.gov>
         Nathaniel Echols <cctbx at cci.lbl.gov>        
@@ -215,6 +229,19 @@ License: ZPL-2.1
  OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
+License: LGPL-2
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser Public License as published by the
+ Free Software Foundation; either version 2 of the License, or (at your
+ option) any later version.
+ On Debian systems, the complete text of the LGPL-2 License
+ can be found in /usr/share/common-licenses/LGPL-2.
+ 
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser Public License for more details.
+
 License:PSF-2
  PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
  --------------------------------------------

-- 
Packaging for cctbx