[SCM] FreeFem++ packaging branch, master, updated. debian/3.11-1-12-g59c9362
Dimitrios Eftaxiopoulos
eftaxi12 at otenet.gr
Tue Jan 18 22:44:20 UTC 2011
The following commit has been merged in the master branch:
commit 59c9362ca33351ce9737b60ddb9b10265d66279f
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date: Tue Jan 18 03:35:18 2011 +0200
Changes in debian/rules
diff --git a/debian/rules b/debian/rules
index 55bc9df..72c85a0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,57 +37,98 @@ clean:
build:
dh_testdir
- ./configure CFLAGS=-lm CNOFLAGS=-lm --prefix=/usr --without-cadna \
- --disable-download
+ dh_auto_configure -- CFLAGS=-lm CNOFLAGS=-lm --without-cadna
make -j4 --ignore-errors
# dh_auto_test
binary-indep:
+ dh_testroot -i
+ dh_prep -i
+ dh_installdirs -i
+ dh_auto_install -i
+ dh_install -i
+ dh_installdocs -i
+ dh_installchangelogs -i
+ dh_installexamples -i
+ dh_installman -i
+ dh_installcatalogs -i
+ dh_installcron -i
+ dh_installdebconf -i
+ dh_installemacsen -i
+ dh_installifupdown -i
+ dh_installinfo -i
+# dh_pysupport -i
+ dh_installinit -i
+ dh_installmenu -i
+ dh_installmime -i
+ dh_installmodules -i
+ dh_installlogcheck -i
+ dh_installlogrotate -i
+ dh_installpam -i
+ dh_installppp -i
+ dh_installudev -i
+ dh_installwm -i
+ dh_installxfonts -i
+ dh_bugfiles -i
+ dh_lintian -i
+ dh_gconf -i
+ dh_icons -i
+ dh_perl -i
+ dh_usrlocal -i
+ dh_link -i
+ dh_compress -i
+ dh_fixperms -i
+# dh_strip -i
+# dh_makeshlibs -i
+# dh_shlibdeps -i
+ dh_installdeb -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
binary-arch:
- dh_testroot
- dh_prep
- dh_installdirs
- dh_auto_install
-# rm -f debian/tmp/usr/bin/ff-pkg-download
- dh_install
- dh_installdocs
- dh_installchangelogs
- dh_installexamples
- dh_installman
- dh_installcatalogs
- dh_installcron
- dh_installdebconf
- dh_installemacsen
- dh_installifupdown
- dh_installinfo
-# dh_pysupport
- dh_installinit
- dh_installmenu
- dh_installmime
- dh_installmodules
- dh_installlogcheck
- dh_installlogrotate
- dh_installpam
- dh_installppp
- dh_installudev
- dh_installwm
- dh_installxfonts
- dh_bugfiles
- dh_lintian
- dh_gconf
- dh_icons
- dh_perl
- dh_usrlocal
- dh_link
- dh_compress
- dh_fixperms
- dh_strip
- dh_makeshlibs
- dh_shlibdeps
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+ dh_testroot -a
+ dh_prep -a
+ dh_installdirs -a
+ dh_auto_install -a
+ dh_install -a
+ dh_installdocs -a
+ dh_installchangelogs -a
+ dh_installexamples -a
+ dh_installman -a
+ dh_installcatalogs -a
+ dh_installcron -a
+ dh_installdebconf -a
+ dh_installemacsen -a
+ dh_installifupdown -a
+ dh_installinfo -a
+# dh_pysupport -a
+ dh_installinit -a
+ dh_installmenu -a
+ dh_installmime -a
+ dh_installmodules -a
+ dh_installlogcheck -a
+ dh_installlogrotate -a
+ dh_installpam -a
+ dh_installppp -a
+ dh_installudev -a
+ dh_installwm -a
+ dh_installxfonts -a
+ dh_bugfiles -a
+ dh_lintian -a
+ dh_gconf -a
+ dh_icons -a
+ dh_perl -a
+ dh_usrlocal -a
+ dh_link -a
+ dh_compress -a
+ dh_fixperms -a
+ dh_strip -a
+ dh_makeshlibs -a
+ dh_shlibdeps -a
+ dh_installdeb -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
binary: binary-arch binary-indep
\ No newline at end of file
diff --git a/download/tetgen/tetgen1.4.2.patch b/download/tetgen/tetgen1.4.2.patch
deleted file mode 100644
index a2dcf15..0000000
--- a/download/tetgen/tetgen1.4.2.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -ur tetgen1.4.2/tetgen.cxx tetgen1.4.2-okk/tetgen.cxx
---- tetgen1.4.2/tetgen.cxx 2007-04-16 16:45:11.000000000 +0200
-+++ tetgen1.4.2-okk/tetgen.cxx 2009-05-25 10:37:19.000000000 +0200
-@@ -3506,7 +3506,7 @@
- // //
- ///////////////////////////////////////////////////////////////////////////////
-
--void tetgenmesh::set_compfunc(char* str, int* itbytes, compfunc* pcomp)
-+void tetgenmesh::set_compfunc(const char* str, int* itbytes, compfunc* pcomp)
- {
- // First figure out whether it is a pointer or not.
- if (str[strlen(str) - 1] == '*') {
-@@ -25978,6 +25978,7 @@
- }
- delete [] oldtetlist;
- delete [] newtetlist;
-+ delete [] newpt; // Add by J. Morice for FreeFem++ (missing delete) Nov 2008
- // Clear work lists.
- newsegshlist->clear();
- spinshlist->clear();
-diff -ur tetgen1.4.2/tetgen.h tetgen1.4.2-okk/tetgen.h
---- tetgen1.4.2/tetgen.h 2007-04-16 16:45:13.000000000 +0200
-+++ tetgen1.4.2-okk/tetgen.h 2009-05-25 10:37:41.000000000 +0200
-@@ -980,7 +980,7 @@
-
- // The function used to determine the size of primitive data types and
- // set the corresponding predefined linear order functions for them.
-- static void set_compfunc(char* str, int* itembytes, compfunc* pcomp);
-+ static void set_compfunc(const char* str, int* itembytes, compfunc* pcomp);
-
- ///////////////////////////////////////////////////////////////////////////////
- // //
-@@ -1021,7 +1021,7 @@
- list(int itbytes, compfunc pcomp, int mitems = 256, int exsize = 128) {
- listinit(itbytes, pcomp, mitems, exsize);
- }
-- list(char* str, int mitems = 256, int exsize = 128) {
-+ list(const char* str, int mitems = 256, int exsize = 128) {
- set_compfunc(str, &itembytes, &comp);
- listinit(itembytes, comp, mitems, exsize);
- }
diff --git a/.pc/download-blacs-Makefile.patch/.timestamp b/examples++-load/WHERE_LIBRARY-download-new
similarity index 100%
copy from .pc/download-blacs-Makefile.patch/.timestamp
copy to examples++-load/WHERE_LIBRARY-download-new
diff --git a/examples++-load/makeref.edp b/examples++-load/makeref.edp
deleted file mode 100644
index a7fd99b..0000000
--- a/examples++-load/makeref.edp
+++ /dev/null
@@ -1,200 +0,0 @@
-// Regression tests
-// ----------------
-
-// $Id$
-
-// Regression tests
-// ----------------
-
-// The tests are checked against reference values by "make check" in
-// each examples subdirectory
-
-// "ref.edp" contains all reference values and may be rebuilt with
-// "make Ref"
-
-// $Id$
-
-// The values tested here may not have a physical or mathematical
-// meaning. Their main property is to gather numerical values from the
-// whole domain, to be checked for consistency with previous runs.
-
-NoUseOfWait=true;
-int verbosityy=verbosity;
-
-
-
-
-ofstream ref("ref.edp");
-
-
-
-
-
-// The values tested here may not have a physical or mathematical
-// meaning. Their main property is to gather numerical values from the
-// whole domain, to be checked for consistency with previous runs.
-cout << "--------- file : load.edp -----------------" << endl;
-verbosity=verbosityy;
-{
-
-
- include "load.edp";
- real TESTload=uh[].max;
- ref<<"real REFload="<<TESTload<<";"<<endl;
-};
-
-cout << "--------- file : testFE.edp -----------------" << endl;
-verbosity=verbosityy;
-{
-
-
- include "testFE.edp";
-
-};
-
-cout << "--------- file : testFEMorley.edp -----------------" << endl;
-verbosity=verbosityy;
-{
-
-
- include "testFEMorley.edp";
-
-};
-
-cout << "--------- file : funcTemplate.edp -----------------" << endl;
-verbosity=verbosityy;
-{
-
-
- include "funcTemplate.edp";
-
-};
-
-cout << "--------- file : LapDG3.edp -----------------" << endl;
-verbosity=verbosityy;
-{
-
-
- include "LapDG3.edp";
-
-};
-
-cout << "--------- file : LapDG4.edp -----------------" << endl;
-verbosity=verbosityy;
-{
-
-
- include "LapDG4.edp";
-
-};
-
-cout << "--------- file : LaplaceP3.edp -----------------" << endl;
-verbosity=verbosityy;
-{
-
-
- include "LaplaceP3.edp";
-
-};
-
-cout << "--------- file : LaplaceP4.edp -----------------" << endl;
-verbosity=verbosityy;
-{
-
-
- include "LaplaceP4.edp";
-
-};
-
-cout << "--------- file : bilapMorley.edp -----------------" << endl;
-verbosity=verbosityy;
-{
-
-
- include "bilapMorley.edp";
-
-};
-
-cout << "--------- file : plot-fb-P3.edp -----------------" << endl;
-verbosity=verbosityy;
-{
-
-
- include "plot-fb-P3.edp";
-
-};
-
-cout << "--------- file : plot-fb-P3dc.edp -----------------" << endl;
-verbosity=verbosityy;
-{
-
-
- include "plot-fb-P3dc.edp";
-
-};
-
-cout << "--------- file : plot-fb-P4.edp -----------------" << endl;
-verbosity=verbosityy;
-{
-
-
- include "plot-fb-P4.edp";
-
-};
-
-cout << "--------- file : plot-fb-P4dc.edp -----------------" << endl;
-verbosity=verbosityy;
-{
-
-
- include "plot-fb-P4dc.edp";
-
-};
-
-cout << "--------- file : splitmesh3.edp -----------------" << endl;
-verbosity=verbosityy;
-{
-
-
- include "splitmesh3.edp";
-
-};
-
-cout << "--------- file : splitmesh6.edp -----------------" << endl;
-verbosity=verbosityy;
-{
-
-
- include "splitmesh6.edp";
-
-};
-
-cout << "--------- file : testFE-PkEdge.edp -----------------" << endl;
-verbosity=verbosityy;
-{
-
-
- include "testFE-PkEdge.edp";
-
-};
-
-cout << "--------- file : testFE.edp -----------------" << endl;
-verbosity=verbosityy;
-{
-
-
- include "testFE.edp";
-
-};
-
-cout << "--------- file : testFEMorley.edp -----------------" << endl;
-verbosity=verbosityy;
-{
-
-
- include "testFEMorley.edp";
-
-};
-
-
-
diff --git a/examples++-load/regtests.edp b/examples++-load/regtests.edp
deleted file mode 100644
index b0095de..0000000
--- a/examples++-load/regtests.edp
+++ /dev/null
@@ -1,203 +0,0 @@
-// Regression tests
-// ----------------
-
-// $Id$
-
-// Regression tests
-// ----------------
-
-// The tests are checked against reference values by "make check" in
-// each examples subdirectory
-
-// "ref.edp" contains all reference values and may be rebuilt with
-// "make Ref"
-
-// $Id$
-
-// The values tested here may not have a physical or mathematical
-// meaning. Their main property is to gather numerical values from the
-// whole domain, to be checked for consistency with previous runs.
-
-NoUseOfWait=true;
-int verbosityy=verbosity;
-
-
-
-
-include "ref.edp";
-
-
-
-
-
-// The values tested here may not have a physical or mathematical
-// meaning. Their main property is to gather numerical values from the
-// whole domain, to be checked for consistency with previous runs.
-cout << "--------- file : load.edp -----------------" << endl;
-verbosity=verbosityy;
-{
-
-
- include "load.edp";
- real TESTload=uh[].max;
- cout<<"load reference value = "<<REFload
- <<" test value ="<<TESTload<<endl;
- assert(TESTload<REFload*(1+0.0001));
- assert(TESTload>REFload*(1-0.0001));
-};
-
-cout << "--------- file : testFE.edp -----------------" << endl;
-verbosity=verbosityy;
-{
-
-
- include "testFE.edp";
-
-};
-
-cout << "--------- file : testFEMorley.edp -----------------" << endl;
-verbosity=verbosityy;
-{
-
-
- include "testFEMorley.edp";
-
-};
-
-cout << "--------- file : funcTemplate.edp -----------------" << endl;
-verbosity=verbosityy;
-{
-
-
- include "funcTemplate.edp";
-
-};
-
-cout << "--------- file : LapDG3.edp -----------------" << endl;
-verbosity=verbosityy;
-{
-
-
- include "LapDG3.edp";
-
-};
-
-cout << "--------- file : LapDG4.edp -----------------" << endl;
-verbosity=verbosityy;
-{
-
-
- include "LapDG4.edp";
-
-};
-
-cout << "--------- file : LaplaceP3.edp -----------------" << endl;
-verbosity=verbosityy;
-{
-
-
- include "LaplaceP3.edp";
-
-};
-
-cout << "--------- file : LaplaceP4.edp -----------------" << endl;
-verbosity=verbosityy;
-{
-
-
- include "LaplaceP4.edp";
-
-};
-
-cout << "--------- file : bilapMorley.edp -----------------" << endl;
-verbosity=verbosityy;
-{
-
-
- include "bilapMorley.edp";
-
-};
-
-cout << "--------- file : plot-fb-P3.edp -----------------" << endl;
-verbosity=verbosityy;
-{
-
-
- include "plot-fb-P3.edp";
-
-};
-
-cout << "--------- file : plot-fb-P3dc.edp -----------------" << endl;
-verbosity=verbosityy;
-{
-
-
- include "plot-fb-P3dc.edp";
-
-};
-
-cout << "--------- file : plot-fb-P4.edp -----------------" << endl;
-verbosity=verbosityy;
-{
-
-
- include "plot-fb-P4.edp";
-
-};
-
-cout << "--------- file : plot-fb-P4dc.edp -----------------" << endl;
-verbosity=verbosityy;
-{
-
-
- include "plot-fb-P4dc.edp";
-
-};
-
-cout << "--------- file : splitmesh3.edp -----------------" << endl;
-verbosity=verbosityy;
-{
-
-
- include "splitmesh3.edp";
-
-};
-
-cout << "--------- file : splitmesh6.edp -----------------" << endl;
-verbosity=verbosityy;
-{
-
-
- include "splitmesh6.edp";
-
-};
-
-cout << "--------- file : testFE-PkEdge.edp -----------------" << endl;
-verbosity=verbosityy;
-{
-
-
- include "testFE-PkEdge.edp";
-
-};
-
-cout << "--------- file : testFE.edp -----------------" << endl;
-verbosity=verbosityy;
-{
-
-
- include "testFE.edp";
-
-};
-
-cout << "--------- file : testFEMorley.edp -----------------" << endl;
-verbosity=verbosityy;
-{
-
-
- include "testFEMorley.edp";
-
-};
-
-
-
--
FreeFem++ packaging
More information about the debian-science-commits
mailing list