r38307 - in /packages/fenics/instant/trunk/debian: changelog control rules

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

Author: johannr-guest
Date: Fri Apr  1 13:17:52 2011
New Revision: 38307

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38307
Log:
* Move from python-central to dh_python2.
* Remove old fields Conflicts, Provides, and Replaces from
  debian/control.
* Add swig2.0 to Depends field as an alternative to swig.
* Minor fixes in get-orig-source target.

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

Modified: packages/fenics/instant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/instant/trunk/debian/changelog?rev=38307&op=diff
==============================================================================
--- packages/fenics/instant/trunk/debian/changelog (original)
+++ packages/fenics/instant/trunk/debian/changelog Fri Apr  1 13:17:52 2011
@@ -1,3 +1,18 @@
+instant (0.9.9-2) UNRELEASED; urgency=low
+
+  * Move from python-central to dh_python2 (closes: #616849).
+    - Remove python-central from Build-Depends.
+    - Bump minimum required python-all package version to 2.6.6-3~.
+    - Remove XB-Python-Version line.
+    - Bump minimum required cdbs version to 0.4.90~.
+    - Remove DEB_PYTHON_SYSTEM=pycentral from debian/rules.
+    - Replace XS-Python-Version with X-Python-Version.
+  * Remove old fields Conflicts, Provides, and Replaces from
+    debian/control.
+  * Add swig2.0 to Depends field as an alternative to swig.
+
+ -- Johannes Ring <johannr at simula.no>  Fri, 01 Apr 2011 14:45:22 +0200
+
 instant (0.9.9-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/fenics/instant/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/instant/trunk/debian/control?rev=38307&op=diff
==============================================================================
--- packages/fenics/instant/trunk/debian/control (original)
+++ packages/fenics/instant/trunk/debian/control Fri Apr  1 13:17:52 2011
@@ -3,10 +3,9 @@
 Priority: extra
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Christophe Prud'homme <prudhomm at debian.org>, Johannes Ring <johannr at simula.no>
-Build-Depends: cdbs (>= 0.4.49), debhelper (>= 7), python-all,
- python-central (>= 0.6.0)
+Build-Depends: cdbs (>= 0.4.90~), debhelper (>= 7), python-all (>= 2.6.6-3~)
 Standards-Version: 3.9.1
-XS-Python-Version: >= 2.5
+X-Python-Version: >= 2.5
 Homepage: http://www.fenicsproject.org
 DM-Upload-Allowed: yes
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/instant/trunk
@@ -14,13 +13,9 @@
 
 Package: python-instant
 Architecture: all
-XB-Python-Version: ${python:Versions}
-Depends: pkg-config, swig, python-dev, build-essential, ${python:Depends},
- ${misc:Depends}
+Depends: pkg-config, swig | swig2.0, python-dev, build-essential,
+ ${python:Depends}, ${misc:Depends}
 Recommends: python-numpy
-Conflicts: instant
-Provides: instant
-Replaces: instant
 Description: simple inlining of C / C++ code in Python
  Instant is a Python module that allows for instant inlining of C and C++ code
  in Python. It is a small Python module built on top of SWIG and Distutils.

Modified: packages/fenics/instant/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/instant/trunk/debian/rules?rev=38307&op=diff
==============================================================================
--- packages/fenics/instant/trunk/debian/rules (original)
+++ packages/fenics/instant/trunk/debian/rules Fri Apr  1 13:17:52 2011
@@ -1,6 +1,4 @@
 #!/usr/bin/make -f
-
-DEB_PYTHON_SYSTEM = pycentral
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
@@ -8,9 +6,8 @@
 DEB_COMPRESS_EXCLUDE := .py
 
 USCAN_DESTDIR := $(CURDIR)
-SRC_VERSION := $(shell dpkg-parsechangelog | \
-		sed -ne 's/^Version: \(.*\)-.*/\1/p')
 
 get-orig-source:
 	uscan --force-download --verbose --destdir $(USCAN_DESTDIR) \
-	 --download-version $(SRC_VERSION) --upstream-version $(SRC_VERSION)
+	 --download-version $(DEB_UPSTREAM_VERSION) \
+	 --upstream-version $(DEB_UPSTREAM_VERSION)