[freefempp] 06/07: Set installation dir of WHERE* scripts to /usr/include/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 44f37b8aecef64e200345e89e498f9454dd957f1
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Wed Dec 18 12:53:09 2013 +0200

    Set installation dir of WHERE* scripts to /usr/include/freefem++
---
 debian/libfreefem++-dev.install | 2 +-
 debian/libfreefem++.install     | 3 ++-
 debian/results.txt              | 4 ++--
 download/fftw/Makefile          | 5 ++---
 src/fflib/strversionnumber.cpp  | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/libfreefem++-dev.install b/debian/libfreefem++-dev.install
index 559ddb4..b02eae9 100644
--- a/debian/libfreefem++-dev.install
+++ b/debian/libfreefem++-dev.install
@@ -1,3 +1,3 @@
 debian/tmp/usr/lib/ff++/3.*/include/* usr/include/freefem++/
-examples++-load/WHERE_LIBRARY-config 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 a930d97..aec8a7a 100644
--- a/debian/libfreefem++.install
+++ b/debian/libfreefem++.install
@@ -1,3 +1,4 @@
-debian/tmp/usr/lib/ff++/3.*/lib/* usr/lib/freefem++/
+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.*/etc/freefem++.pref etc/
 
diff --git a/debian/results.txt b/debian/results.txt
index c5a6fbb..27a78e5 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 12845163 1 debian/tmp/usr/bin/FreeFem++
-DUPTYPE_WITHIN_SAME_TREE -1 0 57699578 2053 12845164 1 debian/tmp/usr/bin/FreeFem++-nw
+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
 # end of file
diff --git a/download/fftw/Makefile b/download/fftw/Makefile
index 46eae50..1d8af13 100644
--- a/download/fftw/Makefile
+++ b/download/fftw/Makefile
@@ -81,15 +81,14 @@ POST_UNINSTALL = :
 build_triplet = x86_64-pc-linux-gnu
 host_triplet = x86_64-pc-linux-gnu
 subdir = download/fftw
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acmacros.m4 \
 	$(top_srcdir)/acoptim.m4 $(top_srcdir)/acmpi.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
diff --git a/src/fflib/strversionnumber.cpp b/src/fflib/strversionnumber.cpp
index bd254b9..4793859 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 Τρι 17 Δεκ 2013 11:59:05 μμ EET)",VersionNumber());
-  return buffer; //.str()+" (date Τρι 17 Δεκ 2013 11:59:05 μμ EET)" ;
+  sprintf(buffer," %9f (date Τετ 18 Δεκ 2013 12:45:42 μμ EET)",VersionNumber());
+  return buffer; //.str()+" (date Τετ 18 Δεκ 2013 12:45:42 μμ EET)" ;
 }

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