[silo-llnl] 84/96: Undo python3 for now

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository silo-llnl.

commit 0aceda05b47dd1403f27699668257d1f1d9bbafa
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu May 1 22:58:06 2014 +0100

    Undo python3 for now
---
 debian/changelog |  3 +--
 debian/control   | 20 --------------------
 debian/rules     |  4 ++--
 3 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2b984be..7e25267 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,13 @@
 silo-llnl (4.9.1-1) unstable; urgency=low
 
   * New upstream release. Closes: #691471.
-  * Add Python3 support
   * Build against Qt5 rather than Qt4.
   * Now set debhelper dependency to 9. 
   * Set Standards-Version: 3.9.5. No changes required.
   * Patch for typo spotted by Lintian.
   * Now use xz compression.
 
- -- Alastair McKinstry <mckinstry at debian.org>  Wed, 30 Apr 2014 16:48:49 +0100
+ -- Alastair McKinstry <mckinstry at debian.org>  Thu, 01 May 2014 22:56:57 +0100
 
 silo-llnl (4.8-13) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index ffa1e51..9357b6b 100644
--- a/debian/control
+++ b/debian/control
@@ -102,23 +102,3 @@ Description: Python interface to the SILO Scientific I/O library
  other useful objects to address various scientific computing application
  needs. Although the Silo library is a serial library, it has some key features
  which enable it to be applied quite effectively and scalable in parallel.
-
-
-Package: python3-silo
-Section: python
-Architecture: any
-Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}, libsiloh5-0 (=${binary:Version})
-Description: Python interface to the SILO Scientific I/O library
- This is a Python3 interface to SILO, a scientific I/O library.
- .
- Silo supports gridless (point) meshes, structured meshes, unstructured-zoo
- and unstructured-arbitrary-polyhedral meshes, block structured AMR meshes,
- constructive solid geometry (CSG) meshes, piecewise-constant
- (e.g. zone-centered) and piecewise-linear (e.g. node-centered) variables
- defined on the node, edge, face or volume elements of meshes as well as
- the decomposition of meshes into arbitrary subset hierarchies including
- materials and mixing materials. In addition, Silo supports a wide variety of
- other useful objects to address various scientific computing application
- needs. Although the Silo library is a serial library, it has some key features
- which enable it to be applied quite effectively and scalable in parallel.
-
diff --git a/debian/rules b/debian/rules
index c7c7c30..32be3fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,9 +23,9 @@ endif
 QT:=qt5
 QT_INCLUDES:=-I/usr/include/$(QT) -I/usr/include/$(QT)/QtGui -I/usr/include/$(QT)/QtCore -I/usr/include/$(QT)/QtWidgets
 
-DEFAULT_PYTHON:=`py3versions -d`
+DEFAULT_PYTHON:=`pyversions -d`
 PYVERS:= `pyversions -s`
-PY3VERS:= `py3versions -s`
+PY3VERS:= 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 QT_BINDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/bin
 LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/silo-llnl.git