[SCM] FreeFem++ packaging branch, master, updated. debian/3.12-1-29-g1d1f6b0
Dimitrios Eftaxiopoulos
eftaxi12 at otenet.gr
Mon Apr 25 01:02:45 UTC 2011
The following commit has been merged in the master branch:
commit 1d1f6b08e9b8e3fb4b6515de2686a8e2708d7ed4
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date: Mon Apr 25 03:55:13 2011 +0300
Changes for the release of version 3.12.1
diff --git a/.pc/applied-patches b/.pc/applied-patches
new file mode 100644
index 0000000..7a70d70
--- /dev/null
+++ b/.pc/applied-patches
@@ -0,0 +1,3 @@
+examples-load-WHERE-LIBRARY.patch
+examples-bamg-test-dotestpl.patch
+debian-changes-3.12.1-1
diff --git a/NEWS b/.pc/debian-changes-3.12.1-1/.directory
similarity index 100%
copy from NEWS
copy to .pc/debian-changes-3.12.1-1/.directory
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/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/DOC/freefem++doc.pdf b/DOC/freefem++doc.pdf
deleted file mode 100644
index 0e6b8c1..0000000
Binary files a/DOC/freefem++doc.pdf and /dev/null differ
diff --git a/debian/.directory b/debian/.directory
new file mode 100644
index 0000000..81a6a70
--- /dev/null
+++ b/debian/.directory
@@ -0,0 +1,3 @@
+[Dolphin]
+Timestamp=2011,4,25,0,35,54
+Version=2
diff --git a/debian/changelog b/debian/changelog
index fbe0e1c..76cf259 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-freefem++ (3.12-1) unstable; urgency=low
+freefem++ (3.12.1-1) unstable; urgency=low
* Initial release (Closes: #500755).
- -- Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr> Fri, 1 Apr 2011 23:10:00 +0200
+ -- Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr> Sun, 24 Apr 2011 22:00:00 +0200
diff --git a/debian/control b/debian/control
index bdf112b..f6c83a5 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 7.2.3~), autotools-dev, gawk,
texlive-latex-extra, texlive-font-utils,
libmumps-dev, libblacs-mpi-dev, libscalapack-mpi-dev,
libscotch-dev, ghostscript, libptscotch-dev
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
Homepage: http://www.freefem.org/ff++/
Vcs-Git: git://git.debian.org/debian-science/packages/freefempp.git
Vcs-Browser: http://git.debian.org/?p=debian-science/packages/freefempp.git
diff --git a/debian/patches/.directory b/debian/patches/.directory
new file mode 100644
index 0000000..a80a938
--- /dev/null
+++ b/debian/patches/.directory
@@ -0,0 +1,3 @@
+[Dolphin]
+Timestamp=2011,4,25,0,37,0
+Version=2
diff --git a/debian/patches/download-blacs-Makefile.patch b/debian/patches/download-blacs-Makefile.patch
deleted file mode 100644
index aa3e9aa..0000000
--- a/debian/patches/download-blacs-Makefile.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Comment out removal of non-existent files and dirs in download/blacs dir
---- a/download/blacs/Makefile
-+++ b/download/blacs/Makefile
-@@ -72,11 +72,11 @@
- 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/debian/patches/download-hips-Makefile.patch b/debian/patches/download-hips-Makefile.patch
deleted file mode 100644
index c3ec3db..0000000
--- a/debian/patches/download-hips-Makefile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Comment out removal of non existent stuff in download/hips/Makefile
---- a/download/hips/Makefile
-+++ b/download/hips/Makefile
-@@ -194,14 +194,14 @@
- 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/debian/patches/download-mumps-Makefile.patch b/debian/patches/download-mumps-Makefile.patch
deleted file mode 100644
index 09b740b..0000000
--- a/debian/patches/download-mumps-Makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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/download-pastix-Makefile.patch b/debian/patches/download-pastix-Makefile.patch
deleted file mode 100644
index 7ef2a42..0000000
--- a/debian/patches/download-pastix-Makefile.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Comment out removal of non existent stuff in download/pastix/Makefile
---- a/download/pastix/Makefile
-+++ b/download/pastix/Makefile
-@@ -128,11 +128,11 @@
- 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/debian/patches/download-superludist-Makefile.patch b/debian/patches/download-superludist-Makefile.patch
deleted file mode 100644
index 11ac21e..0000000
--- a/debian/patches/download-superludist-Makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Comment out removal of non existent stuff in download/superludist/Makefile
---- a/download/superludist/Makefile
-+++ b/download/superludist/Makefile
-@@ -61,12 +61,12 @@
- 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/debian/patches/download-yams-Makefile.patch b/debian/patches/download-yams-Makefile.patch
deleted file mode 100644
index 65b7def..0000000
--- a/debian/patches/download-yams-Makefile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Comment out yeams clean process that runs indefinitely
---- a/download/yams/Makefile
-+++ b/download/yams/Makefile
-@@ -64,8 +64,8 @@
- 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/debian/patches/examples++-load-Makefile.patch b/debian/patches/examples++-load-Makefile.patch
deleted file mode 100644
index 9ec1195..0000000
--- a/debian/patches/examples++-load-Makefile.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Fix ff-c++ compile error
---- a/examples++-load/Makefile.am
-+++ b/examples++-load/Makefile.am
-@@ -102,7 +102,7 @@
- regtests.edp: regtests.m4 ../regtests.m4
- m4 -DASSERT regtests.m4 > regtests.edp
-
--$(LIST_COMPILE):ff-c++ include Makefile
-+$(LIST_COMPILE) $(LIST_COMPILE_PKG):ff-c++ include Makefile
-
- clean-local:
- -rm *.o load.link WHERE_LIBRARY-download ff-get-dep ff-c++ ff-pkg-download \
-@@ -135,8 +135,8 @@
- $(INSTALL_DATA) clapack.h ppmimg.h include/* $(DESTDIR)$(ff_prefix_dir)/include
- $(INSTALL) -m 555 $(LIST_COMPILE) $(DESTDIR)$(ff_prefix_dir)/lib
- echo loadpath += \"./\" >$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
-- echo loadpath += \"$(ff_prefix_dir)/lib\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
-- echo includepath += \"$(ff_prefix_dir)/idp\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
-+ echo loadpath += \"$(libdir)/freefem++\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
-+# echo includepath += \"$(libdir)/freefem++/idp\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
- $(INSTALL_SCRIPT) ff-c++ $(DESTDIR)${bindir}
- $(INSTALL_SCRIPT) ff-pkg-download $(DESTDIR)${bindir}
- $(INSTALL_SCRIPT) ff-get-dep $(DESTDIR)${bindir}
---- a/examples++-load/Makefile.in
-+++ b/examples++-load/Makefile.in
-@@ -674,7 +674,7 @@
- regtests.edp: regtests.m4 ../regtests.m4
- m4 -DASSERT regtests.m4 > regtests.edp
-
--$(LIST_COMPILE):ff-c++ include Makefile
-+$(LIST_COMPILE) $(LIST_COMPILE_PKG):ff-c++ include Makefile
-
- clean-local:
- -rm *.o load.link WHERE_LIBRARY-download ff-get-dep ff-c++ ff-pkg-download \
-@@ -707,8 +707,8 @@
- $(INSTALL_DATA) clapack.h ppmimg.h include/* $(DESTDIR)$(ff_prefix_dir)/include
- $(INSTALL) -m 555 $(LIST_COMPILE) $(DESTDIR)$(ff_prefix_dir)/lib
- echo loadpath += \"./\" >$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
-- echo loadpath += \"$(ff_prefix_dir)/lib\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
-- echo includepath += \"$(ff_prefix_dir)/idp\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
-+ echo loadpath += \"$(libdir)/freefem++\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
-+# echo includepath += \"$(libdir)/freefem++/idp\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
- $(INSTALL_SCRIPT) ff-c++ $(DESTDIR)${bindir}
- $(INSTALL_SCRIPT) ff-pkg-download $(DESTDIR)${bindir}
- $(INSTALL_SCRIPT) ff-get-dep $(DESTDIR)${bindir}
diff --git a/debian/patches/examples-load-ff-pkg-download.patch b/debian/patches/examples-load-ff-pkg-download.patch
deleted file mode 100644
index 2b70e7a..0000000
--- a/debian/patches/examples-load-ff-pkg-download.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-Make examples++-load/ff-pkg-download a script
---- 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/debian/patches/series b/debian/patches/series
index 99bc3b9..283eb31 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,11 +1,2 @@
-src-medit-Makefile.patch
-download-yams-Makefile.patch
-download-blacs-Makefile.patch
-download-superludist-Makefile.patch
-download-pastix-Makefile.patch
-download-hips-Makefile.patch
examples-load-WHERE-LIBRARY.patch
-examples-load-ff-pkg-download.patch
examples-bamg-test-dotestpl.patch
-download-mumps-Makefile.patch
-examples++-load-Makefile.patch
diff --git a/debian/patches/src-medit-Makefile.patch b/debian/patches/src-medit-Makefile.patch
deleted file mode 100644
index 8e4a862..0000000
--- a/debian/patches/src-medit-Makefile.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Fix medit not install patch
---- a/src/medit/Makefile.am
-+++ b/src/medit/Makefile.am
-@@ -23,15 +23,14 @@
- 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)
---- a/src/medit/Makefile.in
-+++ b/src/medit/Makefile.in
-@@ -659,17 +659,17 @@
- 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.
diff --git a/debian/rules b/debian/rules
index e7a3348..c781bd8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,7 @@ clean:
build:
dh_testdir
- dh_auto_configure -- CFLAGS=-lm CNOFLAGS=-lm --without-cadna
+ dh_auto_configure -- CFLAGS=-lm
dh_auto_build
# dh_auto_test
diff --git a/download/gmm/cxxflags b/download/gmm/cxxflags
deleted file mode 100644
index 55928ad..0000000
--- a/download/gmm/cxxflags
+++ /dev/null
@@ -1,14 +0,0 @@
-CXX = g++
-MPICXX = /usr/local/bin/mpic++
-ac_ct_CXX = g++
-CC = gcc
-MPICC = /usr/local/\ bin/mpicc
-YACC = bison -y
-ac_ct_CC = gcc
-CXXFLAGS = -g -O2 -m64 -fPIC -DDRAWING -DBAMG_LONG_LONG -DCHECK_KN -fno-inline -fexceptions -fPIC
-CFLAGS = -g -O2 -m64 -fPIC -fPIC
-FCFLAGS = -g -O2 -fPIC
-FFMETIS_CFLAGS =
-X_CFLAGS =
-WGET = wget --no-check-certificate
-WIN32DLLTARGET =
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-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>;
--
FreeFem++ packaging
More information about the debian-science-commits
mailing list