r45150 - in /packages/libmesh/trunk/debian: changelog control libmesh-doc.docs patches/exodusii.patch patches/fparser.patch patches/nemesis.patch patches/scotchmetis_support.patch patches/series patches/source.dfsg.patch rules

trophime-guest at users.alioth.debian.org trophime-guest at users.alioth.debian.org
Wed Jun 27 20:12:25 UTC 2012


Author: trophime-guest
Date: Wed Jun 27 20:12:24 2012
New Revision: 45150

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45150
Log:
[svn-inject] Applying Debian modifications (0.7.3.1-1.1) to trunk

Added:
    packages/libmesh/trunk/debian/patches/exodusii.patch
    packages/libmesh/trunk/debian/patches/fparser.patch
    packages/libmesh/trunk/debian/patches/nemesis.patch
Modified:
    packages/libmesh/trunk/debian/changelog
    packages/libmesh/trunk/debian/control
    packages/libmesh/trunk/debian/libmesh-doc.docs
    packages/libmesh/trunk/debian/patches/scotchmetis_support.patch
    packages/libmesh/trunk/debian/patches/series
    packages/libmesh/trunk/debian/patches/source.dfsg.patch
    packages/libmesh/trunk/debian/rules

Modified: packages/libmesh/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/libmesh/trunk/debian/changelog?rev=45150&op=diff
==============================================================================
--- packages/libmesh/trunk/debian/changelog (original)
+++ packages/libmesh/trunk/debian/changelog Wed Jun 27 20:12:24 2012
@@ -1,3 +1,20 @@
+libmesh (0.7.3.1-1.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * New upstream release
+  * debian/control
+      - swith to pestc and slepc 3.2 (Closes: #662706)
+      - add libeigen3-dev to BuildDepends
+      - add libfparser-dev to BuildDepends
+      - add libexodusii-dev to BuildDepends
+      - add libglpk-dev to BuildDepends
+  * debian/rules
+      - rewrite get-orig-source
+      - update vtk version
+  * Remove ripout_old_gnuc.patch
+
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>  Wed, 27 Jun 2012 16:01:49 +0200
+
 libmesh (0.7.1-2) unstable; urgency=low
 
   * Team upload

Modified: packages/libmesh/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/libmesh/trunk/debian/control?rev=45150&op=diff
==============================================================================
--- packages/libmesh/trunk/debian/control (original)
+++ packages/libmesh/trunk/debian/control Wed Jun 27 20:12:24 2012
@@ -1,25 +1,28 @@
 Source: libmesh
 Priority: extra
 Maintainer:  Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
-Uploaders: "Adam C. Powell, IV" <hazelsct at debian.org>, Christophe Prud'homme <prudhomm at debian.org>, Alan Woodland <ajw05 at aber.ac.uk>
+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,
- libpetsc3.1-dev, libslepc3.1-dev, libscotchmetis-dev (>= 5.0.6-2),
+ 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
+ automake, mpi-default-dev, enscript, libexodusii-dev, libfparser-dev, libglpk-dev
 Build-Depends-Indep: graphviz, doxygen-latex
 Standards-Version: 3.9.2
 Section: libs
 Homepage: http://libmesh.sourceforge.net/
+Vcs-Git: git://git.debian.org/git/debian-science/packages/libmesh.git
+Vcs-Browser: http://git.debian.org/?p=debian-science/packages/libmesh.git
 
 Package: libmesh-dev
 Section: libdevel
 Architecture: all
-Depends: libmesh0.7.1 (>= ${binary:Version}), libpetsc3.1-dev, libslepc3.1-dev,
+Depends: libmesh0.7.3.1 (= ${binary:Version}), libpetsc3.2-dev, libslepc3.2-dev,
  libscotchmetis-dev (>= 5.0.6-2), libblas-dev | libblas-3gf.so, libnetcdf-dev,
  libtbb-dev, libvtk5-dev, ${misc:Depends} 
-Conflicts: libmesh0.6.1-dev, libmesh0.6.1-pure-dev, libmesh0.6.2-dev, libmesh0.6.2-pure-dev
-Replaces: libmesh0.6.1-dev, libmesh0.6.1-pure-dev, libmesh0.6.2-dev, libmesh0.6.2-pure-dev
+Conflicts: libmesh0.7.1-dev, libmesh0.7.1-pure-dev
+Replaces: libmesh0.7.1-dev, libmesh0.7.1-pure-dev
 Suggests: libmesh-doc
 Description: libMesh - A C++ Finite Element Library
  The libMesh library is a C++ framework for the numerical simulation of partial
@@ -33,12 +36,12 @@
  This package contains the C++ header files and shared library links (only
  needed for developing programs with libmesh).
 
-Package: libmesh0.7.1
+Package: libmesh0.7.3.1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libmesh0.6.4
-Replaces: libmesh0.6.4
+Conflicts: libmesh0.7.1
+Replaces: libmesh0.7.1
 Description: libMesh - A C++ Finite Element Library
  The libMesh library is a C++ framework for the numerical simulation of partial
  differential equations on serial and parallel platforms. Development began in

Modified: packages/libmesh/trunk/debian/libmesh-doc.docs
URL: http://svn.debian.org/wsvn/debian-science/packages/libmesh/trunk/debian/libmesh-doc.docs?rev=45150&op=diff
==============================================================================
--- packages/libmesh/trunk/debian/libmesh-doc.docs (original)
+++ packages/libmesh/trunk/debian/libmesh-doc.docs Wed Jun 27 20:12:24 2012
@@ -1,2 +1,3 @@
-libmesh/doc/*
+libmesh/doc/html
+libmesh/doc/latex
 debian/README.Debian

Added: packages/libmesh/trunk/debian/patches/exodusii.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/libmesh/trunk/debian/patches/exodusii.patch?rev=45150&op=file
==============================================================================
--- packages/libmesh/trunk/debian/patches/exodusii.patch (added)
+++ packages/libmesh/trunk/debian/patches/exodusii.patch Wed Jun 27 20:12:24 2012
@@ -1,0 +1,15 @@
+Index: libmesh-0.7.3.1/libmesh/m4/exodus.m4
+===================================================================
+--- libmesh-0.7.3.1.orig/libmesh/m4/exodus.m4	2012-04-11 16:01:37.000000000 +0200
++++ libmesh-0.7.3.1/libmesh/m4/exodus.m4	2012-06-27 17:30:05.000000000 +0200
+@@ -7,8 +7,8 @@
+ dnl where it might be installed...
+ 
+   if (test $enablenetcdf = yes -a $enableexodus = yes); then
+-     EXODUS_INCLUDE="-I$PWD/contrib/exodusii/Lib/include"
+-     EXODUS_LIBRARY="\$(EXTERNAL_LIBDIR)/libexodusii\$(libext)"
++     EXODUS_INCLUDE=""
++     EXODUS_LIBRARY="-lexoIIv2c"
+      AC_DEFINE(HAVE_EXODUS_API, 1, [Flag indicating whether the library will be compiled with Exodus support])
+      AC_MSG_RESULT(<<< Configuring library with Exodus API support >>>)
+   else

Added: packages/libmesh/trunk/debian/patches/fparser.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/libmesh/trunk/debian/patches/fparser.patch?rev=45150&op=file
==============================================================================
--- packages/libmesh/trunk/debian/patches/fparser.patch (added)
+++ packages/libmesh/trunk/debian/patches/fparser.patch Wed Jun 27 20:12:24 2012
@@ -1,0 +1,15 @@
+Index: libmesh-0.7.3.1/libmesh/m4/fparser.m4
+===================================================================
+--- libmesh-0.7.3.1.orig/libmesh/m4/fparser.m4	2012-04-11 16:01:37.000000000 +0200
++++ libmesh-0.7.3.1/libmesh/m4/fparser.m4	2012-06-27 17:31:19.000000000 +0200
+@@ -7,8 +7,8 @@
+ dnl where it might be installed...
+ 
+   if (test $enablefparser = yes); then
+-     FPARSER_INCLUDE="-I$PWD/contrib/fparser"
+-     FPARSER_LIBRARY="\$(EXTERNAL_LIBDIR)/libfparser\$(libext)"
++     FPARSER_INCLUDE=""
++     FPARSER_LIBRARY="-lfparser"
+      AC_DEFINE(HAVE_FPARSER, 1, [Flag indicating whether the library will be compiled with fparser support])
+      AC_MSG_RESULT(<<< Configuring library with fparser support >>>)
+   else

Added: packages/libmesh/trunk/debian/patches/nemesis.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/libmesh/trunk/debian/patches/nemesis.patch?rev=45150&op=file
==============================================================================
--- packages/libmesh/trunk/debian/patches/nemesis.patch (added)
+++ packages/libmesh/trunk/debian/patches/nemesis.patch Wed Jun 27 20:12:24 2012
@@ -1,0 +1,15 @@
+Index: libmesh-0.7.3.1/libmesh/m4/nemesis.m4
+===================================================================
+--- libmesh-0.7.3.1.orig/libmesh/m4/nemesis.m4	2012-04-11 16:01:37.000000000 +0200
++++ libmesh-0.7.3.1/libmesh/m4/nemesis.m4	2012-06-27 17:34:14.000000000 +0200
+@@ -7,8 +7,8 @@
+ dnl where it might be installed...
+ 
+   if (test $enablenetcdf = yes -a $enableexodus = yes -a $enablenemesis = yes); then
+-     NEMESIS_INCLUDE="-I$PWD/contrib/nemesis/Lib"
+-     NEMESIS_LIBRARY="\$(EXTERNAL_LIBDIR)/libnemesis\$(libext)"
++     NEMESIS_INCLUDE=""
++     NEMESIS_LIBRARY="-lnemesis"
+      AC_DEFINE(HAVE_NEMESIS_API, 1, [Flag indicating whether the library will be compiled with Nemesis support])
+      AC_MSG_RESULT(<<< Configuring library with Nemesis API support >>>)
+   else

Modified: packages/libmesh/trunk/debian/patches/scotchmetis_support.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/libmesh/trunk/debian/patches/scotchmetis_support.patch?rev=45150&op=diff
==============================================================================
--- packages/libmesh/trunk/debian/patches/scotchmetis_support.patch (original)
+++ packages/libmesh/trunk/debian/patches/scotchmetis_support.patch Wed Jun 27 20:12:24 2012
@@ -1,15 +1,16 @@
 Look for metis includes and libs in the scotch metis package places.
 
-Index: libmesh-0.7.1/libmesh/m4/metis.m4
+Index: libmesh-0.7.3.1/libmesh/m4/metis.m4
 ===================================================================
---- libmesh-0.7.1.orig/libmesh/m4/metis.m4	2011-08-02 10:23:52.000000000 +0200
-+++ libmesh-0.7.1/libmesh/m4/metis.m4	2011-08-02 10:24:49.000000000 +0200
-@@ -7,11 +7,11 @@
- dnl -------------------------------------------------------------
- AC_DEFUN([CONFIGURE_METIS], 
+--- libmesh-0.7.3.1.orig/libmesh/m4/metis.m4	2012-06-27 17:55:08.000000000 +0200
++++ libmesh-0.7.3.1/libmesh/m4/metis.m4	2012-06-27 17:58:47.000000000 +0200
+@@ -5,12 +5,12 @@
  [
--  AC_CHECK_FILE(./contrib/metis/Lib/metis.h,
-+  AC_CHECK_FILE(/usr/include/metis/metis.h,
+   AC_LANG_PUSH([C])
+   OLD_CPPFLAGS=$CPPFLAGS
+-  CPPFLAGS="-Icontrib/metis/Lib $CPPFLAGS"
++  CPPFLAGS="-I/usr/include/metis $CPPFLAGS"
+   AC_CHECK_HEADER(metis.h,
  	        [ 
 -	          METIS_INCLUDE_PATH=$PWD/contrib/metis/Lib
 +	          METIS_INCLUDE_PATH=/usr/include/metis

Modified: packages/libmesh/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/libmesh/trunk/debian/patches/series?rev=45150&op=diff
==============================================================================
--- packages/libmesh/trunk/debian/patches/series (original)
+++ packages/libmesh/trunk/debian/patches/series Wed Jun 27 20:12:24 2012
@@ -1,6 +1,9 @@
 source.dfsg.patch
 scotchmetis_support.patch
 netcdf_support.patch
-ripout_old_gnuc.patch
+#ripout_old_gnuc.patch
 wrong_path_doc.patch
 
+exodusii.patch
+fparser.patch
+nemesis.patch

Modified: packages/libmesh/trunk/debian/patches/source.dfsg.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/libmesh/trunk/debian/patches/source.dfsg.patch?rev=45150&op=diff
==============================================================================
--- packages/libmesh/trunk/debian/patches/source.dfsg.patch (original)
+++ packages/libmesh/trunk/debian/patches/source.dfsg.patch Wed Jun 27 20:12:24 2012
@@ -5,77 +5,101 @@
 ===================================================================
 --- libmesh-0.7.1.orig/libmesh/contrib/Makefile	2011-04-23 01:11:48.000000000 +0200
 +++ libmesh-0.7.1/libmesh/contrib/Makefile	2011-08-02 10:17:50.000000000 +0200
-@@ -3,30 +3,12 @@
- #
- all:
- 	@echo "----------------------------------------------"
--	@echo "------- Building Contributed Packages --------"
-+	@echo "------- Building Contributed Packages (DFSG) -"
+@@ -6,41 +6,9 @@
+ 	@echo "------- Building Contributed Packages --------"
  	@echo "----------------------------------------------"
  	@echo ""
+-	@echo "--- Building fparser -------------------------"
+-	@$(MAKE) -C fparser $(MAKECMDGOALS)
+-	@echo ""
+-	@echo "--- Building gmv -----------------------------"
+-	@$(MAKE) -C gmv          $(MAKECMDGOALS)
+-	@echo ""
 -	@echo "--- Building LASPACK -------------------------"
 -	@$(MAKE) -C laspack      $(MAKECMDGOALS)
 -	@echo ""
+-	@echo "--- Building libgzstream ---------------------"
+-	@$(MAKE) -C gzstream     $(MAKECMDGOALS)
+-	@echo ""
+ 	@echo "--- Building libHilbert ----------------------"
+ 	@$(MAKE) -C libHilbert $(MAKECMDGOALS)
+ 	@echo ""
 -	@echo "--- Building Metis ---------------------------"
 -	@$(MAKE) -C metis/Lib    $(MAKECMDGOALS)
--	@echo ""
 -	@echo "--- Building Parmetis ------------------------"
 -	@$(MAKE) -C parmetis/Lib $(MAKECMDGOALS)
+-	@echo ""
+-	@echo "--- Building netCDF --------------------------"
+-	@$(MAKE) -C netcdf/Lib   $(MAKECMDGOALS)
+-	@echo "--- Building ExodusII ------------------------"
+-	@$(MAKE) -C exodusii/Lib/src $(MAKECMDGOALS)
+-	@echo "--- Building Nemesis -------------------------"
+-	@$(MAKE) -C nemesis/Lib $(MAKECMDGOALS)
 -	@echo ""
 -	@echo "--- Building sfcurves ------------------------"
 -	@$(MAKE) -C sfcurves     $(MAKECMDGOALS)
 -	@echo ""
- 	@echo "--- Building libgzstream ---------------------"
- 	@$(MAKE) -C gzstream     $(MAKECMDGOALS)
- 	@echo ""
--	@echo "--- Building TetGen ---------------------"
+-	@echo "--- Building TetGen --------------------------"
 -	@$(MAKE) -C tetgen       $(MAKECMDGOALS)
 -	@echo ""
--	@echo "--- Building triangle ---------------------"
+-	@echo "--- Building triangle ------------------------"
 -	@$(MAKE) -C triangle     $(MAKECMDGOALS)
--	@echo ""
- 	@echo "--- Building gmv ---------------------"
- 	@$(MAKE) -C gmv          $(MAKECMDGOALS)
  	@echo ""
-@@ -53,13 +35,7 @@
+ 	@echo "----------------------------------------------"
+ 	@echo "----- Done Building Contributed Packages -----"
+@@ -53,18 +21,7 @@
  #
  clean:
  	@rm -f *~
+-	@$(MAKE) -C fparser      $(MAKECMDGOALS)
 -	@$(MAKE) -C laspack      $(MAKECMDGOALS)
 -	@$(MAKE) -C metis/Lib    $(MAKECMDGOALS)
 -	@$(MAKE) -C parmetis/Lib $(MAKECMDGOALS)
 -	@$(MAKE) -C sfcurves     $(MAKECMDGOALS)
- 	@$(MAKE) -C gzstream     $(MAKECMDGOALS)
+-	@$(MAKE) -C gzstream     $(MAKECMDGOALS)
 -	@$(MAKE) -C tetgen       $(MAKECMDGOALS)
 -	@$(MAKE) -C triangle     $(MAKECMDGOALS)
  	@$(MAKE) -C gmv          $(MAKECMDGOALS)
- 	@$(MAKE) -C netcdf/Lib   $(MAKECMDGOALS)
- 	@$(MAKE) -C exodusii/Lib/src $(MAKECMDGOALS)
-@@ -71,13 +47,7 @@
+-	@$(MAKE) -C netcdf/Lib   $(MAKECMDGOALS)
+-	@$(MAKE) -C exodusii/Lib/src $(MAKECMDGOALS)
+-	@$(MAKE) -C nemesis/Lib  $(MAKECMDGOALS)
+ 	@$(MAKE) -C libHilbert   $(MAKECMDGOALS)
+ 
+ #
+@@ -72,18 +29,7 @@
  #
  clobber:
  	@$(MAKE) clean
+-	@$(MAKE) -C fparser      $(MAKECMDGOALS)
 -	@$(MAKE) -C laspack      $(MAKECMDGOALS)
 -	@$(MAKE) -C metis/Lib    $(MAKECMDGOALS)
 -	@$(MAKE) -C parmetis/Lib $(MAKECMDGOALS)
 -	@$(MAKE) -C sfcurves     $(MAKECMDGOALS)
- 	@$(MAKE) -C gzstream     $(MAKECMDGOALS)
+-	@$(MAKE) -C gzstream     $(MAKECMDGOALS)
 -	@$(MAKE) -C tetgen       $(MAKECMDGOALS)
 -	@$(MAKE) -C triangle     $(MAKECMDGOALS)
  	@$(MAKE) -C gmv          $(MAKECMDGOALS)
- 	@$(MAKE) -C netcdf/Lib   $(MAKECMDGOALS)
- 	@$(MAKE) -C exodusii/Lib/src $(MAKECMDGOALS)
-@@ -89,13 +59,7 @@
+-	@$(MAKE) -C netcdf/Lib   $(MAKECMDGOALS)
+-	@$(MAKE) -C exodusii/Lib/src $(MAKECMDGOALS)
+-	@$(MAKE) -C nemesis/Lib   $(MAKECMDGOALS)
+ 	@$(MAKE) -C libHilbert   $(MAKECMDGOALS)
+ 
+ #
+@@ -91,17 +37,6 @@
  #
  distclean:
  	@$(MAKE) clobber
+-	@$(MAKE) -C fparser      $(MAKECMDGOALS)
 -	@$(MAKE) -C laspack      $(MAKECMDGOALS)
 -	@$(MAKE) -C metis/Lib    $(MAKECMDGOALS)
 -	@$(MAKE) -C parmetis/Lib $(MAKECMDGOALS)
 -	@$(MAKE) -C sfcurves     $(MAKECMDGOALS)
- 	@$(MAKE) -C gzstream     $(MAKECMDGOALS)
+-	@$(MAKE) -C gzstream     $(MAKECMDGOALS)
 -	@$(MAKE) -C tetgen       $(MAKECMDGOALS)
 -	@$(MAKE) -C triangle     $(MAKECMDGOALS)
  	@$(MAKE) -C gmv          $(MAKECMDGOALS)
- 	@$(MAKE) -C netcdf/Lib   $(MAKECMDGOALS)
- 	@$(MAKE) -C exodusii/Lib/src $(MAKECMDGOALS)
+-	@$(MAKE) -C netcdf/Lib   $(MAKECMDGOALS)
+-	@$(MAKE) -C exodusii/Lib/src $(MAKECMDGOALS)
+-	@$(MAKE) -C nemesis/Lib   $(MAKECMDGOALS)
+ 	@$(MAKE) -C libHilbert   $(MAKECMDGOALS)
+ 	@rm -rf lib/*_dbg lib/*_opt lib/*_prof lib/*_oprof lib/*_devel

Modified: packages/libmesh/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/libmesh/trunk/debian/rules?rev=45150&op=diff
==============================================================================
--- packages/libmesh/trunk/debian/rules (original)
+++ packages/libmesh/trunk/debian/rules Wed Jun 27 20:12:24 2012
@@ -8,7 +8,7 @@
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-LIBMESH_VERSION=0.7.1
+LIBMESH_VERSION=0.7.3.1
 
 # shared library versions, option 1
 version=2.0.5
@@ -28,10 +28,10 @@
 	   --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
 	   --disable-laspack --disable-sfc --disable-gzstreams --disable-gmv \
 	   --disable-tecplot --disable-parmetis --disable-tetgen \
-	   --disable-triangle --disable-exodus --disable-libHilbert \
+	   --disable-triangle --enable-exodus --disable-libHilbert \
 	   --with-mpi=/usr --with-cxx=mpicxx --with-cc=mpicc --with-f77=mpif77\
 	   --enable-second --enable-ifem --enable-metis --enable-perflog \
-	   --enable-vtk --with-vtk-include=/usr/include/vtk-5.6 --with-tbb=/usr
+	   --enable-vtk --with-vtk-include=/usr/include/vtk-5.8 --with-tbb=/usr
 
 build: build-arch
 build-arch: libmesh/config.status
@@ -50,7 +50,7 @@
 	rm -f build-arch
 	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
 
-	[ ! -f libmesh/Make.common ] || $(MAKE) -C libmesh distclean
+	[ ! -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 '{}' ';'
 
@@ -83,18 +83,23 @@
 	dh_testroot -i
 	dh_installchangelogs -i libmesh/CHANGES
 	dh_installdocs -i
-	mv debian/libmesh-doc/usr/share/doc/libmesh-doc/man \
-	  debian/libmesh-doc/usr/share/
+	
+	# Remove useless man pages 
+	-rm -rf debian/libmesh-doc/usr/share/doc/libmesh-doc/man
+	
 	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"
-	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
+	
+	# 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_compress -i -X.php -X.js -X.pdf
 	dh_fixperms -i
 	dh_installdeb -i
@@ -123,17 +128,27 @@
 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')
+DEB_STRIPPED_UPSTREAM_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -n -e 's/\.*$$//p')
+
 get-orig-source:
-	wget http://qa.debian.org/watch/sf.php/libmesh/libmesh-0.6.4.tar.gz
-	tar xzf libmesh-0.6.4.tar.gz
-	rm -r libmesh-0.6.4/libmesh/contrib/laspack
-	rm -r libmesh-0.6.4/libmesh/contrib/metis
-	rm -r libmesh-0.6.4/libmesh/contrib/parmetis
-	rm -r libmesh-0.6.4/libmesh/contrib/sfcurves
-	rm -r libmesh-0.6.4/libmesh/contrib/tecplot
-	rm -r libmesh-0.6.4/libmesh/contrib/tetgen
-	rm -r libmesh-0.6.4/libmesh/contrib/triangle
-	find libmesh-0.6.4 -type f -name '.*' -exec rm '{}' ';'
-	mv libmesh-0.6.4 libmesh-0.6.4.dfsg
-	tar czf libmesh_0.6.4.dfsg.orig.tar.gz libmesh-0.6.4.dfsg
-	rm -r libmesh-0.6.4.dfsg libmesh-0.6.4.tar.gz
+	mkdir -p $(USCAN_DESTDIR)
+	uscan --force-download  --no-symlink --verbose --destdir $(USCAN_DESTDIR)
+	tar -C $(USCAN_DESTDIR) -xzf $(USCAN_DESTDIR)/libmesh-$(DEB_STRIPPED_UPSTREAM_VERSION).tar.gz
+	rm -f $(USCAN_DESTDIR)/libmesh*.tar.gz
+	
+	# Remove 
+	rm -r $(USCAN_DESTDIR)/libmesh-$(DEB_STRIPPED_UPSTREAM_VERSION)/libmesh/contrib/laspack
+	rm -r $(USCAN_DESTDIR)/libmesh-$(DEB_STRIPPED_UPSTREAM_VERSION)/libmesh/contrib/metis
+	rm -r $(USCAN_DESTDIR)/libmesh-$(DEB_STRIPPED_UPSTREAM_VERSION)/libmesh/contrib/parmetis
+	rm -r $(USCAN_DESTDIR)/libmesh-$(DEB_STRIPPED_UPSTREAM_VERSION)/libmesh/contrib/sfcurves
+	rm -r $(USCAN_DESTDIR)/libmesh-$(DEB_STRIPPED_UPSTREAM_VERSION)/libmesh/contrib/tecplot
+	rm -r $(USCAN_DESTDIR)/libmesh-$(DEB_STRIPPED_UPSTREAM_VERSION)/libmesh/contrib/tetgen
+	rm -r $(USCAN_DESTDIR)/libmesh-$(DEB_STRIPPED_UPSTREAM_VERSION)/libmesh/contrib/triangle
+	
+	find $(USCAN_DESTDIR)/libmesh-$(DEB_STRIPPED_UPSTREAM_VERSION) -type f -name '.*' -exec rm '{}' ';'
+	cd $(USCAN_DESTDIR) && GZIP=-9 tar -czf \
+	   $(CURDIR)/libmesh_$(DEB_UPSTREAM_VERSION).orig.tar.gz \
+	   libmesh-$(DEB_STRIPPED_UPSTREAM_VERSION)
+	rm -rf $(USCAN_DESTDIR)/libmesh-$(DEB_STRIPPED_UPSTREAM_VERSION)




More information about the debian-science-commits mailing list