r45163 - in /packages/libmesh/trunk/debian: compat control libmesh-dev.install libmesh-doc.doc-base libmesh-doc.docs libmesh-doc.install libmesh0.7.3.1.install rules

trophime-guest at users.alioth.debian.org trophime-guest at users.alioth.debian.org
Thu Jun 28 16:45:39 UTC 2012 

Author: trophime-guest
Date: Thu Jun 28 16:45:38 2012
New Revision: 45163

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45163
Log:
use of debhelper

Added:
    packages/libmesh/trunk/debian/libmesh-dev.install
    packages/libmesh/trunk/debian/libmesh-doc.install
    packages/libmesh/trunk/debian/libmesh0.7.3.1.install
Modified:
    packages/libmesh/trunk/debian/compat
    packages/libmesh/trunk/debian/control
    packages/libmesh/trunk/debian/libmesh-doc.doc-base
    packages/libmesh/trunk/debian/libmesh-doc.docs
    packages/libmesh/trunk/debian/rules

Modified: packages/libmesh/trunk/debian/compat
URL: http://svn.debian.org/wsvn/debian-science/packages/libmesh/trunk/debian/compat?rev=45163&op=diff
==============================================================================
--- packages/libmesh/trunk/debian/compat (original)
+++ packages/libmesh/trunk/debian/compat Thu Jun 28 16:45:38 2012
@@ -1,1 +1,1 @@
-5
+9

Modified: packages/libmesh/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/libmesh/trunk/debian/control?rev=45163&op=diff
==============================================================================
--- packages/libmesh/trunk/debian/control (original)
+++ packages/libmesh/trunk/debian/control Thu Jun 28 16:45:38 2012
@@ -4,7 +4,7 @@
 Uploaders: "Adam C. Powell, IV" <hazelsct at debian.org>, 
  Christophe Prud'homme <prudhomm at debian.org>, Alan Woodland <ajw05 at aber.ac.uk>
 XS-DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 5), quilt, autotools-dev (>= 20070306.1), autoconf,
+Build-Depends: debhelper (>= 9), autotools-dev (>= 2.12-2), autoconf,
  libpetsc3.2-dev, libslepc3.2-dev, libeigen3-dev, libscotchmetis-dev (>= 5.0.6-2),
  libblas-dev | libblas-3gf.so, libnetcdf-dev, libtbb-dev, libvtk5-dev, libtool,
  automake, mpi-default-dev, enscript, libexodusii-dev, libfparser-dev, libglpk-dev

Added: packages/libmesh/trunk/debian/libmesh-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/libmesh/trunk/debian/libmesh-dev.install?rev=45163&op=file
==============================================================================
--- packages/libmesh/trunk/debian/libmesh-dev.install (added)
+++ packages/libmesh/trunk/debian/libmesh-dev.install Thu Jun 28 16:45:38 2012
@@ -1,0 +1,14 @@
+usr/lib/libmesh.so
+
+libmesh/include/base/*.h  usr/include/libmesh/base
+libmesh/include/enums/*.h  usr/include/libmesh/enums
+libmesh/include/error_estimation/*.h  usr/include/libmesh/error_estimation
+libmesh/include/fe/*.h  usr/include/libmesh/fe
+libmesh/include/geom/*.h  usr/include/libmesh/geom
+libmesh/include/mesh/*.h  usr/include/libmesh/mesh
+libmesh/include/numerics/*.h  usr/include/libmesh/numerics
+libmesh/include/parallel/*.h  usr/include/libmesh/parallel
+libmesh/include/partitioning/*.h  usr/include/libmesh/partitioning
+libmesh/include/quadrature/*.h  usr/include/libmesh/quadrature
+libmesh/include/solvers/*.h  usr/include/libmesh/solvers
+libmesh/include/utils/*.h usr/include/libmesh/utils

Modified: packages/libmesh/trunk/debian/libmesh-doc.doc-base
URL: http://svn.debian.org/wsvn/debian-science/packages/libmesh/trunk/debian/libmesh-doc.doc-base?rev=45163&op=diff
==============================================================================
--- packages/libmesh/trunk/debian/libmesh-doc.doc-base (original)
+++ packages/libmesh/trunk/debian/libmesh-doc.doc-base Thu Jun 28 16:45:38 2012
@@ -11,9 +11,8 @@
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/libmesh-doc/html/index.php
-Files: /usr/share/doc/libmesh-doc/*/*.php
- /usr/share/doc/libmesh-doc/*/*/*.php
+Index: /usr/share/doc/libmesh-doc/html/index.php.gz
+Files: /usr/share/doc/libmesh-doc/html/*.php.gz
 
 Format: PDF
-Files: /usr/share/doc/libmesh-doc/*.pdf
+Files: /usr/share/doc/libmesh-doc/*.pdf.gz

Modified: packages/libmesh/trunk/debian/libmesh-doc.docs
URL: http://svn.debian.org/wsvn/debian-science/packages/libmesh/trunk/debian/libmesh-doc.docs?rev=45163&op=diff
==============================================================================
--- packages/libmesh/trunk/debian/libmesh-doc.docs (original)
+++ packages/libmesh/trunk/debian/libmesh-doc.docs Thu Jun 28 16:45:38 2012
@@ -1,3 +1,1 @@
-libmesh/doc/html
-libmesh/doc/latex
 debian/README.Debian

Added: packages/libmesh/trunk/debian/libmesh-doc.install
URL: http://svn.debian.org/wsvn/debian-science/packages/libmesh/trunk/debian/libmesh-doc.install?rev=45163&op=file
==============================================================================
--- packages/libmesh/trunk/debian/libmesh-doc.install (added)
+++ packages/libmesh/trunk/debian/libmesh-doc.install Thu Jun 28 16:45:38 2012
@@ -1,0 +1,4 @@
+libmesh/examples/* usr/share/doc/libmesh-doc/examples
+libmesh/doc/html/* usr/share/doc/libmesh-doc/html
+libmesh/doc/latex/xda_format/*.pdf usr/share/doc/libmesh-doc/
+libmesh/doc/latex/howto/*.pdf usr/share/doc/libmesh-doc/

Added: packages/libmesh/trunk/debian/libmesh0.7.3.1.install
URL: http://svn.debian.org/wsvn/debian-science/packages/libmesh/trunk/debian/libmesh0.7.3.1.install?rev=45163&op=file
==============================================================================
--- packages/libmesh/trunk/debian/libmesh0.7.3.1.install (added)
+++ packages/libmesh/trunk/debian/libmesh0.7.3.1.install Thu Jun 28 16:45:38 2012
@@ -1,0 +1,1 @@
+usr/lib/libmesh.so.*

Modified: packages/libmesh/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/libmesh/trunk/debian/rules?rev=45163&op=diff
==============================================================================
--- packages/libmesh/trunk/debian/rules (original)
+++ packages/libmesh/trunk/debian/rules Thu Jun 28 16:45:38 2012
@@ -14,18 +14,19 @@
 version=2.0.5
 major=2
 
-libmesh/config.status: libmesh/configure.in
-	dh_testdir
-	cp /usr/share/misc/config.guess libmesh/
-	cp /usr/share/misc/config.sub libmesh/
-	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
-	cd libmesh && libtoolize && autoreconf -I m4/
-	cd libmesh && PETSC_DIR=/usr/lib/petsc PETSC_ARCH=$(shell petscarch) \
-	  SLEPC_DIR=/usr/lib/slepc \
-	  LDFLAGS=-Wl,-soname,libmesh.so.$(LIBMESH_VERSION),-lpetsc,-lpetscdm,-lpetscksp,-lpetscmat,-lpetscsnes,-lpetscvec,-lscotchmetis,-lblas,-ltbb,-ltbbmalloc,-lvtkIO,-lvtkCommon,-lvtkFiltering \
-	  ./configure --prefix=/usr \
-	   --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-	   --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
+# Add --parallel to activate parallel compilation (not working right now)
+
+%:
+	dh $@ --sourcedirectory=$(CURDIR)/libmesh --parallel
+	
+# 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
+
+LDFLAGS=-Wl,-soname,libmesh.so.$(LIBMESH_VERSION),-lpetsc,-lpetscdm,-lpetscksp,-lpetscmat,-lpetscsnes,-lpetscvec,-lscotchmetis,-lblas,-ltbb,-ltbbmalloc,-lvtkIO,-lvtkCommon,-lvtkFiltering \
+
+extra_flags += \
 	   --disable-laspack --disable-sfc --disable-gzstreams --disable-gmv \
 	   --disable-tecplot --disable-parmetis --disable-tetgen \
 	   --disable-triangle --enable-exodus --disable-libHilbert \
@@ -33,100 +34,48 @@
 	   --enable-second --enable-ifem --enable-metis --enable-perflog \
 	   --enable-vtk --with-vtk-include=/usr/include/vtk-5.8 --with-tbb=/usr
 
-build: build-arch
-build-arch: libmesh/config.status
-	dh_testdir
-	$(MAKE) -C libmesh
-	touch $@
-
-build-indep: libmesh/config.status
-	dh_testdir
-	$(MAKE) -C libmesh doc
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-arch
-	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
-
-	[ ! -f libmesh/Make.common ] || $(MAKE) -i -C libmesh distclean
-	rm -f libmesh/config.sub libmesh/config.guess libmesh/config.log
-	find -type f -name '.*' -exec '{}' ';'
-
+override_dh_auto_clean:
+	[ ! -f libmesh/Make.common ] || $(MAKE) -i -C libmesh  distclean
+	dh_autotools-dev_restoreconfig
+	
+	#rm -f libmesh/config.sub libmesh/config.guess libmesh/config.log
+	#find -type f -name '.*' -exec '{}' ';'
+	
 	dh_clean
 
-meshlib = $(CURDIR)/debian/libmesh$(LIBMESH_VERSION)
-meshdev = $(CURDIR)/debian/libmesh-dev
+override_dh_auto_configure:
+	dh_autotools-dev_updateconfig
+	cd libmesh && libtoolize && autoreconf -I m4/
+	dh_auto_configure -- $(extra_flags)
 
-install: install-stamp
-install-stamp: build
-	dh_testdir
-	dh_testroot
-	dh_clean
-	dh_installdirs
+override_dh_auto_build:
+	dh_auto_build
 
-	mkdir -p $(meshlib)/usr/lib
-	mkdir -p $(meshdev)/usr/lib
+override_dh_auto_install:
+
+	mkdir -p debian/tmp/usr/lib
 	libdir=`grep "hosttype " libmesh/Make.common | cut -d "=" -f 2 | cut -c 2-`; \
-	cp libmesh/lib/$${libdir}_opt/libmesh.so $(meshlib)/usr/lib/libmesh.so.$(LIBMESH_VERSION)
-	ln -s libmesh.so.$(LIBMESH_VERSION) $(meshdev)/usr/lib/libmesh.so
-	mkdir -p $(meshdev)/usr/include/libmesh
-	cp libmesh/include/base/* libmesh/include/enums/* libmesh/include/error_estimation/* libmesh/include/fe/* libmesh/include/geom/* libmesh/include/mesh/* libmesh/include/numerics/* libmesh/include/parallel/* libmesh/include/partitioning/* libmesh/include/quadrature/* libmesh/include/solvers/* libmesh/include/utils/* $(meshdev)/usr/include/libmesh
-	rm $(meshdev)/usr/include/libmesh/libmesh_config.h.in
-	-rm $(meshdev)/usr/include/libmesh/libmesh_contrib_config.h.in
-	touch $@
+	cp libmesh/lib/$${libdir}_opt/libmesh.so debian/tmp/usr/lib/libmesh.so.$(LIBMESH_VERSION)
+	cd debian/tmp/usr/lib && ln -s libmesh.so.$(LIBMESH_VERSION) libmesh.so
 
-# Build architecture-independent files here.
-binary-indep: build-indep install-stamp
-	dh_testdir -i
-	dh_testroot -i
-	dh_installchangelogs -i libmesh/CHANGES
-	dh_installdocs -i
+# Need to fix examples
+# fix libmesh_dir path in libmesh/Make.common and install
+# in any Makefile in examples subdirectory
+#   change $(LIBMESH_DIR) to directory where Make.common has been installed
+#   fix path to contrib/bin/make_dependencies.pl??
+#
+# Need to install libmesh/contrib/bin/make_dependencies.pl
+
+	dh_auto_install
+	dh_compress -i -X.php -X.js -X.pdf
 	
-	# Remove useless man pages 
-	-rm -rf debian/libmesh-doc/usr/share/doc/libmesh-doc/man
+	dh_installchangelogs -a libmesh/CHANGES
 	
-	mv debian/libmesh-doc/usr/share/doc/libmesh-doc/latex/*/*.pdf \
-	  debian/libmesh-doc/usr/share/doc/libmesh-doc/
-	rm -rf debian/libmesh-doc/usr/share/doc/libmesh-doc/latex \
-	  debian/libmesh-doc/usr/share/doc/libmesh-doc/Doxyfile* \
-	  debian/libmesh-doc/usr/share/doc/libmesh-doc/dot*
-	dh_installexamples -i "--exclude=.depend"
+	dh_install -p libmesh-doc
 	
-	# Need to fix examples makefile
-	#for exmake in `ls debian/exmake/Makefile.ex* | sed 's/debian\/exmake\/Makefile.//'`; do \
-	#  cp -f debian/exmake/Makefile.$$exmake \
-	#    $(CURDIR)/debian/libmesh-doc/usr/share/doc/libmesh-doc/examples/$$exmake/Makefile; \
-	#done
+	dh_installexamples -i -X.depend
 	
-	dh_compress -i -X.php -X.js -X.pdf
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
 
-# Build architecture-dependent files here.
-binary-arch: build install-stamp
-	dh_testdir -a
-	dh_testroot -a
-	dh_installchangelogs -a libmesh/CHANGES
-	dh_installdocs -a
-	dh_installman -a
-	dh_link -a
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_makeshlibs -a
-	dh_installdeb -a
-	dh_shlibdeps -av
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
 
 USCAN_DESTDIR := $(CURDIR)/../tarballs
 DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog -ldebian/changelog | sed -rne 's,^Version: ([^-]+).*,\1,p')

More information about the debian-science-commits mailing list