r46853 - in /packages/fenics/dolfin/trunk/debian: changelog control rules

[johannr-guest at users.alioth.debian.org]

Author: johannr-guest
Date: Mon Aug 11 13:19:38 2014
New Revision: 46853

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46853
Log:
- Close bugs in changelog.
- Remove Armadillo (no longer used by DOLFIN).
- Disable support for SCOTCH.
- Use swig instead of swig2.0.
- Set PERL_LWP_SSL_VERIFY_HOSTNAME=0 to fix get-orig-source target.


Modified:
    packages/fenics/dolfin/trunk/debian/changelog
    packages/fenics/dolfin/trunk/debian/control
    packages/fenics/dolfin/trunk/debian/rules

Modified: packages/fenics/dolfin/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/changelog?rev=46853&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/changelog	(original)
+++ packages/fenics/dolfin/trunk/debian/changelog	Mon Aug 11 13:19:38 2014
@@ -10,17 +10,21 @@
     - Add python-ffc (>= 1.4.0) to Build-Depends.
     - Replace swig2.0 with swig in Build-Depends.
     - Remove ufc and python-ufc from Build-Depends and from Depends for
-      binary package libdolfin1.4-dev and python-dolfin.
+      binary package libdolfin1.4-dev and python-dolfin (closes: #755727).
     - Add libdolfin1.3-dev in Conflicts and Replaces for binary package
       libdolfin1.4-dev.
+    - Remove libarmadillo-dev from {Build-}Depends.
+    - Remove libptscotch-dev from {Build-}Depends (closes: #741165).
   * Move debian/libdolfin1.3.install -> debian/libdolfin1.4.install
     and debian/libdolfin1.3-dev.install -> debian/libdolfin1.4-dev.install.
   * debian/rules:
     - Enable CGAL again (accidentally disabled in last upload).
     - No longer needed to remove .pyc files in get-orig-source target.
+    - Add "export PERL_LWP_SSL_VERIFY_HOSTNAME=0" to get-orig-source
+      target to help uscan download from Bitucket.
   * Remove patch for bug in Boost (fixed).
 
- -- Johannes Ring <johannr at simula.no>  Wed, 04 Jun 2014 09:56:04 +0200
+ -- Johannes Ring <johannr at simula.no>  Mon, 11 Aug 2014 09:57:36 +0200
 
 dolfin (1.3.0+dfsg-2) unstable; urgency=medium
 

Modified: packages/fenics/dolfin/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/control?rev=46853&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/control	(original)
+++ packages/fenics/dolfin/trunk/debian/control	Mon Aug 11 13:19:38 2014
@@ -21,10 +21,8 @@
  libboost-timer-dev,
  libboost-chrono-dev,
  libsuitesparse-dev,
- libptscotch-dev,
  libpetsc3.4.2-dev [!armel !kfreebsd-amd64 !kfreebsd-i386 !hurd-i386],
  libslepc3.4.2-dev [!armel !kfreebsd-amd64 !kfreebsd-i386 !hurd-i386],
- libarmadillo-dev,
  libcgal-dev [!armel !armhf !mips],
  libhdf5-mpi-dev,
  libvtk5-dev,
@@ -56,10 +54,8 @@
  libboost-timer-dev,
  libboost-chrono-dev,
  libsuitesparse-dev,
- libptscotch-dev,
  libpetsc3.4.2-dev [!armel !kfreebsd-amd64 !kfreebsd-i386 !hurd-i386],
  libslepc3.4.2-dev [!armel !kfreebsd-amd64 !kfreebsd-i386 !hurd-i386],
- libarmadillo-dev,
  cmake (>= 2.8.0),
  libcgal-dev [!armel !armhf !mips],
  libhdf5-mpi-dev,

Modified: packages/fenics/dolfin/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/rules?rev=46853&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/rules	(original)
+++ packages/fenics/dolfin/trunk/debian/rules	Mon Aug 11 13:19:38 2014
@@ -44,8 +44,9 @@
 	-D DOLFIN_ENABLE_QT:BOOL=ON \
 	-D DOLFIN_ENABLE_PARMETIS:BOOL=OFF \
 	-D DOLFIN_ENABLE_PASTIX:BOOL=OFF \
+	-D DOLFIN_ENABLE_SCOTCH:BOOL=OFF \
 	-D DOLFIN_ENABLE_UNIT_TESTS:BOOL=OFF \
-	-D SWIG_EXECUTABLE:FILEPATH=/usr/bin/swig2.0 \
+	-D SWIG_EXECUTABLE:FILEPATH=/usr/bin/swig \
         -D DOLFIN_ENABLE_MPI:BOOL=$(ENABLE_MPI) \
 	-D PETSC_DIR:PATH=/usr/lib/petscdir/3.4.2 \
 	-D SLEPC_DIR:PATH=/usr/lib/slepcdir/3.4.2 \
@@ -104,11 +105,11 @@
 	dh_numpy
 
 override_dh_gencontrol:
-	# We have a tight dependency on swig2.0 - #675207
+	# We have a tight dependency on swig - #675207
 	set -e; \
-	swig_version=$$(dpkg-query -W swig2.0 | cut -f 2 | cut -d- -f 1); \
+	swig_version=$$(dpkg-query -W swig | cut -f 2 | cut -d- -f 1); \
 	next_swig_version="$${swig_version%.*}.$$(($${swig_version##*.} + 1))"; \
-	echo "swig:Depends=swig2.0 (>= $$swig_version), swig2.0 (<< $$next_swig_version~)" >> debian/python-dolfin.substvars
+	echo "swig:Depends=swig (>= $$swig_version), swig (<< $$next_swig_version~)" >> debian/python-dolfin.substvars
 	dh_gencontrol
 
 override_dh_strip:
@@ -129,6 +130,7 @@
 get-orig-source:
 	set -ex ; \
 	TMPDIR=`mktemp -d $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig.XXXXXX` ; \
+	export PERL_LWP_SSL_VERIFY_HOSTNAME=0; \
 	uscan --force-download --check-dirname-level 0 --destdir "$$TMPDIR" --download-version $(DEB_STRIPPED_UPSTREAM_VERSION) --upstream-version $(DEB_STRIPPED_UPSTREAM_VERSION); \
 	tar -C "$$TMPDIR" --strip-components 1 -xzf "$$TMPDIR"/$(DEB_SOURCE_PACKAGE)_$(DEB_STRIPPED_UPSTREAM_VERSION).orig.tar.gz ; \
 	rm -rf "$$TMPDIR"/demo/undocumented/waveguide/waveguide_TM_cutoff_modes.pdf ; \