[freefempp] 01/01: Install WHERE* files in /usr/lib/freefem++

[Dimitrios Eftaxiopoulos]

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

eftaxiop-guest pushed a commit to branch master
in repository freefempp.

commit 08984b620c3a6cccea695f51ba2031421ba0f6ec
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Thu Dec 26 11:03:25 2013 +0200

    Install WHERE* files in /usr/lib/freefem++
---
 .gitignore                      | 1 +
 debian/libfreefem++-dev.install | 1 -
 debian/libfreefem++.install     | 3 +--
 debian/patches/configure.patch  | 5 +++--
 debian/results.txt              | 4 ++--
 debian/rules                    | 1 -
 src/fflib/strversionnumber.cpp  | 4 ++--
 7 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5f6df97..6271a6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ config.guess
 config.sub
 configure.orig
 configure
+debian/results.txt
 depcomp
 download/Makefile.in
 download/Makefile.in.orig
diff --git a/debian/libfreefem++-dev.install b/debian/libfreefem++-dev.install
index b02eae9..f7c9b67 100644
--- a/debian/libfreefem++-dev.install
+++ b/debian/libfreefem++-dev.install
@@ -1,3 +1,2 @@
 debian/tmp/usr/lib/ff++/3.*/include/* usr/include/freefem++/
-debian/tmp/usr/lib/ff++/3.*/lib/*WHERE* usr/include/freefem++/
 debian/tmp/usr/lib/ff++/3.*/idp/* usr/include/freefem++/idp/
\ No newline at end of file
diff --git a/debian/libfreefem++.install b/debian/libfreefem++.install
index aec8a7a..a930d97 100644
--- a/debian/libfreefem++.install
+++ b/debian/libfreefem++.install
@@ -1,4 +1,3 @@
-debian/tmp/usr/lib/ff++/3.*/lib/*.so* usr/lib/freefem++/
-debian/tmp/usr/lib/ff++/3.*/lib/*.a usr/lib/freefem++/
+debian/tmp/usr/lib/ff++/3.*/lib/* usr/lib/freefem++/
 debian/tmp/usr/lib/ff++/3.*/etc/freefem++.pref etc/
 
diff --git a/debian/patches/configure.patch b/debian/patches/configure.patch
index 3026178..a708924 100644
--- a/debian/patches/configure.patch
+++ b/debian/patches/configure.patch
@@ -10,7 +10,7 @@ Fix compilation issues related to libraries and flags
  	    esac
  	fi
  	AC_MSG_RESULT($ff_WHERE)
-@@ -1744,9 +1744,9 @@
+@@ -1744,10 +1744,9 @@
  	[[Superlu4],[-lsuperlu4],[/usr/include/superlu4/superlu_enum_consts.h],[]],
          [[blacs],[ -lblacsCinit$ff_with_mpi	-lblacsF77init$ff_with_mpi	-lblacs$ff_with_mpi],[]],
          [[scalapack],[-lscalapack$ff_with_mpi],[]],
@@ -18,7 +18,8 @@ Fix compilation issues related to libraries and flags
 +        [[scotch],[-lscotch -lscotcherr],[/usr/include/scotch/scotch.h][]],
          [[ptscotch],[-lptscotch -lptscotcherr],[]],
 -	[[metis],[-lscotch -lmetis],[/usr/include/metis/metis.h],[]],
+-	[[metis],[-lscotch -lmetis],[metis.h],[]],
 +	[[metis],[-lscotch -lmetis],[/usr/include/metis.h],[]],
- 	[[metis],[-lscotch -lmetis],[metis.h],[]],
  	[[parmetis],[-lptscotch -lparmetis],[],[]],
  	[[freeyams],[-lfreeyams],[freeyamslib.h],[]],
+ 	[[mmg3d],[-lmmg3d],[libmmg3d.h],[]],
diff --git a/debian/results.txt b/debian/results.txt
index 27a78e5..f16ca06 100644
--- a/debian/results.txt
+++ b/debian/results.txt
@@ -1,5 +1,5 @@
 # Automatically generated
 # duptype id depth size device inode priority name
-DUPTYPE_FIRST_OCCURRENCE 1 0 57699578 2053 12845164 1 debian/tmp/usr/bin/FreeFem++
-DUPTYPE_WITHIN_SAME_TREE -1 0 57699578 2053 12845165 1 debian/tmp/usr/bin/FreeFem++-nw
+DUPTYPE_FIRST_OCCURRENCE 1 0 57699578 2053 12845166 1 debian/tmp/usr/bin/FreeFem++
+DUPTYPE_WITHIN_SAME_TREE -1 0 57699578 2053 12845167 1 debian/tmp/usr/bin/FreeFem++-nw
 # end of file
diff --git a/debian/rules b/debian/rules
index f0ad8f4..a759148 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,6 @@ export DH_OPTIONS=-v
 
 LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 
-
 %:
 	dh $@ --with autoreconf --parallel
 
diff --git a/src/fflib/strversionnumber.cpp b/src/fflib/strversionnumber.cpp
index a524a86..bb77be6 100644
--- a/src/fflib/strversionnumber.cpp
+++ b/src/fflib/strversionnumber.cpp
@@ -18,6 +18,6 @@ string StrVersionNumber(){
 //  buffer.precision(8);
 //  buffer<<VersionNumber();
   static char buffer[100];
-  sprintf(buffer," %9f (date Κυρ 22 Δεκ 2013 11:11:56 μμ EET)",VersionNumber());
-  return buffer; //.str()+" (date Κυρ 22 Δεκ 2013 11:11:56 μμ EET)" ;
+  sprintf(buffer," %9f (date Δευ 23 Δεκ 2013 10:41:06 πμ EET)",VersionNumber());
+  return buffer; //.str()+" (date Δευ 23 Δεκ 2013 10:41:06 πμ EET)" ;
 }

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