[SCM] FreeFem++ packaging branch, master, updated. debian/3.12-1-8-g41e37c6
Dimitrios Eftaxiopoulos
eftaxi12 at otenet.gr
Sun Feb 20 19:15:00 UTC 2011
The following commit has been merged in the master branch:
commit cf390f27e517f4128e3bf941dc930daf606b7aaa
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date: Sun Feb 20 20:06:47 2011 +0200
An acceptable build
diff --git a/debian/patches/series b/.pc/applied-patches
similarity index 90%
copy from debian/patches/series
copy to .pc/applied-patches
index ad53857..b3414ee 100644
--- a/debian/patches/series
+++ b/.pc/applied-patches
@@ -7,3 +7,4 @@ download-hips-Makefile.patch
examples-load-WHERE-LIBRARY.patch
examples-load-ff-pkg-download.patch
examples-bamg-test-dotestpl.patch
+download-mumps-Makefile.patch
diff --git a/download/blacs/Makefile b/.pc/download-blacs-Makefile.patch/download/blacs/Makefile
similarity index 100%
copy from download/blacs/Makefile
copy to .pc/download-blacs-Makefile.patch/download/blacs/Makefile
diff --git a/download/hips/Makefile b/.pc/download-hips-Makefile.patch/download/hips/Makefile
similarity index 100%
copy from download/hips/Makefile
copy to .pc/download-hips-Makefile.patch/download/hips/Makefile
diff --git a/NEWS b/.pc/download-mumps-Makefile.patch/.timestamp
similarity index 100%
copy from NEWS
copy to .pc/download-mumps-Makefile.patch/.timestamp
diff --git a/download/mumps/Makefile b/.pc/download-mumps-Makefile.patch/download/mumps/Makefile
similarity index 100%
copy from download/mumps/Makefile
copy to .pc/download-mumps-Makefile.patch/download/mumps/Makefile
diff --git a/download/pastix/Makefile b/.pc/download-pastix-Makefile.patch/download/pastix/Makefile
similarity index 100%
copy from download/pastix/Makefile
copy to .pc/download-pastix-Makefile.patch/download/pastix/Makefile
diff --git a/download/superludist/Makefile b/.pc/download-superludist-Makefile.patch/download/superludist/Makefile
similarity index 100%
copy from download/superludist/Makefile
copy to .pc/download-superludist-Makefile.patch/download/superludist/Makefile
diff --git a/download/yams/Makefile b/.pc/download-yams-Makefile.patch/download/yams/Makefile
similarity index 100%
copy from download/yams/Makefile
copy to .pc/download-yams-Makefile.patch/download/yams/Makefile
diff --git a/examples-bamg/test/dotest.pl b/.pc/examples-bamg-test-dotestpl.patch/examples-bamg/test/dotest.pl
similarity index 100%
copy from examples-bamg/test/dotest.pl
copy to .pc/examples-bamg-test-dotestpl.patch/examples-bamg/test/dotest.pl
diff --git a/NEWS b/.pc/examples-load-WHERE-LIBRARY.patch/examples++-load/WHERE_LIBRARY
similarity index 100%
copy from NEWS
copy to .pc/examples-load-WHERE-LIBRARY.patch/examples++-load/WHERE_LIBRARY
diff --git a/examples++-load/ff-pkg-download.in b/.pc/examples-load-ff-pkg-download.patch/examples++-load/ff-pkg-download.in
similarity index 100%
copy from examples++-load/ff-pkg-download.in
copy to .pc/examples-load-ff-pkg-download.patch/examples++-load/ff-pkg-download.in
diff --git a/src/medit/Makefile.am b/.pc/src-medit-Makefile.patch/src/medit/Makefile.am
similarity index 100%
copy from src/medit/Makefile.am
copy to .pc/src-medit-Makefile.patch/src/medit/Makefile.am
diff --git a/src/medit/Makefile.in b/.pc/src-medit-Makefile.patch/src/medit/Makefile.in
similarity index 100%
copy from src/medit/Makefile.in
copy to .pc/src-medit-Makefile.patch/src/medit/Makefile.in
diff --git a/DOC/freefem++doc.pdf b/DOC/freefem++doc.pdf
deleted file mode 100644
index 52de963..0000000
Binary files a/DOC/freefem++doc.pdf and /dev/null differ
diff --git a/debian/changelog~ b/debian/changelog~
deleted file mode 100644
index a584131..0000000
--- a/debian/changelog~
+++ /dev/null
@@ -1,145 +0,0 @@
-freefem++ (3.11-1) experimental; urgency=low
-
- * Initial release (Closes: #500755)
-
- -- Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr> Fri, 24 Dec 2010 17:50:44 +0200
-
-freefem++ (3.9-2-1.1) unstable; urgency=low
-
- * Non-maintainer upload
- * New upstream release
- * Add debian/source/format
-
- -- Christophe Trophime <christophe.trophime at grenoble.cnrs.fr> Mon, 06 Sep 2010 12:01:16 +0200
-
-freefem++ (3.9-1.1) unstable; urgency=low
-
- * Non-maintainer upload.
- * New upstream release
-
- -- Christophe Trophime <christophe.trophime at grenoble.cnrs.fr> Mon, 12 Jul 2010 16:03:00 +0200
-
-freefem++ (3.8-1.2) unstable; urgency=low
-
- ** Add texlive-latex-extra to control
- * Fix broken ghostscript
-
- -- Christophe Trophime <christophe.trophime at grenoble.cnrs.fr> Tue, 09 Mar 2010 16:36:55 +0100
-
-freefem++ (3.8-1.1) unstable; urgency=low
-
- * Non-maintainer upload.
- * New upstream release
- * Add source to examples++-load
- * Add missing man pages for ff-get-dep and ff-pkg-download
-
- -- Christophe Trophime <christophe.trophime at grenoble.cnrs.fr> Fri, 12 Feb 2010 08:58:27 +0100
-
-freefem++ (3.7.1-1) unstable; urgency=low
-
- [ Christophe Trophime ]
- * Non-maintainer uload
- * New upstream release
-
- [ Christophe Prud'homme ]
- * Upload
-
- -- Christophe Prud'homme <prudhomm at debian.org> Fri, 05 Feb 2010 10:04:57 +0100
-
-freefem++ (3.7-2.1) unstable; urgency=low
-
- * Fix missing examples in examples++-load
- * Fix direct loading gmsh mesh in examples++-load
-
- -- Christophe Trophime <christophe.trophime at grenoble.cnrs.fr> Fri, 8 Jan 2010 9:27:47 +0100
-
-freefem++ (3.7-1.1) unstable; urgency=low
-
- * Non-maintainer upload.
- * New upstream version
- * Fix missing examples in examples++-load
- * Fix direct loading gmsh mesh in examples++-load
-
- -- Christophe Trophime <christophe.trophime at grenoble.cnrs.fr> Sat, 12 Dec 2009 10:27:47 +0100
-
-freefem++ (3.6.1-2.1) unstable; urgency=low
-
- * Non-maintainer upload.
- * remove freefem++-cs
-
- -- Christophe Trophime <christophe.trophime at grenoble.cnrs.fr> Fri, 20 Nov 2009 09:49:13 +0100
-
-freefem++ (3.6.1-1.1) unstable; urgency=low
-
- * Non-maintainer upload.
- * New upstream version
- * debian/control:
- - Bump Standards-Version to 3.8.3.
- - Bump debhelper to version 7.
- - change automake and autoconf version
- * debian/patches:
- - remove all patches
- * debian/rules:
- - comment out DEB_AUTO_UPDATE*
-
- -- Christophe Trophime <christophe.trophime at grenoble.cnrs.fr> Fri, 20 Nov 2009 08:48:41 +0100
-
-freefem++ (2.24.2.dfsg-1) unstable; urgency=low
-
- [Christophe Prud'homme]
- * New upstream release (Closes: #500755)
- * debian/control: update Standard-Version to 3.8.0
- * debian/copyright: updated copyright information mainly LGPL plus some
- exceptions, arpack directory and support has been removed from
- Freefem++
- * lintian: fixed all lintian warnings
- * compilation: fixed some compilation issues with g++-4.3
-
- [Daniel Leidert]
- * debian/control: Vcs fields transition. Fixed Vcs-Svn.
- * debian/watch: Added.
- * debian/rules: Various fixes and simplification in build
- * debian/rules: Fixes for get-orig-source
- * Cleaned out the last arpack* bits in debian/
-
- -- Christophe Prud'homme <prudhomm at debian.org> Mon, 10 Nov 2008 09:08:56 +0100
-
-freefem++ (2.20-0cp1) unstable; urgency=low
-
- [ Christophe Prud'homme ]
- * New upstream release
-
- -- Christophe Prud'homme <prudhomm at debian.org> Fri, 19 Oct 2007 08:48:38 +0200
-
-freefem++ (2.16.1-1) unstable; urgency=low
-
- [ Christophe Prud'homme ]
- * New upstream release
- * Upstream has fixed all remaining licensing issues.
-
- [ Rafael Laboissiere ]
- * debian/control: Added XS-Vcs-Svn and XS-Vcs-Browser fields to the Source
- section
-
- -- Christophe Prud'homme <prudhomm at debian.org> Mon, 23 Apr 2007 17:09:16 +0200
-
-freefem++ (2.11-2-1) unstable; urgency=low
-
- * New upstream release
- * Upstream has fixed all licensing issues: upstream said that freefem++
- is LGPL but some(possibly all) files contained an old non-free license.
-
- -- Christophe Prud'homme <prudhomm at debian.org> Thu, 28 Dec 2006 20:19:48 +0100
-
-freefem++ (2.9-1) unstable; urgency=low
-
- * New upstream release
-
- -- Christophe Prud'homme <prudhomm at debian.org> Sat, 23 Sep 2006 21:45:34 +0200
-
-freefem++ (2.7-1) unstable; urgency=low
-
- * Initial Release
- * Added freefem++ to pkg-scicomp on Alioth
-
- -- Christophe Prud'homme <prudhomm at debian.org> Wed, 26 Apr 2006 11:36:10 +0200
diff --git a/debian/copyright~ b/debian/copyright~
deleted file mode 100644
index 2263bc5..0000000
--- a/debian/copyright~
+++ /dev/null
@@ -1,92 +0,0 @@
-This work was packaged for Debian by:
-
- Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr> on Fri, 24 Dec 2010 17:50:44 +0200
-
-It was downloaded from:
-
- http://www.freefem.org/ff++/ftp/
-
-Upstream Author(s):
-
- Frédéric Hecht <hecht at ann.jussieu.fr>
- Olivier Pironneau <pironneau at ann.jussieu.fr>
- Antoine Le Hyaric <lehyaric at ann.jussieu.fr>
- Albert Ly <ly at ann.jussieu.fr>
-
-Copyright:
-
- Copyright (C) 2010 Frederic Hecht
-
-License:
-
- usr/share/common-licenses/LGPL-2.1
-
- All its 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.
-
-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: extracted 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.
-
- 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.
-
- src/fflib/mt19937ar.cpp
-
- A C-program for MT19937, with initialization improved 2002/1/26.
- Coded by Takuji Nishimura and Makoto Matsumoto.
-
- Before using, initialize the state by using init_genrand(seed)
- or init_by_array(init_key, key_length).
-
- Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- 3. The names of its contributors may not be used to endorse or promote
- products derived from this software without specific prior written
- permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
diff --git a/debian/freefem++-doc.install~ b/debian/freefem++-doc.install~
deleted file mode 100644
index bb5b69f..0000000
--- a/debian/freefem++-doc.install~
+++ /dev/null
@@ -1,4 +0,0 @@
-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/
-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/libfreefem++-dev.install~ b/debian/libfreefem++-dev.install~
deleted file mode 100644
index 6eaee39..0000000
--- a/debian/libfreefem++-dev.install~
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/ff++/3.11/include/* /usr/include/freefem++/
\ No newline at end of file
diff --git a/debian/libfreefem++.install~ b/debian/libfreefem++.install~
deleted file mode 100644
index 4ff7083..0000000
--- a/debian/libfreefem++.install~
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/ff++/3.11/lib/* /usr/lib/freefem++/
\ No newline at end of file
diff --git a/debian/patches/download-mumps-Makefile.patch b/debian/patches/download-mumps-Makefile.patch
new file mode 100644
index 0000000..09b740b
--- /dev/null
+++ b/debian/patches/download-mumps-Makefile.patch
@@ -0,0 +1,21 @@
+Clean download/mumps directory fix
+--- a/download/mumps/Makefile
++++ b/download/mumps/Makefile
+@@ -49,12 +49,12 @@
+ touch $(SRCDIR)/tag-tar
+
+ clean-local:
+- -cd $(SRCDIR); make clean
++# -cd $(SRCDIR); make clean
+
+ clean: clean-local
+ rm Makefile.inc FAIRE
+- -rm -rf $(SRCDIR)/$(INSTALL)/include/*mumps*
+- -rm -rf $(SRCDIR)/$(INSTALL)/lib/lib*mumps* $(SRCDIR)/$(INSTALL)/lib/libpord*.a
+- -rm -rf $(SRCDIR)
++# -rm -rf $(SRCDIR)/$(INSTALL)/include/*mumps*
++# -rm -rf $(SRCDIR)/$(INSTALL)/lib/lib*mumps* $(SRCDIR)/$(INSTALL)/lib/libpord*.a
++# -rm -rf $(SRCDIR)
+
+ .PHONY:$(SRCDIR)/$(INSTALL)
+\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index ad53857..b3414ee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ download-hips-Makefile.patch
examples-load-WHERE-LIBRARY.patch
examples-load-ff-pkg-download.patch
examples-bamg-test-dotestpl.patch
+download-mumps-Makefile.patch
diff --git a/debian/patches/src-medit-Makefile.patch b/debian/patches/src-medit-Makefile.patch
index 78f4325..822929a 100644
--- a/debian/patches/src-medit-Makefile.patch
+++ b/debian/patches/src-medit-Makefile.patch
@@ -1,48 +1,58 @@
-Comment out pinking no opt part
+Fix medit not install patch
--- a/src/medit/Makefile.am
+++ b/src/medit/Makefile.am
-@@ -23,13 +23,13 @@
+@@ -23,15 +23,15 @@
compil.date: $(ffmedit_SOURCES)
echo "#define COMPIL " '"' `date` '(with ff++ $(VERSION))''"' > compil.date
#.PHONY: compil.date
--all-local: pinking.no-opt
+-all-local: pinking.no-opt$(MEDITPROG)
-
--pinking.no-opt:picking.c
+-pinking.no-optffmedit$(EXEEXT):picking.c
- rm picking.$(OBJEXT)
-- $(MAKE) picking.o ffmedit CFLAGS="$(CNOFLAGS)"
+- $(MAKE) picking.o $(MEDITPROG) CFLAGS="$(CNOFLAGS)"
+- touch pinking.no-optffmedit$(EXEEXT)
+-pinking.no-opt:picking.c
- touch pinking.no-opt
-clean-local:
-- -rm pinking.no-opt
-+# all-local: pinking.no-opt
+- -rm pinking.no-opt pinking.no-optffmedit$(EXEEXT)
++# all-local: pinking.no-opt$(MEDITPROG)
+#
-+# pinking.no-opt:picking.c
++# pinking.no-optffmedit$(EXEEXT):picking.c
+# rm picking.$(OBJEXT)
-+# $(MAKE) picking.o ffmedit CFLAGS="$(CNOFLAGS)"
++# $(MAKE) picking.o $(MEDITPROG) CFLAGS="$(CNOFLAGS)"
++# touch pinking.no-optffmedit$(EXEEXT)
++# pinking.no-opt:picking.c
+# touch pinking.no-opt
+# clean-local:
-+# -rm pinking.no-opt
++# -rm pinking.no-opt pinking.no-optffmedit$(EXEEXT)
--- a/src/medit/Makefile.in
+++ b/src/medit/Makefile.in
-@@ -658,14 +658,14 @@
- compil.date: $(ffmedit_SOURCES)
+@@ -659,17 +659,17 @@
echo "#define COMPIL " '"' `date` '(with ff++ $(VERSION))''"' > compil.date
#.PHONY: compil.date
--all-local: pinking.no-opt
+
+-all-local: pinking.no-opt$(MEDITPROG)
-
--pinking.no-opt:picking.c
+-pinking.no-optffmedit$(EXEEXT):picking.c
- rm picking.$(OBJEXT)
-- $(MAKE) picking.o ffmedit CFLAGS="$(CNOFLAGS)"
+- $(MAKE) picking.o $(MEDITPROG) CFLAGS="$(CNOFLAGS)"
+- touch pinking.no-optffmedit$(EXEEXT)
+-pinking.no-opt:picking.c
- touch pinking.no-opt
+-
-clean-local:
- -rm pinking.no-opt
-+# all-local: pinking.no-opt
++# all-local: pinking.no-opt$(MEDITPROG)
+#
-+# pinking.no-opt:picking.c
++# pinking.no-optffmedit$(EXEEXT):picking.c
+# rm picking.$(OBJEXT)
-+# $(MAKE) picking.o ffmedit CFLAGS="$(CNOFLAGS)"
++# $(MAKE) picking.o $(MEDITPROG) CFLAGS="$(CNOFLAGS)"
++# touch pinking.no-optffmedit$(EXEEXT)
++# pinking.no-opt:picking.c
+# touch pinking.no-opt
++#
+# clean-local:
+# -rm pinking.no-opt
diff --git a/debian/rules b/debian/rules
index 8247342..de15311 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,6 +20,7 @@ clean:
rm -f download/scotch/config.log download/superludist/config.log
rm -f download/blacs/config.log download/scalapack/config.log
rm -f download/hips/config.log download/metis/config.log
+ rm -f download/mumps/config.log
rm -f examples++-load/config.log src/mpi/config.log
rm -rf DOC/cpfigs
rm -f DOC/freefem++doc.pdf
diff --git a/download/blacs/Makefile b/download/blacs/Makefile
index 1a4a2b9..96d54af 100644
--- a/download/blacs/Makefile
+++ b/download/blacs/Makefile
@@ -72,11 +72,11 @@ $(PACKAGE3):
cd $(DIRPKG);$(WGET) $(SERVER)/`basename $(PACKAGE3)`
clean-local:
- -cd $(SRCDIR)/SRC/MPI; make clean
+# -cd $(SRCDIR)/SRC/MPI; make clean
clean: clean-local
- -rm Bmake.inc FAIRE
- -rm $(SRCDIR)/$(INSTALL)/lib/blacs/*.a
+# -rm Bmake.inc FAIRE
+# -rm $(SRCDIR)/$(INSTALL)/lib/blacs/*.a
-rm -rf $(SRCDIR)
.PHONY:$(SRCDIR)/$(INSTALL) compile install
\ No newline at end of file
diff --git a/download/hips/Makefile b/download/hips/Makefile
index 5b4c0b9..b89813d 100644
--- a/download/hips/Makefile
+++ b/download/hips/Makefile
@@ -194,14 +194,14 @@ $(PACKAGE):
cd $(DIRPKG);$(WGET) $(SERVER)/`basename $(PACKAGE)`
clean-local:
- -cd $(SRCDIR); $(MAKE) clean
+# -cd $(SRCDIR); $(MAKE) clean
clean: clean-local
rm makefile.inc
- -rm $(SRCDIR)/$(INSTALL)/WHERE/hips
- -rm $(SRCDIR)/$(INSTALL)/lib/hips/*
+# -rm $(SRCDIR)/$(INSTALL)/WHERE/hips
+# -rm $(SRCDIR)/$(INSTALL)/lib/hips/*
-rm -rf $(SRCDIR)/$(INSTALL)/lib/hips/
- -rm $(SRCDIR)/$(INSTALL)/include/hips/*
+# -rm $(SRCDIR)/$(INSTALL)/include/hips/*
-rm -rf $(SRCDIR)/$(INSTALL)/include/hips/
-rm -rf $(SRCDIR)
rm FAIT
diff --git a/download/mumps/Makefile b/download/mumps/Makefile
index 6634e8c..eb1214f 100644
--- a/download/mumps/Makefile
+++ b/download/mumps/Makefile
@@ -49,12 +49,12 @@ $(SRCDIR)/tag-tar:
touch $(SRCDIR)/tag-tar
clean-local:
- -cd $(SRCDIR); make clean
+# -cd $(SRCDIR); make clean
clean: clean-local
rm Makefile.inc FAIRE
- -rm -rf $(SRCDIR)/$(INSTALL)/include/*mumps*
- -rm -rf $(SRCDIR)/$(INSTALL)/lib/lib*mumps* $(SRCDIR)/$(INSTALL)/lib/libpord*.a
- -rm -rf $(SRCDIR)
+# -rm -rf $(SRCDIR)/$(INSTALL)/include/*mumps*
+# -rm -rf $(SRCDIR)/$(INSTALL)/lib/lib*mumps* $(SRCDIR)/$(INSTALL)/lib/libpord*.a
+# -rm -rf $(SRCDIR)
.PHONY:$(SRCDIR)/$(INSTALL)
\ No newline at end of file
diff --git a/download/pastix/Makefile b/download/pastix/Makefile
index c749f2f..cfa1741 100644
--- a/download/pastix/Makefile
+++ b/download/pastix/Makefile
@@ -128,11 +128,11 @@ $(PACKAGE1):
cd $(DIRPKG);$(WGET) $(SERVER)/`basename $(PACKAGE1)`
clean-local:
- -cd $(SRCDIR)/src/; $(MAKE) clean
+# -cd $(SRCDIR)/src/; $(MAKE) clean
clean: clean-local
- -rm config.in FAIRE
- -rm $(SRCDIR)/FAIT
+# -rm config.in FAIRE
+# -rm $(SRCDIR)/FAIT
-rm -rf $(SRCDIR)/$(INSTALL)/include/pastix/double
-rm -rf $(SRCDIR)/$(INSTALL)/lib/pastix/double
-rm -rf $(SRCDIR)/$(INSTALL)/include/pastix/complex
diff --git a/download/superludist/Makefile b/download/superludist/Makefile
index 5277bf7..ee5e2b1 100644
--- a/download/superludist/Makefile
+++ b/download/superludist/Makefile
@@ -61,12 +61,12 @@ $(PACKAGE_PATH):
cd $(DIRPKG);$(WGET) $(SERVER)$(PACKAGE)
clean-local:
- -cd $(SRCDIR); $(MAKE) clean
+# -cd $(SRCDIR); $(MAKE) clean
clean: clean-local
-rm -rf $(SRCDIR)
- -rm $(SRCDIR)/$(INSTALL)/include/superludist/*.h
- -rm -r $(SRCDIR)/$(INSTALL)/include/superludist/
- -rm -r $(SRCDIR)/$(INSTALL)/lib/libsuperlu_dist*.a
+# -rm $(SRCDIR)/$(INSTALL)/include/superludist/*.h
+# -rm -r $(SRCDIR)/$(INSTALL)/include/superludist/
+# -rm -r $(SRCDIR)/$(INSTALL)/lib/libsuperlu_dist*.a
-rm -r make.inc
- -rm -rf FAIT
+# -rm -rf FAIT
diff --git a/download/yams/Makefile b/download/yams/Makefile
index 770262f..46afb28 100644
--- a/download/yams/Makefile
+++ b/download/yams/Makefile
@@ -64,8 +64,8 @@ $(PACKAGE):
cd $(DIRPKG);$(WGET) $(SERVER)/`basename $(PACKAGE)`
clean-local:
- -rm FAIRE FAIT
- cd $(YAMS_DIR); make clean;
+# -rm FAIRE FAIT
+# cd $(YAMS_DIR); make clean;
-rm $(YAMS_OBJDIR)/libyams.a
clean: clean-local
diff --git a/examples++-load/WHERE_LIBRARY b/examples++-load/WHERE_LIBRARY
new file mode 100644
index 0000000..3103712
--- /dev/null
+++ b/examples++-load/WHERE_LIBRARY
@@ -0,0 +1 @@
+# File for storing stuff during build
diff --git a/examples++-load/ff-pkg-download.in b/examples++-load/ff-pkg-download.in
index 8692ffe..f25868f 100755
--- a/examples++-load/ff-pkg-download.in
+++ b/examples++-load/ff-pkg-download.in
@@ -1,3 +1,5 @@
+#!/bin/sh
+# /ff-pkg-download script creation
ff=$0;
bb=`basename $0`
DIR=`dirname $ff`
diff --git a/examples-bamg/test/dotest.pl b/examples-bamg/test/dotest.pl
index 3c307b0..115c0cb 100755
--- a/examples-bamg/test/dotest.pl
+++ b/examples-bamg/test/dotest.pl
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
# ----- clean ---
unlink <*.mesh>;
unlink <*.am_fmt>;
diff --git a/src/medit/Makefile.am b/src/medit/Makefile.am
index b49d804..9bec8c3 100644
--- a/src/medit/Makefile.am
+++ b/src/medit/Makefile.am
@@ -23,15 +23,15 @@ BUILT_SOURCES=compil.date
compil.date: $(ffmedit_SOURCES)
echo "#define COMPIL " '"' `date` '(with ff++ $(VERSION))''"' > compil.date
#.PHONY: compil.date
-all-local: pinking.no-opt$(MEDITPROG)
-
-pinking.no-optffmedit$(EXEEXT):picking.c
- rm picking.$(OBJEXT)
- $(MAKE) picking.o $(MEDITPROG) CFLAGS="$(CNOFLAGS)"
- touch pinking.no-optffmedit$(EXEEXT)
-pinking.no-opt:picking.c
- touch pinking.no-opt
-clean-local:
- -rm pinking.no-opt pinking.no-optffmedit$(EXEEXT)
+# all-local: pinking.no-opt$(MEDITPROG)
+#
+# pinking.no-optffmedit$(EXEEXT):picking.c
+# rm picking.$(OBJEXT)
+# $(MAKE) picking.o $(MEDITPROG) CFLAGS="$(CNOFLAGS)"
+# touch pinking.no-optffmedit$(EXEEXT)
+# pinking.no-opt:picking.c
+# touch pinking.no-opt
+# clean-local:
+# -rm pinking.no-opt pinking.no-optffmedit$(EXEEXT)
diff --git a/src/medit/Makefile.in b/src/medit/Makefile.in
index 3c30371..5efd251 100644
--- a/src/medit/Makefile.in
+++ b/src/medit/Makefile.in
@@ -659,17 +659,17 @@ compil.date: $(ffmedit_SOURCES)
echo "#define COMPIL " '"' `date` '(with ff++ $(VERSION))''"' > compil.date
#.PHONY: compil.date
-all-local: pinking.no-opt$(MEDITPROG)
-
-pinking.no-optffmedit$(EXEEXT):picking.c
- rm picking.$(OBJEXT)
- $(MAKE) picking.o $(MEDITPROG) CFLAGS="$(CNOFLAGS)"
- touch pinking.no-optffmedit$(EXEEXT)
-pinking.no-opt:picking.c
- touch pinking.no-opt
-
-clean-local:
- -rm pinking.no-opt
+# all-local: pinking.no-opt$(MEDITPROG)
+#
+# pinking.no-optffmedit$(EXEEXT):picking.c
+# rm picking.$(OBJEXT)
+# $(MAKE) picking.o $(MEDITPROG) CFLAGS="$(CNOFLAGS)"
+# touch pinking.no-optffmedit$(EXEEXT)
+# pinking.no-opt:picking.c
+# touch pinking.no-opt
+#
+# clean-local:
+# -rm pinking.no-opt
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
--
FreeFem++ packaging
More information about the debian-science-commits
mailing list