[SCM] FreeFem++ packaging branch, master, updated. debian/3.20-1-25-g48775df

Fri Jun 21 12:24:53 UTC 2013

The following commit has been merged in the master branch:
commit f43a5ec456e25c07c440c0302fcb99f348af28b0
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Thu Jun 20 20:10:10 2013 +0300

    Removed files inicating the conflicts of merge

diff --git a/debian/control.orig b/debian/control.orig
deleted file mode 100644
index c5641cb..0000000
--- a/debian/control.orig
+++ /dev/null
@@ -1,136 +0,0 @@
-Source: freefem++
-Section: science
-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>
-DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 9~), 
- dh-autoreconf,
-<<<<<<< HEAD
- quilt, gawk, gfortran, 
- flex, bison, libxt-dev, libxext-dev, libxxf86vm-dev, libhypre-dev, 
- libxpm-dev, mpi-default-dev, libfftw3-dev, libblas-dev, libgsl0-dev,
- libarpack2-dev, libsuitesparse-dev, libsuperlu3-dev, imagemagick, 
- libfltk1.3-dev | libfltk-dev, freeglut3-dev, texlive, texlive-extra-utils, 
- texlive-latex-extra, texlive-font-utils, libmumps-ptscotch-dev,
- libmumps-dev, libblacs-mpi-dev, libscalapack-mpi-dev, libgmm++-dev, 
- libscotch-dev, ghostscript, libptscotch-dev, libmumps-scotch-dev,
- libmumps-seq-dev, libnlopt-dev, coinor-libipopt-dev
- #libtet1.4-dev,
- #libmmg3dlib4.0-4.0-dev, freeyams, mshmet, mshint,
- #libparms2-dev, libhips-dev, libitsol-dev
-# autoconf, aclocal, libtool,
-=======
- quilt, gawk, gfortran, mpi-default-dev,
- flex, bison, libxt-dev, libxext-dev, libxxf86vm-dev, 
- libxpm-dev, 
- libfltk1.3-dev | libfltk-dev, freeglut3-dev, ghostscript, imagemagick,
- texlive, texlive-extra-utils, texlive-latex-extra, texlive-font-utils, 
- libfftw3-dev, libblas-dev, libgsl0-dev,
- libhypre-dev, 
- libarpack2-dev, libsuitesparse-dev,
- libmumps-ptscotch-dev, libmumps-dev, libblacs-mpi-dev, libscalapack-mpi-dev,
- libscotch-dev, libptscotch-dev, libmumps-scotch-dev,
- libscotchmetis-dev, libscotchparmetis-dev,
- libmumps-seq-dev, libnlopt-dev, coinor-libipopt-dev,
- libgmm++-dev
-# libtet1.4-dev,
-# libmmg3dlib4.0-4.0-dev, freeyams, mshmet, mshint,
-# libparms2-dev, libitsol-dev,
-# libhips-dev, libpastix-dev,
-# libsuperlu-dist-dev
-## libsuperlu4-dev 
->>>>>>> experimental
-Standards-Version: 3.9.3
-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: 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: 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: 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: 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/rules.orig b/debian/rules.orig
deleted file mode 100755
index 59d932e..0000000
--- a/debian/rules.orig
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
-export DH_OPTIONS=-v
-
-<<<<<<< HEAD
-=======
-export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
->>>>>>> experimental
-
-
-%:
-	dh $@ --with autoreconf
-
-export OMPI_MCA_plm_rsh_agent=/bin/false                #workaround to start MPI-applications in chroot
-<<<<<<< HEAD
-=======
-
-# to avoid lintian warnings
-CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
-CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
-CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
-LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
->>>>>>> experimental
-	
-override_dh_auto_clean:	
-	dh_auto_clean
-	rm -f download/parms/config.log download/hypre/config.log 
-	rm -f download/pastix/config.log download/parmetis/config.log
-	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/addfe.aux 
-	rm -f DOC/freefem++doc.aux DOC/freefem++doc.idx
-	rm -f DOC/freefem++doc.ilg DOC/freefem++doc.ind DOC/freefem++doc.log
-	rm -f DOC/freefem++doc.out DOC/freefem++doc.pdf DOC/freefem++doc.pdfsync 
-	rm -f DOC/freefem++doc.toc
-	rm -f config-version.h config_LIB_INFO configure.param
-# 	rm -f download/blacs/Bmake.inc 
-	rm -f download/fftw/cxxflags
-	rm -f download/gmm/cxxflags download/metis/Makefile.in
-	rm -f download/pastix/config-complex.in 
-#       rm -f download/pastix/config.in
-	rm -f download/tetgen/cxxflags examples++-3d/freefem++.pref
-	rm -f examples++-load/WHERE_LIBRARY-config 
-	rm -f examples++-load/freefem++.pref examples++-mpi/freefem++.pref
-	rm -f examples++-mpi/MPICG.o examples++-mpi/MPICG.so
-	rm -f src/mpi/config.log src/mpi/ff-mpirun src/medit/compil.date
-#
-# To rebuild
-	find . -name \*.o | xargs --no-run-if-empty rm
-	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
-
-<<<<<<< HEAD
-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 -- CFLAGS=-lm
-	cp -f examples++-load/WHERE_LIBRARY-config debian
-	dh_auto_build
-
-override_dh_auto_install:
-	mv debian/freefem++/usr/bin/bamg debian/freefem++/usr/bin/ffbamg
-	dh_auto_install
-=======
-override_dh_auto_configure:
-	dh_auto_configure -- \
-	   CPPFLAGS=$(CPPFLAGS) \
-	   CFLAGS="$(CFLAGS) -lm" \
-	   CXXFLAGS="$(CXXFLAGS)" \
-	   LDFLAGS="$(LDFLAGS)" \
-	   CXX=mpic++
-	cp -f examples++-load/WHERE_LIBRARY-config debian
-	dh_auto_build
-
-override_dh_auto_install:
-	dh_auto_install
-	mv debian/tmp/usr/bin/bamg debian/tmp/usr/bin/ffbamg
-#
-# Install modified script to create plugins	
-	cp examples++-load/WHERE_LIBRARY-config examples++-load/WHERE_LIBRARY
-	cp -f debian/ff-c++ debian/tmp/usr/bin
-	cp -f debian/ff-get-dep debian/tmp/usr/bin
-#
-# Fix lintian warnings
-	chmod ugo-x debian/tmp/usr/lib/ff++/3.*/idp/*.idp
-
->>>>>>> experimental
-
-override_dh_auto_test:
-	echo "do not run tests"
-	#dh_auto_test

-- 
FreeFem++ packaging

