[feel++] 40/122: update

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch master
in repository feel++.

commit 1b30b91107b8f655b4b7bd2b447acee64fd79838
Author: Christophe Prudhomme <prudhomm at debian.org>
Date:   Fri Dec 24 16:04:58 2010 +0000

    update
---
 debian/control                                   | 12 ++++++------
 debian/copyright                                 | 23 +++++++++++++++++++++--
 debian/{libfeel++.install => libfeel++1.install} |  0
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index e138058..4445f1b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: science
 Priority: extra
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Christophe Prud'homme <prudhomm at debian.org>
-Build-Depends: cdbs, quilt, debhelper (>= 7), cmake (>=2.6), g++-4.4, gfortran-4.4,
+Build-Depends: cdbs, debhelper (>= 7), cmake (>=2.6), g++-4.4, gfortran-4.4,
 	       libboost-all-dev,
 	       mpi-default-dev[!hurd-i386], mpi-default-bin[!hurd-i386],
 	       libtrilinos-dev[!armel !mips !mipsel !s390 !hppa !hurd-i386 !sparc],
@@ -18,12 +18,12 @@ Build-Depends: cdbs, quilt, debhelper (>= 7), cmake (>=2.6), g++-4.4, gfortran-4
 	       libtbb-dev,
 	       libopenturns-dev, libann-dev, libglpk-dev, octave3.2-headers
 Standards-Version: 3.9.1
-Homepage: http://ljkforge.imag.fr/life
+Homepage: http://www.feelpp.org
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/feel++/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/feel++/trunk
 
 
-Package: libfeel++
+Package: libfeel++1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, gmsh, mpi-default-bin
@@ -64,7 +64,7 @@ Description: A library for the finite element method
 Package: libfeel++-dev
 Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libfeel++, libvtk5-dev, libeigen2-dev, mpi-default-dev,
+Depends: ${shlibs:Depends}, ${misc:Depends}, libfeel++1, libvtk5-dev, libeigen2-dev, mpi-default-dev,
          libtrilinos-dev, libpetsc3.1-dev (>= 3.1.dfsg-3), libslepc3.0.0-dev (>= 3.0.0-p7.dfsg-4), libgmm++-dev,
          libsuperlu3-dev, libsuitesparse-dev, libscotchmetis-dev,
 	 libeigen2-dev, libvtk5-dev, libxml2-dev, libtbb-dev
@@ -140,7 +140,7 @@ Description: A library for the finite element method
 Package: feel++-apps
 Section: science
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libfeel++, gmsh
+Depends: ${shlibs:Depends}, ${misc:Depends}, libfeel++1, gmsh
 Recommends: paraview
 Replaces: life-apps
 Description: A library for the finite element method
@@ -181,7 +181,7 @@ Package: feel++-doc
 Section: doc
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: feel++-doc
+Replaces: life-doc
 Description: A library for the finite element method
  This package provides the documentation for the Feel++ library : a user
  guide including a tutorial and the api documentation generated by
diff --git a/debian/copyright b/debian/copyright
index 6271a60..d5c2367 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -127,8 +127,27 @@ Files: contrib/gmm/include/gmm/gmm_dense_lu.h
 Copyright: 1997-2001, The Trustees of Indiana University
            1997-2008, Yves Renard
 License: BSD and LGPL-2.1+
- On Debian systems the full text of the Berkeley software distribution
- License can be found in the `/usr/share/common-licenses/BSD' file.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * 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.
+    * Neither the name of the University of California, Berkeley 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 TRUSTEES  OF  INDIANA UNIVERSITY  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 TRUSTEES
+ OF INDIANA UNIVERSITY AND 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.
  On Debian systems the full text of the GNU Lesser General Public
  License can be found in the `/usr/share/common-licenses/LGPL-2.1'
  file.
diff --git a/debian/libfeel++.install b/debian/libfeel++1.install
similarity index 100%
rename from debian/libfeel++.install
rename to debian/libfeel++1.install

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/feel++.git