[freefempp] 03/05: Clean up d/rules, d/source/options and .gitignore
Dimitrios Eftaxiopoulos
eftaxiop-guest at moszumanska.debian.org
Mon Jun 1 16:37:41 UTC 2015
This is an automated email from the git hooks/post-receive script.
eftaxiop-guest pushed a commit to branch master
in repository freefempp.
commit d4bfebc808b62e831517a4c48063ba56e8142aa3
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date: Mon Jun 1 18:32:55 2015 +0300
Clean up d/rules, d/source/options and .gitignore
---
.gitignore | 114 ++---------------------------
debian/control | 4 +-
debian/results.txt | 5 ++
debian/rules | 107 ++++++++++++++-------------
debian/source/options | 2 +-
examples++-3d/freefem++.pref | 2 +
examples++-chapt3/freefem++.pref | 2 +
examples++-eigen/freefem++.pref | 2 +
examples++-load/WHERE_LIBRARY | 0
examples++-load/WHERE_LIBRARY-config | 26 +++++++
examples++-load/WHERE_LIBRARY-download-new | 1 +
examples++-load/freefem++.pref | 1 +
examples++-tutorial/freefem++.pref | 2 +
examples++/freefem++.pref | 2 +
src/fflib/strversionnumber.cpp | 9 +--
15 files changed, 112 insertions(+), 167 deletions(-)
diff --git a/.gitignore b/.gitignore
index 898e935..abcfeca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,108 +1,8 @@
-._
-DOC/freefem++doc.pdf.orig
-DOC/freefem++doc.pdf
-DOC/Makefile.in.orig
-DOC/Makefile.in
-INSTALL
-Makefile.in.orig
-Makefile.in
-aclocal.m4
-compile
-config.h.in.orig
-config.h.in
-config.guess
-config.sub
-configure.orig
-configure
-debian/results.txt
-depcomp
+config-version.h
+config_LIB_INFO
+configure.param
download/Makefile
-download/Makefile.in
-download/Makefile.in.orig
-download/arpack/Makefile
-download/arpack/Makefile.in
-download/arpack/Makefile.orig
-download/arpack/Makefile.in.orig
-download/bin/
-download/blas/Makefile
-download/blas/Makefile.in
-download/blas/Makefile.in.orig
-download/fftw/Makefile
-download/gmm/cxxflags.orig
-download/nlopt/config.log
-download/pkg/
-download/umfpack/Makefile
-download/umfpack/Makefile.in
-download/umfpack/Makefile.in.orig
-examples++-3d/Makefile.in.orig
-examples++-3d/Makefile.in
-examples++-3d/all.edp
-examples++-3d/all.edp.orig
-examples++-bug/Makefile.in.orig
-examples++-chapt3/Makefile.in.orig
-examples++-eigen/Makefile.in
-examples++-eigen/Makefile.in.orig
-examples++-eigen/freefem++.pref
-examples++-bug/Makefile.in
-examples++-chapt3/Makefile.in
-examples++-chapt3/freefem++.pref
-examples++-eigen/Makefile.in
-examples++-eigen/modes.txt
-examples++-load/all.edp
-examples++-load/Makefile.in.orig
-examples++-load/Makefile.in
-examples++-load/makeref.edp
-examples++-load/Missing-plugins-so.log
-examples++-load/regtests.edp
-examples++-load/WHERE_LIBRARY
-examples++-load/WHERE_LIBRARY-download-new
-examples++-load/._APk-MetricPk.edp.orig
-examples++-mpi/Makefile.in.orig
-examples++-other/Makefile.in.orig
-examples++-tutorial/Makefile.in.orig
-examples++-tutorial/._array.edp.orig
-examples++-mpi/Makefile.in
-examples++-mpi/Missing-plugins-so.log
-examples++-other/Makefile.in
-examples++-tutorial/Makefile.in
-examples++/Makefile.in
-examples++/Makefile.in.orig
-examples++/freefem++.pref
-install-sh
-missing
-mkinstalldirs
-src/Algo/Makefile.in.orig
-src/Eigen/._eigenvalue.cpp.orig
-src/Graphics/Makefile.in.orig
-src/Makefile.in.orig
-src/bamg/Makefile.in.orig
-src/bamglib/Makefile.in.orig
-src/bin-win32/Makefile.in.orig
-src/femlib/Makefile.in.orig
-src/fflib/Makefile.in
-src/fflib/Makefile.in.orig
-src/fflib/strversionnumber.cpp
-src/fflib/strversionnumber.cpp.orig
-src/fflib/._environment.cpp.orig
-src/lglib/Makefile.in.orig
-src/lglib/lg.tab.cpp.orig
-src/lglib/lg.tab.hpp.orig
-src/libMesh/Makefile.in.orig
-src/medit/Makefile.in.orig
-src/mpi/Makefile.in.orig
-src/nw/Makefile.in.orig
-src/Algo/Makefile.in
-src/Graphics/Makefile.in
-src/Makefile.in
-src/bamg/Makefile.in
-src/bamglib/Makefile.in
-src/bamglib/._Mesh2.cpp.orig
-src/bin-win32/Makefile.in
-src/femlib/Makefile.in
-src/lglib/Makefile.in
-src/lglib/lg.tab.cpp
-src/lglib/lg.tab.hpp
-src/libMesh/Makefile.in
-src/medit/Makefile.in
-src/mpi/Makefile.in
-src/nw/Makefile.in
+examples++-load/config.log
+src/medit/compil.date
+src/mpi/config.log
+src/mpi/ff-mpirun
\ No newline at end of file
diff --git a/debian/control b/debian/control
index c72f723..8d35363 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: optional
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>,
Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
-Build-Depends: debhelper (>= 9~), dh-autoreconf, libsuperlu-dev,
- quilt, gawk, gfortran, rdfind, symlinks,
+Build-Depends: debhelper (>= 9~), autotools-dev, libsuperlu-dev,
+ gawk, gfortran, rdfind, symlinks, dh-autoreconf,
flex, bison, libxt-dev, libxext-dev, libxxf86vm-dev,
libxpm-dev, libmumps-scotch-dev, libmumps-ptscotch-dev,
libfltk1.3-dev | libfltk-dev, freeglut3-dev, ghostscript, imagemagick,
diff --git a/debian/results.txt b/debian/results.txt
new file mode 100644
index 0000000..e766c6b
--- /dev/null
+++ b/debian/results.txt
@@ -0,0 +1,5 @@
+# Automatically generated
+# duptype id depth size device inode priority name
+DUPTYPE_FIRST_OCCURRENCE 3 0 65786864 2053 7738704 1 debian/tmp/usr/bin/FreeFem++-nw
+DUPTYPE_WITHIN_SAME_TREE -3 0 65786864 2053 7738703 1 debian/tmp/usr/bin/FreeFem++
+# end of file
diff --git a/debian/rules b/debian/rules
index 68f3959..9b5f159 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,58 +10,64 @@
export DH_VERBOSE=1
export DH_OPTIONS=-v
-# export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
-# export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/*
+#DPKG_EXPORT_BUILDFLAGS = 1
+#include /usr/share/dpkg/default.mk
+# export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
+# export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
%:
- dh $@ --with autoreconf --parallel
+ dh $@ --parallel --with autotools-dev --with autoreconf
-export OMPI_MCA_plm_rsh_agent=/bin/false #workaround to start MPI-applications in chroot
-#
+#export OMPI_MCA_plm_rsh_agent=/bin/false #workaround to start
+#MPI-applications in chroot
+
# # to avoid lintian warnings
-# CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+#CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
# CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
# CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
-# LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+#LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
#
override_dh_auto_clean:
dh_auto_clean
- rm -f config.log
- rm -f config-version.h config_LIB_INFO configure.param
- rm -f download/fftw/cxxflags
- rm -f download/hips/config.log download/ipopt/config.log
- rm -f download/metis/config.log download/metis/Makefile.in
- rm -f download/mumps/config.log download/mumps-seq/config.log
- rm -f download/parmetis/config.log
- rm -f download/parms/config.log download/parms/Makefile.in
- rm -f download/pastix/config-complex.in download/pastix/config.log
- rm -f download/scalapack/config.log
- rm -f download/scotch/config.log
- rm -f download/superludist/config.log
- rm -f download/tetgen/cxxflags
- cd src && rm -f medit/compil.date mpi/config.log mpi/ff-mpirun \
- lglib/lg.output
- cd DOC && rm -f cpfigs/*.pdf addfe.aux freefem++doc.aux \
- freefem++doc.idx freefem++doc.ilg freefem++doc.ind \
- freefem++doc.log freefem++doc.out \
- freefem++doc.pdfsync freefem++doc.toc
- cd examples++-load && rm -f *.ps *.txt *.mesh glu2D.mesh.gmsh \
- pippo.data pippo.dx triQA.msh \
- freefem++.pref config.log \
- WHERE_LIBRARY-config ipopt.out
- cd examples++-tutorial && rm -f A.matrix *.ps *.txt g.mesh toto.Th \
- *.gmsh toto.am_fmt toto.dbg lestables \
- freefem++.pref Th*.msh emptymesh-2.msh \
- th.msh toto.msh
- rm -f examples++/toto.txt
- cd examples++-3d && rm -f A.txt B.txt Th.mesh Th3.mesh dd.bb dd.meshb \
- freefem++.pref
- cd examples++-chapt3 && rm -f J.txt Th.mesh Th.msh graph.txt *.ps
- cd examples++-mpi && rm -f beam-deformed-mumps.mesh *.ps \
- freefem++.pref *.so *.o
+# rm -f config.log
+# rm -f config-version.h config_LIB_INFO configure.param
+# rm -f download/fftw/cxxflags
+# rm -f download/hips/config.log download/ipopt/config.log
+# rm -f download/metis/config.log download/metis/Makefile.in
+# rm -f download/mumps/config.log download/mumps-seq/config.log
+# rm -f download/parmetis/config.log
+# rm -f download/parms/config.log download/parms/Makefile.in
+# rm -f download/pastix/config-complex.in download/pastix/config.log
+# rm -f download/scalapack/config.log
+# rm -f download/scotch/config.log
+# rm -f download/superludist/config.log
+# rm -f download/tetgen/cxxflags
+# cd src && rm -f medit/compil.date mpi/config.log mpi/ff-mpirun \
+# lglib/lg.output
+# cd DOC && rm -f cpfigs/*.pdf addfe.aux freefem++doc.aux \
+# freefem++doc.idx freefem++doc.ilg freefem++doc.ind \
+# freefem++doc.log freefem++doc.out \
+# freefem++doc.pdfsync freefem++doc.toc
+# cd examples++-load && rm -f *.ps *.txt *.mesh glu2D.mesh.gmsh \
+# pippo.data pippo.dx triQA.msh \
+# freefem++.pref config.log \
+# WHERE_LIBRARY-config ipopt.out
+# cd examples++-tutorial && rm -f A.matrix *.ps *.txt g.mesh toto.Th \
+# *.gmsh toto.am_fmt toto.dbg lestables \
+# freefem++.pref Th*.msh emptymesh-2.msh \
+# th.msh toto.msh
+# rm -f examples++/toto.txt
+# cd examples++-3d && rm -f A.txt B.txt Th.mesh Th3.mesh dd.bb dd.meshb \
+# freefem++.pref
+# cd examples++-chapt3 && rm -f J.txt Th.mesh Th.msh graph.txt *.ps
+ rm -rf examples++-mpi/*.so
+# && rm -f beam-deformed-mumps.mesh *.ps \
+# freefem++.pref *.so *.o
# #
# # To rebuild
@@ -69,17 +75,18 @@ export OMPI_MCA_plm_rsh_agent=/bin/false #workaround to start MPI
# find . -name \*.so | xargs --no-run-if-empty rm
#
-override_dh_autoreconf_clean:
- dh_autoreconf_clean
- dh_quilt_unpatch
-
-override_dh_autoreconf:
- dh_quilt_patch
- dh_autoreconf --as-needed
+# override_dh_autoreconf_clean:
+# dh_autoreconf_clean
+# dh_quilt_unpatch
+#
+# override_dh_autoreconf:
+# dh_quilt_patch
+# dh_autoreconf --as-needed
override_dh_auto_configure:
- dh_auto_configure -- CC="gcc $(LDFLAGS)" CXX="g++ $(LDFLAGS)" \
- MPICXX="mpic++ $(LDFLAGS)"
+ dh_auto_configure -- CC="gcc $(LDFLAGS)" \
+ CXX="g++ $(LDFLAGS)" \
+ MPICXX="mpic++ $(LDFLAGS)"
# CPPFLAGS=$(CPPFLAGS) \
# CFLAGS="$(CFLAGS) -lm" \
# CXXFLAGS="$(CXXFLAGS)" \
diff --git a/debian/source/options b/debian/source/options
index 38a8aee..348079a 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1 +1 @@
- extend-diff-ignore = "(^|/)(examples\+\+-load/all\.edp|examples\+\+-3d/all\.edp|DOC/freefem\+\+doc\.pdf|download/gmm/cxxflags|src/fflib/strversionnumber\.cpp|download/nlopt/config\.log|examples\+\+-eigen/freefem\+\+\.pref|examples\+\+-load/Missing-plugins-so\.log|examples\+\+-load/WHERE_LIBRARY-download-new|examples\+\+/freefem\+\+\.pref|configure\.ac|examples\+\+-chapt3/freefem\+\+\.pref|examples\+\+-mpi/Missing-plugins-so\.log|download/pkg/MUMPS_4\.10\.0\.tar\.gz|download/fftw/Makefil [...]
\ No newline at end of file
+ extend-diff-ignore = "(^|/)(download/Makefile|download/arpack/Makefile|download/bin|download/blas/Makefile|download/fftw/Makefile|download/umfpack/Makefile|examples\+\+-3d/all\.edp|examples\+\+-chapt3/freefem\+\+\.pref|examples\+\+-eigen/freefem\+\+\.pref|examples\+\+-load/WHERE_LIBRARY-download-new|examples\+\+/freefem\+\+\.pref|src/fflib/strversionnumber\.cpp|config-version\.h|config_LIB_INFO|configure.param|examples\+\+-3d/freefem\+\+\.pref|examples\+\+-load/WHERE_LIBRARY-config|exam [...]
\ No newline at end of file
diff --git a/examples++-3d/freefem++.pref b/examples++-3d/freefem++.pref
new file mode 100644
index 0000000..b77734b
--- /dev/null
+++ b/examples++-3d/freefem++.pref
@@ -0,0 +1,2 @@
+loadpath = "../examples++-load/"
+loadpath += "./"
diff --git a/examples++-chapt3/freefem++.pref b/examples++-chapt3/freefem++.pref
new file mode 100644
index 0000000..b77734b
--- /dev/null
+++ b/examples++-chapt3/freefem++.pref
@@ -0,0 +1,2 @@
+loadpath = "../examples++-load/"
+loadpath += "./"
diff --git a/examples++-eigen/freefem++.pref b/examples++-eigen/freefem++.pref
new file mode 100644
index 0000000..b77734b
--- /dev/null
+++ b/examples++-eigen/freefem++.pref
@@ -0,0 +1,2 @@
+loadpath = "../examples++-load/"
+loadpath += "./"
diff --git a/examples++-load/WHERE_LIBRARY b/examples++-load/WHERE_LIBRARY
new file mode 100644
index 0000000..e69de29
diff --git a/examples++-load/WHERE_LIBRARY-config b/examples++-load/WHERE_LIBRARY-config
new file mode 100644
index 0000000..9788521
--- /dev/null
+++ b/examples++-load/WHERE_LIBRARY-config
@@ -0,0 +1,26 @@
+# Build with freefem++ with ./configure Mon Jun 1 15:51:49 EEST 2015
+f77 LD /usr/lib/gcc/x86_64-linux-gnu/4.9/libgfortran.so
+f77 INCLUDE -DAdd_
+fc LD /usr/lib/gcc/x86_64-linux-gnu/4.9/libgfortran.so
+fc INCLUDE -DAdd_
+pthread LD -lpthread
+cxx11 LD -std=c++11
+cxx11 INCLUDE -std=c++11
+mpi LD -Wl,-z,relro -Wl,--as-needed
+fftw3 LD -lfftw3
+blas LD -lblas
+arpack LD -larpack -llapack
+arpack LD '-larpack -llapack'
+lapack LD -llapack
+amd LD -lumfpack -lamd -lcholmod -lcolamd
+amd INCLUDE -I/usr/include/suitesparse
+umfpack LD -lumfpack -lamd -lcholmod -lcolamd
+umfpack INCLUDE -I/usr/include/suitesparse
+gsl LD -L/usr/lib -lgsl -lgslcblas -lm
+gsl INCLUDE -I/usr/include
+mumps LD -ldmumps -lzmumps -lmumps_common -lpord
+mumps_ptscotch LD -lpord_ptscotch -lmumps_common_ptscotch -ldmumps_ptscotch -lzmumps_ptscotch -lpord_ptscotch
+mumps_scotch LD -lpord_scotch -lmumps_common_scotch -ldmumps_scotch -lzmumps_scotch -lpord_scotch
+hypre LD -lHYPRE
+hdf5 LD -L/usr/lib/x86_64-linux-gnu/hdf5/serial -lm -ldl -lz -lpthread -lhdf5 -lhdf5_hl
+hdf5 INCLUDE -I/usr/include/hdf5/serial -I/usr/include
diff --git a/examples++-load/WHERE_LIBRARY-download-new b/examples++-load/WHERE_LIBRARY-download-new
new file mode 100644
index 0000000..e2bf232
--- /dev/null
+++ b/examples++-load/WHERE_LIBRARY-download-new
@@ -0,0 +1 @@
+error not directory /usr/lib/ff++/3.37-1/lib and /usr/lib/ff++/3.37-1/include /home/eftaxiop/Arxeia/Genika/Logismiko/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++
diff --git a/examples++-load/freefem++.pref b/examples++-load/freefem++.pref
new file mode 100644
index 0000000..1a4a2f3
--- /dev/null
+++ b/examples++-load/freefem++.pref
@@ -0,0 +1 @@
+loadpath = "./"
diff --git a/examples++-tutorial/freefem++.pref b/examples++-tutorial/freefem++.pref
new file mode 100644
index 0000000..b77734b
--- /dev/null
+++ b/examples++-tutorial/freefem++.pref
@@ -0,0 +1,2 @@
+loadpath = "../examples++-load/"
+loadpath += "./"
diff --git a/examples++/freefem++.pref b/examples++/freefem++.pref
new file mode 100644
index 0000000..b77734b
--- /dev/null
+++ b/examples++/freefem++.pref
@@ -0,0 +1,2 @@
+loadpath = "../examples++-load/"
+loadpath += "./"
diff --git a/src/fflib/strversionnumber.cpp b/src/fflib/strversionnumber.cpp
index 0b39b4a..feb09ca 100644
--- a/src/fflib/strversionnumber.cpp
+++ b/src/fflib/strversionnumber.cpp
@@ -18,11 +18,6 @@ string StrVersionNumber(){
// buffer.precision(8);
// buffer<<VersionNumber();
static char buffer[100];
-<<<<<<< HEAD
- sprintf(buffer," %9f (date Κυρ 17 Μάι 2015 11:51:20 πμ EEST)",VersionNumber());
- return buffer; //.str()+" (date Κυρ 17 Μάι 2015 11:51:20 πμ EEST)" ;
-=======
- sprintf(buffer," %9f (date Ven 22 mai 2015 13:48:50 CEST)",VersionNumber());
- return buffer; //.str()+" (date Ven 22 mai 2015 13:48:50 CEST)" ;
->>>>>>> upstream/3.37.1
+ sprintf(buffer," %9f (date Δευ 01 Ιούν 2015 03:51:59 μμ EEST)",VersionNumber());
+ return buffer; //.str()+" (date Δευ 01 Ιούν 2015 03:51:59 μμ EEST)" ;
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/freefempp.git
More information about the debian-science-commits
mailing list