r45387 - in /packages/getdp/trunk/debian: changelog control patches/series rules

trophime-guest at users.alioth.debian.org trophime-guest at users.alioth.debian.org
Mon Oct 8 12:07:48 UTC 2012 

Author: trophime-guest
Date: Mon Oct  8 12:07:48 2012
New Revision: 45387

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45387
Log:
remove unneeded patches

Modified:
    packages/getdp/trunk/debian/changelog
    packages/getdp/trunk/debian/control
    packages/getdp/trunk/debian/patches/series
    packages/getdp/trunk/debian/rules

Modified: packages/getdp/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/getdp/trunk/debian/changelog?rev=45387&op=diff
==============================================================================
--- packages/getdp/trunk/debian/changelog (original)
+++ packages/getdp/trunk/debian/changelog Mon Oct  8 12:07:48 2012
@@ -1,8 +1,9 @@
-getdp (2.2.1-1) unstable; urgency=low
+getdp (2.2.1~svn2541-1) unstable; urgency=low
 
-  * 
+  * update to sn rev 2541
+  * change build system to cmake
 
- -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>  Mon, 16 Jul 2012 11:25:03 +0200
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>  Mon, 10 Sep 2012 08:25:03 +0200
 
 getdp (2.2.0-1) unstable; urgency=low
 

Modified: packages/getdp/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/getdp/trunk/debian/control?rev=45387&op=diff
==============================================================================
--- packages/getdp/trunk/debian/control (original)
+++ packages/getdp/trunk/debian/control Mon Oct  8 12:07:48 2012
@@ -3,8 +3,10 @@
 Priority: extra
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
-Build-Depends: quilt, cdbs, debhelper (>= 7), autotools-dev, automake, autoconf, gfortran, mpi-default-dev,
- libarpack2-dev, libgsl0-dev, libscotchmetis-dev, libpetsc3.2-dev, libslepc3.2-dev, libhdf5-openmpi-dev (>= 1.8.8), gmsh,
+Build-Depends: debhelper (>= 9), cmake,
+ gfortran, mpi-default-dev,
+ libarpack2-dev, libgsl0-dev, libscotchmetis-dev,
+ libpetsc3.2-dev, libslepc3.2-dev, libhdf5-openmpi-dev (>= 1.8.8), gmsh,
  texlive, texlive-generic-recommended, texinfo, install-info
 Standards-Version: 3.9.3
 Homepage: http://www.geuz.org/getdp

Modified: packages/getdp/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/getdp/trunk/debian/patches/series?rev=45387&op=diff
==============================================================================
--- packages/getdp/trunk/debian/patches/series (original)
+++ packages/getdp/trunk/debian/patches/series Mon Oct  8 12:07:48 2012
@@ -1,4 +1,5 @@
-Makefile.diff
-configure.diff
-#slepc3.2.patch
-#fix_latest_svn.patch
+#Makefile.diff
+#configure.diff
+##slepc3.2.patch
+##fix_latest_svn.patch
+#cmake.patch

Modified: packages/getdp/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/getdp/trunk/debian/rules?rev=45387&op=diff
==============================================================================
--- packages/getdp/trunk/debian/rules (original)
+++ packages/getdp/trunk/debian/rules Mon Oct  8 12:07:48 2012
@@ -1,55 +1,56 @@
 #!/usr/bin/make -f
 
-DEB_AUTO_CLEANUP_RCS            := yes
-
-DEB_AUTO_UPDATE_ACLOCAL         := 1.11
-DEB_AUTO_UPDATE_AUTOCONF        := 1
-
-DEB_COMPRESS_EXCLUDE            := .pdf .svn
-
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+BUILDDIR = $(CURDIR)/debian/build
+DEB_STRIPPED_UPSTREAM_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -n -e 's/\.dfsg.*$$//p')
 
 # PETSC_DIR is the location of PETSc.
 export PETSC_DIR=/usr/lib/petscdir/3.2
 export PETSC_ARCH=linux-gnu-c-opt
 export SLEPC_DIR=/usr/lib/slepcdir/3.2
 
-#DEB_MAKE_ENVVARS               := -j2
+%:
+	dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --parallel
+export OMPI_MCA_plm_rsh_agent=/bin/false                #workaround to start MPI-applications in chroot
 
-#DEB_CONFIGURE_EXTRA_FLAGS := --enable-metis
-DEB_CONFIGURE_EXTRA_FLAGS := 
-DEB_CONFIGURE_SCRIPT_ENV  += F77="gfortran"
+disable_mpi_archs = armel armhf kfreebsd-amd64 kfreebsd-i386 mips mipsel
+export LD_LIBRARY_PATH :=  $(CURDIR)/debian/tmp/usr/lib:$(LD_LIBRARY_PATH); 
 
+ifeq (,$(filter $(DEB_HOST_ARCH),$(disable_mpi_archs)))
+	extra_flags += \
+	-DCMAKE_CXX_FLAGS="-DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX -fopenmp -lmpi -fPIC \
+	                   -Wall $(shell dpkg-buildflags --get CXXFLAGS)" \
+	-DENABLE_MPI:BOOL=ON
+else
+	extra_flags += \
+	-DCMAKE_CXX_FLAGS="-DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX -fopenmp -fPIC \
+	                   -Wall $(shell dpkg-buildflags --get CXXFLAGS)" \
+	-DENABLE_MPI:BOOL=OFF
+endif
+
+override_dh_auto_configure:
+	dh_auto_configure --buildsystem=cmake --builddirectory=$(BUILDDIR)/petsc --parallel -- $(extra_flags)
+	dh_auto_configure --buildsystem=cmake --builddirectory=$(BUILDDIR)/sparskit --parallel -- $(extra_flags) -DENABLE_PETSC=0 -DENABLE_SPARSKIT=1 
+
+override_dh_auto_build:	
+	echo "installing getdp"
+	dh_auto_build  --builddirectory=$(BUILDDIR)/petsc
+	echo "installing getdp-sparskit"
+	dh_auto_build  --builddirectory=$(BUILDDIR)/sparskit
+
+override_dh_auto_install:
+	echo "installing getdp"
+	dh_auto_install  --builddirectory=$(BUILDDIR)/petsc
+
+	mv $(BUILDDIR)/sparskit/getdp $(CURDIR)/debian/tmp/usr/bin/getdp-sparskit
+
+	
+override_dh_auto_clean:
+	rm -rf $(BUILDDIR)/petsc $(BUILDDIR)/sparkit
+
+# Grab the version before +dfsg
+DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+).*,\1,p')
 DEB_STRIPPED_UPSTREAM_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -n -e 's/\.dfsg.*$$//p')
 
-install/getdp::
-	echo "installing getdp"
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-	cd doc/texinfo && $(MAKE) pdf html info LC_ALL=C
-	cd doc/texinfo && $(MAKE) install-info DESTDIR=$(CURDIR)/debian/tmp
-
-install/getdp-sparskit::
-	echo "installing getdp-sparskit"
-	make clean
-	rm -rf Common/GetDPVersion.h
-	rm -rf Common/GetDPConfig.h
-	$(DEB_CONFIGURE_INVOKE) $(cdbs_configure_flags) $(DEB_CONFIGURE_EXTRA_FLAGS) $(DEB_CONFIGURE_USER_FLAGS) --enable-sparskit --disable-gmsh
-	$(MAKE) 
-
-	mv bin/getdp bin/getdp-sparskit
-
-	
-clean::
-	find . \( -name "*.o" -o -name "*.a" \) -delete
-	rm -rf bin/getdp bin/getdp-sparskit
-	rm -rf Common/GetDPVersion.h
-	rm -rf Common/GetDPConfig.h
-	rm -rf variables configure
-	rm -rf config.guess config.sub config.status config.log
-
-.PHONY: get-orig-source
 get-orig-source:
 	set -ex ; \
         mkdir -p tmp ; \

More information about the debian-science-commits mailing list