[SCM] FreeFem++ packaging branch, master, updated. debian/3.12.1-1-8-gba7124a

Dimitrios Eftaxiopoulos eftaxi12 at otenet.gr
Wed Jun 1 22:44:53 UTC 2011


The following commit has been merged in the master branch:
commit 38ae87a95bf0bf0973e4308a5cd1be58c4b078a0
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Wed Jun 1 23:16:31 2011 +0300

    Successful build with g++-4.5 and gfortran-4.5

diff --git a/.pc/applied-patches b/.pc/applied-patches
index 7a70d70..283eb31 100644
--- a/.pc/applied-patches
+++ b/.pc/applied-patches
@@ -1,3 +1,2 @@
 examples-load-WHERE-LIBRARY.patch
 examples-bamg-test-dotestpl.patch
-debian-changes-3.12.1-1
diff --git a/.pc/download-mumps-Makefile.patch/download/mumps/Makefile b/.pc/download-mumps-Makefile.patch/download/mumps/Makefile
deleted file mode 100644
index 974c267..0000000
--- a/.pc/download-mumps-Makefile.patch/download/mumps/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-# Downloading and compiling extra libraries
-# -----------------------------------------
-
-# $Id$
-include Makefile.inc
-
-all-local: mumps
-
-# Downloading and compiling mumps
-# ------------------------------
-DIRPKG=../pkg
-SRCDIR=MUMPS_$(VERSION)
-PACKAGE1=$(DIRPKG)/MUMPS_$(VERSION).tar.gz
-INSTALL=../..
-VERSION=4.9.2
-
-mumps: FAIRE
-
-$(SRCDIR)/FAIT: $(SRCDIR)/tag-tar
-	cp Makefile.inc $(SRCDIR)
-	cd $(SRCDIR);make d z
-	touch $(SRCDIR)/FAIT	
-install: $(SRCDIR)/FAIT
-	-mkdir -p $(SRCDIR)/$(INSTALL)/include
-	cp $(SRCDIR)/include/*.h $(SRCDIR)/$(INSTALL)/include/
-	-mkdir -p $(SRCDIR)/$(INSTALL)/lib
-	cp $(SRCDIR)/lib/*.a $(SRCDIR)/$(INSTALL)/lib/
-
-WHERE: 
-	if [ -f $(SRCDIR)/FAIT  ] ;then \
-	$(MAKE) install ; \
-	echo "mumps LD '-L at DIR@/lib   -ldmumpsFREEFEM -lzmumpsFREEFEM  -lmumps_commonFREEFEM -lpordFREEFEM '"  >$(SRCDIR)/$(INSTALL)/lib/WHERE.mumps ;\
-	echo "mumps INCLUDE '-I at DIR@/include'">> $(SRCDIR)/$(INSTALL)/lib/WHERE.mumps ;\
-	fi
-
-
-FAIRE:
-	$(MAKE) install WHERE 
-	touch FAIRE
-
-Makefile.inc: ../../config.status	Makefile Makefile-mumps-$(VERSION).inc
-	../../config.status  --file="Makefile.inc:Makefile-mumps-$(VERSION).inc"
-
-$(SRCDIR)/$(INSTALL): $(SRCDIR)/tag-tar
-
-$(SRCDIR)/tag-tar:
-	tar xvzf $(PACKAGE1)
-	patch -d MUMPS_4.9.2   -p 1    <MUMPS_4.9.2.patch
-	touch $(SRCDIR)/tag-tar
-
-clean-local:
-	-cd $(SRCDIR) &&  $(MAKE) clean -C $(SRCDIR) 
-
-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)
-
-.PHONY:$(SRCDIR)/$(INSTALL)
\ No newline at end of file
diff --git a/.pc/debian-changes-3.12.1-1/.directory b/.pc/examples-bamg-test-dotestpl.patch/.timestamp
similarity index 100%
rename from .pc/debian-changes-3.12.1-1/.directory
rename to .pc/examples-bamg-test-dotestpl.patch/.timestamp
diff --git a/.pc/examples-load-ff-pkg-download.patch/examples++-load/ff-pkg-download.in b/.pc/examples-load-ff-pkg-download.patch/examples++-load/ff-pkg-download.in
deleted file mode 100755
index 46551ce..0000000
--- a/.pc/examples-load-ff-pkg-download.patch/examples++-load/ff-pkg-download.in
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh
-
-ff=$0;
-bb=`basename $0`
-DIR=`dirname $ff`
-pp=`pwd`
-if [ $bb = $ff -a  \( '.' = "$DIR" -o -z "$DIR" \) ] ;  then
-  ff=`which $0`
-  DIR=`dirname $ff`
-  if [ '.' = "$DIR" -o -z "$DIR" ] ;  then
-     echo Sorry cant find the Directory  place of $0
-  fi
-fi
-case $DIR in 
-/*) ;;
-[.])  DIR=$pp;;
-*)  DIR="$pp/$DIR"
-esac
-DIRP=`dirname $DIR`
-#echo "WWWWW"  $DIRP 
-if [ -d "$DIRP/download/lib" -a -d "$DIRP/download/include"  ] ; then
-    DIR="$DIRP/download"
-elif [ -d "$DIRP/lib" -a -d "$DIRP/include"  ] ; then
-    DIR="$DIRP"
-else
-  DIR=@ff_prefix_dir@
-fi
-
-if [   -d $DIR/lib -a -d $DIR/include  ] ; then
-    LIB="$DIR/lib"
-    INC="$DIR/include"
-    cd "$LIB"
-#  set -x
-    for i in $LIB/WHERE.* ; do            
-	test -f $i && ( sed "s;@DIR@;$DIR;" <$i  )
-    done
-#    return
-    for la in arpack umfpack amd fftw3 blas lapack   mmg3d; do
-        l=`echo $la |sed -e s/^tet$/tetgen/`
-       if [ ! -f $LIB/WHERE.$l ]; then
-	   if [ -z "$l" ];then l="$la";fi  
-	   if  ( ls  "lib$la"[-._0-9]*a 1>/dev/null 2>/dev/null ) ; then 
-	       ll=`ls  "lib$la"[-._0-9]*a|grep [.]a`
-	       if [ -n "$ll" ]; then 
-		   lib=`expr "$ll" : lib'\(.*\).a'`
-		   echo $l LD "'"-L$LIB"'" "'"-l$lib"'"
-		   if [ -d $INC/$la ] ; then
-		       echo $l INCLUDE "'"-I$INC/$la"'"
-		   else
-		       echo $l INCLUDE "'"-I$INC"'"
-		   fi
-	       fi
-	   fi
-       fi
-    done
-else
-    echo error not directory $DIR/lib and $DIR/include  $DIRP 
-fi
\ No newline at end of file
diff --git a/debian/changelog~ b/debian/changelog~
deleted file mode 100644
index 76cf259..0000000
--- a/debian/changelog~
+++ /dev/null
@@ -1,5 +0,0 @@
-freefem++ (3.12.1-1) unstable; urgency=low
-
-  * Initial release (Closes: #500755).
-
- -- Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>  Sun, 24 Apr 2011 22:00:00 +0200
diff --git a/debian/control b/debian/control
index f6c83a5..c8aad04 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
 Uploaders: Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>, 
  Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.2.3~), autotools-dev, gawk,
- gfortran, flex, bison, libxt-dev, libxext-dev, libxxf86vm-dev,
+Build-Depends: debhelper (>= 7.2.3~), autotools-dev, gawk, g++-4.5,
+ gfortran-4.5, flex, bison, libxt-dev, libxext-dev, libxxf86vm-dev,
  libxpm-dev, openmpi-bin, libfftw3-dev, libblas-dev, libgsl0-dev,
  libarpack2-dev, libsuitesparse-dev, libsuperlu3-dev, imagemagick, 
  libfltk1.1-dev, freeglut3-dev, texlive, texlive-extra-utils, 
diff --git a/debian/control~ b/debian/control~
deleted file mode 100644
index c8aad04..0000000
--- a/debian/control~
+++ /dev/null
@@ -1,107 +0,0 @@
-Source: freefem++
-Section: contrib/science
-Priority: optional
-Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
-Uploaders: Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>, 
- Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
-DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.2.3~), autotools-dev, gawk, g++-4.5,
- gfortran-4.5, flex, bison, libxt-dev, libxext-dev, libxxf86vm-dev,
- libxpm-dev, openmpi-bin, libfftw3-dev, libblas-dev, libgsl0-dev,
- libarpack2-dev, libsuitesparse-dev, libsuperlu3-dev, imagemagick, 
- libfltk1.1-dev, freeglut3-dev, texlive, texlive-extra-utils, 
- texlive-latex-extra, texlive-font-utils,
- libmumps-dev, libblacs-mpi-dev, libscalapack-mpi-dev,
- libscotch-dev, ghostscript, libptscotch-dev
-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
-
-Package: freefem++
-Architecture: any
-Section: contrib/math
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Provides the binaries of the FreeFem++ FE suite
- FreeFem++ is an implementation of a language dedicated to the finite
- element method. It enables you to solve Partial Differential
- Equations (PDE) easily.
- .
- Problems involving PDE from several branches of physics such as
- fluid-structure interactions require interpolations of data on
- several meshes and their manipulation within one program. FreeFem++
- includes a fast quadtree-based interpolation algorithm and a language
- for the manipulation of these data on multiple meshes. It contains
- also a powerful mesh generation and adaption tool integrated
- seamlessly in FreeFem++ called bamg.
- .
- FreeFem++ is written in C++ and the FreeFem++ language is a C++ idiom
- allowing for a smooth learning curve.
- .
- This package contains the executables of FreeFem++.
-
-Package: libfreefem++
-Architecture: any
-Section: contrib/libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Provides the shared libraries of the FreeFem++ FE suite
- FreeFem++ is an implementation of a language dedicated to the finite
- element method. It enables you to solve Partial Differential
- Equations (PDE) easily.
- .
- Problems involving PDE from several branches of physics such as
- fluid-structure interactions require interpolations of data on
- several meshes and their manipulation within one program. FreeFem++
- includes a fast quadtree-based interpolation algorithm and a language
- for the manipulation of these data on multiple meshes. It contains
- also a powerful mesh generation and adaption tool integrated
- seamlessly in FreeFem++ called bamg.
- .
- FreeFem++ is written in C++ and the FreeFem++ language is a C++ idiom
- allowing for a smooth learning curve.
- .
- This package contains the shared libraries of FreeFem++.
-
-Package: libfreefem++-dev
-Architecture: any
-Section: contrib/libdevel
-Depends: libfreefem++, ${shlibs:Depends}, ${misc:Depends}
-Description: Provides the development files of the FreeFem++ FE suite
- FreeFem++ is an implementation of a language dedicated to the finite
- element method. It enables you to solve Partial Differential
- Equations (PDE) easily.
- .
- Problems involving PDE from several branches of physics such as
- fluid-structure interactions require interpolations of data on
- several meshes and their manipulation within one program. FreeFem++
- includes a fast quadtree-based interpolation algorithm and a language
- for the manipulation of these data on multiple meshes. It contains
- also a powerful mesh generation and adaption tool integrated
- seamlessly in FreeFem++ called bamg.
- .
- FreeFem++ is written in C++ and the FreeFem++ language is a C++ idiom
- allowing for a smooth learning curve.
- .
- This package contains the development files of FreeFem++.
-
-Package: freefem++-doc
-Architecture: all
-Section: contrib/doc
-Depends: ${misc:Depends}
-Description: Provides the documentation of the FreeFem++ FE suite
- FreeFem++ is an implementation of a language dedicated to the finite
- element method. It enables you to solve Partial Differential
- Equations (PDE) easily.
- .
- Problems involving PDE from several branches of physics such as
- fluid-structure interactions require interpolations of data on
- several meshes and their manipulation within one program. FreeFem++
- includes a fast quadtree-based interpolation algorithm and a language
- for the manipulation of these data on multiple meshes. It contains
- also a powerful mesh generation and adaption tool integrated
- seamlessly in FreeFem++ called bamg.
- .
- FreeFem++ is written in C++ and the FreeFem++ language is a C++ idiom
- allowing for a smooth learning curve. 
- .
- This package contains the documentation files of FreeFem++. 
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..8530d06 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+examples-load-WHERE-LIBRARY.patch
+examples-bamg-test-dotestpl.patch
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 0634771..309dfbb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,7 @@ clean:
 
 build:
 	dh_testdir
-	dh_auto_configure -- CFLAGS=-lm CXX=g++-4.5 CC=gcc-4.5 FC=gfortran-4.5 
+	dh_auto_configure -- CFLAGS=-lm CXX=g++-4.5 CC=gcc-4.5 FC=gfortran-4.5
 	dh_auto_build
 #	dh_auto_test
 

-- 
FreeFem++ packaging



More information about the debian-science-commits mailing list