[SCM] FreeFem++ packaging branch, master, updated. debian/3.12-1-8-g41e37c6

Sun Feb 20 19:14:57 UTC 2011

The following commit has been merged in the master branch:
commit c7bab4f28d192df9a059824623ae9b3458b9b054
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Sun Feb 20 18:30:49 2011 +0200

    Changelog, copyright and .install files changes

diff --git a/debian/changelog b/debian/changelog
index a584131..335a2e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,13 @@
-freefem++ (3.11-1) experimental; urgency=low
+freefem++ (3.12-1) unstable; urgency=low
 
   * Initial release (Closes: #500755)
 
+ -- Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>  Sun, 20 Feb 2011 16:21:00 +0200
+
+freefem++ (3.11-1) unreleased; urgency=low
+
+  * A successful build
+
  -- Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>  Fri, 24 Dec 2010 17:50:44 +0200
 
 freefem++ (3.9-2-1.1) unstable; urgency=low
diff --git a/debian/changelog b/debian/changelog~
similarity index 100%
copy from debian/changelog
copy to debian/changelog~
diff --git a/debian/copyright b/debian/copyright
index 2263bc5..f8fa745 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,52 +13,54 @@ Upstream Author(s):
      Antoine Le Hyaric <lehyaric at ann.jussieu.fr> 
      Albert Ly <ly at ann.jussieu.fr>
 
+Files: *
+
 Copyright:
 
-    Copyright (C) 2010 Frederic Hecht
+    (C) 2010 Frederic Hecht, Olivier Pironneau, Antoine Le Hyaric    
 
 License:
 
     usr/share/common-licenses/LGPL-2.1
 
- All its programs may be redistributed under the terms of the
+ All programs may be redistributed under the terms of the
  GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999.
 
-    Except files :
-    Coming from COOOL sofware (all files in directory src/Algo,
-    mailto:coool at coool.mines.edu),  no license.
-    and the file mt19937ar.cpp ( mailto:m-mat at math.sci.hiroshima-u.ac.jp )
-    with they own like license.
+    Excepted are the following files which have their own licences:
 
-The Debian packaging is:
 
-    Copyright (C) 2010 Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr
-and is licensed under the GPL version 3,
-see "/usr/share/common-licenses/GPL-3".
+    src/Algo
 
-
-    src/Algo: extracted from the COOOL software by the FreeFem++ authors
+    COOOL is a package of tools for writing optimization code and solving optimization problems. Our special interest is in solving inverse problems, but the library should be useful for many different kinds of problems.
+taken from the COOOL software by the FreeFem++ authors
 	      (http://coool.mines.edu/)
 
- The COOOL library is a free software. You can do anything you want
- with it including make a fortune.  However, neither the authors,
- the Center for Wave Phenomena, nor anyone else you can think of
- makes any guarantees about anything in this package or any aspect
- of its functionality.
+Licence:
 
- Since you've got the source code you can also modify the
- library to suit your own purposes. We would appreciate it 
- if the headers that identify the authors are kept in the 
- source code.
+    Copyright (C) 2003, Lydia Deng, Wences Gouveia
 
-    src/fflib/mt19937ar.cpp 
- 
-    A C-program for MT19937, with initialization improved 2002/1/26.
-    Coded by Takuji Nishimura and Makoto Matsumoto.
+    The COOOL library is a free software. You can do anything you want
+    with it including make a fortune.  However, neither the authors,
+    the Center for Wave Phenomena, nor anyone else you can think of
+    makes any guarantees about anything in this package or any aspect
+    of its functionality.
+
+    Since you've got the source code you can also modify the
+    library to suit your own purposes. We would appreciate it 
+    if the headers that identify the authors are kept in the 
+    source code.
 
-   Before using, initialize the state by using init_genrand(seed)
-   or init_by_array(init_key, key_length).
 
+    src/fflib/mt19937ar.cpp
+
+    A C-program for MT19937, with initialization improved 2002/1/26.
+    Coded by Takuji Nishimura and Makoto Matsumoto 
+    (mailto:m-mat at math.sci.hiroshima-u.ac.jp).
+    Before using, initialize the state by using init_genrand(seed)
+    or init_by_array(init_key, key_length). 
+
+Licence:
+ 
    Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
    All rights reserved.
 
@@ -90,3 +92,10 @@ see "/usr/share/common-licenses/GPL-3".
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+The Debian packaging is:
+
+    Copyright (C) 2010 Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr
+                  2009-2010 Cristophe Trophime <christophe.trophime at grenoble.cnrs.fr>
+                  2006-2010 Christophe Prud'homme <prudhomm at debian.org> 
+and is licensed under the GPL version 3,
+see "/usr/share/common-licenses/GPL-3".
diff --git a/debian/copyright b/debian/copyright~
similarity index 100%
copy from debian/copyright
copy to debian/copyright~
diff --git a/debian/freefem++-doc.install b/debian/freefem++-doc.install
index bb5b69f..62c0d23 100644
--- a/debian/freefem++-doc.install
+++ b/debian/freefem++-doc.install
@@ -1,4 +1,4 @@
 debian/tmp/usr/share/freefem++/freefem++doc.pdf usr/share/doc/freefem++-doc/
-debian/tmp/usr/share/freefem++/3.11/examples* usr/share/doc/freefem++/examples/
+debian/tmp/usr/share/freefem++/3.12/examples* usr/share/doc/freefem++/examples/
 examples-bamg usr/share/doc/freefem++/examples/
 debian/folder/freefem++-doc /usr/share/doc-base/
\ No newline at end of file
diff --git a/debian/freefem++-doc.install b/debian/freefem++-doc.install~
similarity index 100%
copy from debian/freefem++-doc.install
copy to debian/freefem++-doc.install~
diff --git a/debian/libfreefem++-dev.install b/debian/libfreefem++-dev.install
index 6eaee39..f9b2e84 100644
--- a/debian/libfreefem++-dev.install
+++ b/debian/libfreefem++-dev.install
@@ -1 +1 @@
-debian/tmp/usr/lib/ff++/3.11/include/* /usr/include/freefem++/
\ No newline at end of file
+debian/tmp/usr/lib/ff++/3.12/include/* /usr/include/freefem++/
\ No newline at end of file
diff --git a/debian/libfreefem++-dev.install b/debian/libfreefem++-dev.install~
similarity index 100%
copy from debian/libfreefem++-dev.install
copy to debian/libfreefem++-dev.install~
diff --git a/debian/libfreefem++.install b/debian/libfreefem++.install
index 4ff7083..e4fc25a 100644
--- a/debian/libfreefem++.install
+++ b/debian/libfreefem++.install
@@ -1 +1 @@
-debian/tmp/usr/lib/ff++/3.11/lib/* /usr/lib/freefem++/
\ No newline at end of file
+debian/tmp/usr/lib/ff++/3.12/lib/* /usr/lib/freefem++/
\ No newline at end of file
diff --git a/debian/libfreefem++.install b/debian/libfreefem++.install~
similarity index 100%
copy from debian/libfreefem++.install
copy to debian/libfreefem++.install~

-- 
FreeFem++ packaging

