Merge lp:~tribaal/storm/storm-packaging-fix-python-central into lp:~landscape/storm/storm-packaging-lds

[Chris Glass]

Fixes the packaging for trusty.

[lp:~tribaal/storm/storm-packaging-fix-python-central]

22. By Chris Glass on 2014-01-30

Changed maintainer to point to us (<email address hidden>)

[Andreas Hasenack (ahasenack)]

Try with this patch to disable the test suite if it's building in a ppa. I grabbed this trick from juju-deployer, which disables tests that require networking if DEB_BUILD_ARCH or TESTING_ENVIRONMENT are set.

=== modified file 'rules'
--- rules revid:<email address hidden>
+++ rules 2014-01-30 19:18:09 +0000
@@ -10,11 +10,15 @@
  rm -rf storm.egg-info

 override_dh_auto_test:
+# don't run tests if the user set nocheck
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
- for python in $(shell pyversions -r); do \
- $$python setup.py test; \
- $$python-dbg setup.py test; \
- done
+# don't run tests if in a ppa builder
+ ifeq (,$(DEB_BUILD_ARCH))
+ for python in $(shell pyversions -r); do \
+ $$python setup.py test; \
+ $$python-dbg setup.py test; \
+ done
+ endif
 endif

 override_dh_strip:

Watch tab/spaces above: the "ifeq" and "endif" statements use spaces, the rest uses tabs (makefile syntax).

[Andreas Hasenack (ahasenack)]

Actually, juju-deployer checks this this:

TEST_OFFLINE = ("DEB_BUILD_ARCH" in os.environ or "TEST_OFFLINE" in os.environ)

[Andreas Hasenack (ahasenack)]

Forget that DEB_BUILD_ARCH test, doesn't seem to work, I get it defined when building locally.

[Andreas Hasenack (ahasenack)]

Actually, it might work :)

[Andreas Hasenack (ahasenack)]

Actually², let's disable tests during package build for now.

[Andreas Hasenack (ahasenack)]

Ok, with this patch http://pastebin.ubuntu.com/6845731/ it builds and runs *some* tests.

I also removed the Vcs options, no sense in pointing to that if we are keeping our own packaging branch I think.

Here is a build log with the patch applied:
http://pastebin.ubuntu.com/6845736/

review: Needs Fixing

[Andreas Hasenack (ahasenack)]

http://pastebin.ubuntu.com/6845894/ buildlog for precise, also with the above patch applied.

[lp:~tribaal/storm/storm-packaging-fix-python-central]

23. By Chris Glass on 2014-01-31

Applying Andreas's patch to change the way tests are run.

[Chris Glass (tribaal)]

Patch applied - it seems to build fine indeed (https://launchpad.net/~tribaal/+archive/storm-trunk-ppa).
Thanks a lot!

[Andreas Hasenack (ahasenack)]

Nice, +1

review: Approve

=== modified file 'changelog'
--- changelog	2013-08-05 21:41:57 +0000
+++ changelog	2014-01-31 08:21:22 +0000
@@ -1,3 +1,9 @@
+storm (0.20.0.99-0landscape2) trusty; urgency=medium
+
+  * Fixed pacakging for trusty since python-central is not available anymore.
+
+ -- Christopher Glass (Canonical) <[e-mail]>  Wed, 29 Jan 2014 14:20:35 +0100
+
 storm (0.20.0.99-0landscape1) precise; urgency=low
 
   * Bump version to 0.20.0.99, taken from the __init__.py file.

=== modified file 'compat'
--- compat	2011-08-05 19:47:25 +0000
+++ compat	2014-01-31 08:21:22 +0000
@@ -1,1 +1,1 @@
-5
+7

=== modified file 'control'
--- control	2012-03-29 15:17:05 +0000
+++ control	2014-01-31 08:21:22 +0000
@@ -1,41 +1,81 @@
 Source: storm
 Section: python
 Priority: extra
-Maintainer: Ubuntu MOTU Developers <[e-mail]>
-Build-Depends: cdbs (>= 0.4.49), debhelper (>= 5.0.38), python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6),
- python-setuptools, python-zope.security (>= 3.7.2), python-fixtures (>= 0.3.5)
-Standards-Version: 3.8.3
-XS-Python-Version: all
+Maintainer: Landscape Developers <[e-mail]>
+Build-Depends:
+ debhelper (>= 7.0.50~),
+ python-all-dbg (>= 2.6.6-3~),
+ python-all-dev (>= 2.6.6-3~),
+ python-setuptools,
+ python-fixtures
+Standards-Version: 3.9.2
+X-Python-Version: >= 2.4
 Homepage: http://storm.canonical.com/
 
 Package: python-storm
+Maintainer: Landscape Developers <[e-mail]>
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}
-Provides: ${python:Provides}
-Suggests: python-psycopg2, python-mysqldb, python-pysqlite2
-XB-Python-Version: ${python:Versions}
+Suggests: python-psycopg2 | python-mysqldb | python-pysqlite2
 Description: object-relational mapper (ORM) for Python
- Storm is an object-relation mapper (ORM) for the Python language.  In
- simple terms, that kind of system allows rows from a relational
- database to be seen as objects in an object-oriented language like
- Python.
- .
- Features:
-  * Clean and lightweight API offers a short learning curve and long-
-    erm maintainability.
-  * Storm is developed in a test-driven manner. An untested line of
-    code is considered a bug.
-  * Storm needs no special class constructors, nor imperative base
-    classes.
-  * Storm is well designed (different classes have very clear
-    boundaries, with small and clean public APIs).
-  * Designed from day one to work both with thin relational databases,
-    such as SQLite, and big iron systems like PostgreSQL and MySQL.
-  * Storm is easy to debug, since its code is written with a KISS
-    principle, and thus is easy to understand.
-  * Designed from day one to work both at the low end, with trivial
-    small databases, and the high end, with applications accessing
-    billion row tables and committing to multiple database backends.
-  * It's very easy to write and support backends for Storm (current
-    backends have around 100 lines of code).
- 
+ Storm is an object-relation mapper (ORM) for the Python language. In
+ simple terms, that kind of system allows rows from a relational
+ database to be seen as objects in an object-oriented language like
+ Python.
+ .
+ Features:
+  * Clean and lightweight API offers a short learning curve and long-
+    erm maintainability.
+  * Storm is developed in a test-driven manner. An untested line of
+    code is considered a bug.
+  * Storm needs no special class constructors, nor imperative base
+    classes.
+  * Storm is well designed (different classes have very clear
+    boundaries, with small and clean public APIs).
+  * Designed from day one to work both with thin relational databases,
+    such as SQLite, and big iron systems like PostgreSQL and MySQL.
+  * Storm is easy to debug, since its code is written with a KISS
+    principle, and thus is easy to understand.
+  * Designed from day one to work both at the low end, with trivial
+    small databases, and the high end, with applications accessing
+    billion row tables and committing to multiple database backends.
+  * It's very easy to write and support backends for Storm (current
+    backends have around 100 lines of code).
+
+Package: python-storm-dbg
+Maintainer: Landscape Developers <[e-mail]>
+Architecture: any
+Section: debug
+Depends:
+ python-storm (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Recommends: python-dbg
+Suggests: python-psycopg2 | python-mysqldb | python-pysqlite2
+Description: object-relational mapper (ORM) for Python - debugging files
+ Storm is an object-relation mapper (ORM) for the Python language. In
+ simple terms, that kind of system allows rows from a relational
+ database to be seen as objects in an object-oriented language like
+ Python.
+ .
+ Features:
+  * Clean and lightweight API offers a short learning curve and long-
+    erm maintainability.
+  * Storm is developed in a test-driven manner. An untested line of
+    code is considered a bug.
+  * Storm needs no special class constructors, nor imperative base
+    classes.
+  * Storm is well designed (different classes have very clear
+    boundaries, with small and clean public APIs).
+  * Designed from day one to work both with thin relational databases,
+    such as SQLite, and big iron systems like PostgreSQL and MySQL.
+  * Storm is easy to debug, since its code is written with a KISS
+    principle, and thus is easy to understand.
+  * Designed from day one to work both at the low end, with trivial
+    small databases, and the high end, with applications accessing
+    billion row tables and committing to multiple database backends.
+  * It's very easy to write and support backends for Storm (current
+    backends have around 100 lines of code).
+ .
+ This package contains the extension built for the Python debug interpreter.

=== modified file 'copyright'
--- copyright	2011-08-05 19:47:25 +0000
+++ copyright	2014-01-31 08:21:22 +0000
@@ -1,33 +1,256 @@
-This package was debianized by Soren Hansen <[e-mail]> on
-Fri, 13 Jul 2007 09:38:21 +0100.
-
-It was downloaded from https://launchpad.net/storm/+download
-
-Upstream Author: 
-
-    Gustavo Niemeyer <[e-mail]>
-
-Copyright: 
-
-    Copyright (c) 2006-2009 Canonical
-
-License:
-
-    Storm is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as
-    published by the Free Software Foundation; either version 2.1 of
-    the License, or (at your option) any later version.
-
-    Storm is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-On Debian systems, the complete text of the GNU Lesser General Public
-License version 2.1 can be found in /usr/share/common-licenses/LGPL-2.1 file.
-
-The Debian packaging is copyright 2007, Soren Hansen <[e-mail]> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174
+Upstream-Name: storm
+Upstream-Contact: Gustavo Niemeyer <[e-mail]>
+Source: https://launchpad.net/storm/+download
+Comment: Upstream author is Gustavo Niemeyer <[e-mail]>.
+
+Files: *
+Copyright: © 2006-2011, Canonical.
+License: LGPL-2.1
+
+Files: tests/mocker.py
+Copyright: © 2007, Gustavo Niemeyer <[e-mail]>
+License: Python-2.0
+
+Files: storm/tz.py
+Copyright: © 2003-2005, Gustavo Niemeyer <[e-mail]>
+License: Python-2.0
+
+Files: debian/*
+Copyright: © 2006-2008, Soren Hansen <[e-mail]>,
+ © 2008-2009, Morten Kjeldgaard <[e-mail]>,
+ © 2008, Alessio Treglia <[e-mail]>,
+ © 2009, Morten Kjeldgaard <[e-mail]>,
+ © 2009, William Grant <[e-mail]>,
+ © 2010, Matthias Klose <[e-mail]>,
+ © 2011, Scott Kitterman <[e-mail]>,
+ © 2011, Miguel Landaeta <[e-mail]>
+License: GPL-2
+
+License: LGPL-2.1
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public
+ License version 2.1 can be found in /usr/share/common-licenses/LGPL-2.1 file.
+
+License: GPL-2
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ version 2 can be found in /usr/share/common-licenses/GPL-2 file.
+
+License: Python-2.0
+ PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+ --------------------------------------------
+ .
+ 1. This LICENSE AGREEMENT is between the Python Software Foundation
+ ("PSF"), and the Individual or Organization ("Licensee") accessing and
+ otherwise using this software ("Python") in source or binary form and
+ its associated documentation.
+ .
+ 2. Subject to the terms and conditions of this License Agreement, PSF
+ hereby grants Licensee a nonexclusive, royalty-free, world-wide
+ license to reproduce, analyze, test, perform and/or display publicly,
+ prepare derivative works, distribute, and otherwise use Python
+ alone or in any derivative version, provided, however, that PSF's
+ License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
+ 2001, 2002, 2003, 2004, 2005, 2006 Python Software Foundation; All Rights
+ Reserved" are retained in Python alone or in any derivative version
+ prepared by Licensee.
+ .
+ 3. In the event Licensee prepares a derivative work that is based on
+ or incorporates Python or any part thereof, and wants to make
+ the derivative work available to others as provided herein, then
+ Licensee hereby agrees to include in any such work a brief summary of
+ the changes made to Python.
+ .
+ 4. PSF is making Python available to Licensee on an "AS IS"
+ basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+ IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+ DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+ FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
+ INFRINGE ANY THIRD PARTY RIGHTS.
+ .
+ 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+ FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+ A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
+ OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+ .
+ 6. This License Agreement will automatically terminate upon a material
+ breach of its terms and conditions.
+ .
+ 7. Nothing in this License Agreement shall be deemed to create any
+ relationship of agency, partnership, or joint venture between PSF and
+ Licensee. This License Agreement does not grant permission to use PSF
+ trademarks or trade name in a trademark sense to endorse or promote
+ products or services of Licensee, or any third party.
+ .
+ 8. By copying, installing or otherwise using Python, Licensee
+ agrees to be bound by the terms and conditions of this License
+ Agreement.
+ .
+ BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0
+ -------------------------------------------
+ .
+ BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1
+ .
+ 1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an
+ office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the
+ Individual or Organization ("Licensee") accessing and otherwise using
+ this software in source or binary form and its associated
+ documentation ("the Software").
+ .
+ 2. Subject to the terms and conditions of this BeOpen Python License
+ Agreement, BeOpen hereby grants Licensee a non-exclusive,
+ royalty-free, world-wide license to reproduce, analyze, test, perform
+ and/or display publicly, prepare derivative works, distribute, and
+ otherwise use the Software alone or in any derivative version,
+ provided, however, that the BeOpen Python License is retained in the
+ Software, alone or in any derivative version prepared by Licensee.
+ .
+ 3. BeOpen is making the Software available to Licensee on an "AS IS"
+ basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+ IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND
+ DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+ FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT
+ INFRINGE ANY THIRD PARTY RIGHTS.
+ .
+ 4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
+ SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
+ AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY
+ DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+ .
+ 5. This License Agreement will automatically terminate upon a material
+ breach of its terms and conditions.
+ .
+ 6. This License Agreement shall be governed by and interpreted in all
+ respects by the law of the State of California, excluding conflict of
+ law provisions. Nothing in this License Agreement shall be deemed to
+ create any relationship of agency, partnership, or joint venture
+ between BeOpen and Licensee. This License Agreement does not grant
+ permission to use BeOpen trademarks or trade names in a trademark
+ sense to endorse or promote products or services of Licensee, or any
+ third party. As an exception, the "BeOpen Python" logos available at
+ http://www.pythonlabs.com/logos.html may be used according to the
+ permissions granted on that web page.
+ .
+ 7. By copying, installing or otherwise using the software, Licensee
+ agrees to be bound by the terms and conditions of this License
+ Agreement.
+ .
+ CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1
+ ---------------------------------------
+ .
+ 1. This LICENSE AGREEMENT is between the Corporation for National
+ Research Initiatives, having an office at 1895 Preston White Drive,
+ Reston, VA 20191 ("CNRI"), and the Individual or Organization
+ ("Licensee") accessing and otherwise using Python 1.6.1 software in
+ source or binary form and its associated documentation.
+ .
+ 2. Subject to the terms and conditions of this License Agreement, CNRI
+ hereby grants Licensee a nonexclusive, royalty-free, world-wide
+ license to reproduce, analyze, test, perform and/or display publicly,
+ prepare derivative works, distribute, and otherwise use Python 1.6.1
+ alone or in any derivative version, provided, however, that CNRI's
+ License Agreement and CNRI's notice of copyright, i.e., "Copyright (c)
+ 1995-2001 Corporation for National Research Initiatives; All Rights
+ Reserved" are retained in Python 1.6.1 alone or in any derivative
+ version prepared by Licensee. Alternately, in lieu of CNRI's License
+ Agreement, Licensee may substitute the following text (omitting the
+ quotes): "Python 1.6.1 is made available subject to the terms and
+ conditions in CNRI's License Agreement. This Agreement together with
+ Python 1.6.1 may be located on the Internet using the following
+ unique, persistent identifier (known as a handle): 1895.22/1013. This
+ Agreement may also be obtained from a proxy server on the Internet
+ using the following URL: http://hdl.handle.net/1895.22/1013".
+ .
+ 3. In the event Licensee prepares a derivative work that is based on
+ or incorporates Python 1.6.1 or any part thereof, and wants to make
+ the derivative work available to others as provided herein, then
+ Licensee hereby agrees to include in any such work a brief summary of
+ the changes made to Python 1.6.1.
+ .
+ 4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS"
+ basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+ IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND
+ DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+ FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT
+ INFRINGE ANY THIRD PARTY RIGHTS.
+ .
+ 5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+ 1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+ A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1,
+ OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+ .
+ 6. This License Agreement will automatically terminate upon a material
+ breach of its terms and conditions.
+ .
+ 7. This License Agreement shall be governed by the federal
+ intellectual property law of the United States, including without
+ limitation the federal copyright law, and, to the extent such
+ U.S. federal law does not apply, by the law of the Commonwealth of
+ Virginia, excluding Virginia's conflict of law provisions.
+ Notwithstanding the foregoing, with regard to derivative works based
+ on Python 1.6.1 that incorporate non-separable material that was
+ previously distributed under the GNU General Public License (GPL), the
+ law of the Commonwealth of Virginia shall govern this License
+ Agreement only as to issues arising under or with respect to
+ Paragraphs 4, 5, and 7 of this License Agreement. Nothing in this
+ License Agreement shall be deemed to create any relationship of
+ agency, partnership, or joint venture between CNRI and Licensee. This
+ License Agreement does not grant permission to use CNRI trademarks or
+ trade name in a trademark sense to endorse or promote products or
+ services of Licensee, or any third party.
+ .
+ 8. By clicking on the "ACCEPT" button where indicated, or by copying,
+ installing or otherwise using Python 1.6.1, Licensee agrees to be
+ bound by the terms and conditions of this License Agreement.
+ .
+ ACCEPT
+ .
+ CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2
+ --------------------------------------------------
+ .
+ Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,
+ The Netherlands. All rights reserved.
+ .
+ Permission to use, copy, modify, and distribute this software and its
+ documentation for any purpose and without fee is hereby granted,
+ provided that the above copyright notice appear in all copies and that
+ both that copyright notice and this permission notice appear in
+ supporting documentation, and that the name of Stichting Mathematisch
+ Centrum or CWI not be used in advertising or publicity pertaining to
+ distribution of the software without specific, written prior
+ permission.
+ .
+ STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
+ FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

=== added file 'docs'
--- docs	1970-01-01 00:00:00 +0000
+++ docs	2014-01-31 08:21:22 +0000
@@ -0,0 +1,2 @@
+README
+TODO

=== added file 'install'
--- install	1970-01-01 00:00:00 +0000
+++ install	2014-01-31 08:21:22 +0000
@@ -0,0 +1,4 @@
+usr/lib/python2.*/*-packages/*.egg-info
+usr/lib/python2.*/*-packages/storm/*.py
+usr/lib/python2.*/*-packages/storm/*/*
+usr/lib/python2.*/*-packages/storm/cextensions.so

=== added file 'patches/allow-zope-component.patch'
--- patches/allow-zope-component.patch	1970-01-01 00:00:00 +0000
+++ patches/allow-zope-component.patch	2014-01-31 08:21:22 +0000
@@ -0,0 +1,14 @@
+--- a/setup.py
++++ b/setup.py
+@@ -65,11 +65,6 @@
+         "transaction >= 1.0.0",
+         "twisted >= 10.0.0",
+         "zope.component >= 3.8.0",
+-        # zope.component 3.11.0 requires a version of zope.interface that no
+-        # version of Ubuntu yet packages. The following rule exists for the
+-        # sake of convenience rather than necessity, for the situation where
+-        # zope.interface is installed via a package but zope.component is not.
+-        "zope.component < 3.11.0",
+         "zope.security >= 3.7.2",
+         ],
+     )

=== removed file 'patches/no-tests-in-deb.patch'
--- patches/no-tests-in-deb.patch	2012-02-01 20:06:46 +0000
+++ patches/no-tests-in-deb.patch	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-=== modified file 'setup.py'
---- setup.py	2011-10-28 14:44:04 +0000
-+++ setup.py	2012-02-01 20:03:31 +0000
-@@ -32,7 +32,7 @@
-     license="LGPL",
-     url="https://storm.canonical.com",
-     download_url="https://launchpad.net/storm/+download",
--    packages=find_packages(),
-+    packages=filter(lambda pkg: not pkg.startswith("tests"), find_packages()),
-     package_data={"": ["*.zcml"]},
-     classifiers=[
-         "Development Status :: 5 - Production/Stable",
-

=== added file 'patches/series'
--- patches/series	1970-01-01 00:00:00 +0000
+++ patches/series	2014-01-31 08:21:22 +0000
@@ -0,0 +1,1 @@
+allow-zope-component.patch

=== removed file 'pycompat'
--- pycompat	2011-08-05 19:47:25 +0000
+++ pycompat	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2

=== added file 'python-storm-dbg.install'
--- python-storm-dbg.install	1970-01-01 00:00:00 +0000
+++ python-storm-dbg.install	2014-01-31 08:21:22 +0000
@@ -0,0 +1,1 @@
+usr/lib/python2.*/*-packages/storm/cextensions_d.so

=== modified file 'rules'
--- rules	2012-03-29 12:20:29 +0000
+++ rules	2014-01-31 08:21:22 +0000
@@ -1,19 +1,23 @@
 #!/usr/bin/make -f
-
-ver=0.18
-DEB_PYTHON_SYSTEM = pycentral
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-
-get-orig-source:
-	cd ..; wget https://launchpad.net/storm/trunk/$(ver)/+download/storm-$(ver).tar.bz2
-	cd ..; bzcat storm-$(ver).tar.bz2 | gzip -c -9 > storm_$(ver).orig.tar.gz
-
+%:
+	dh $@ --with python2 --buildsystem=python_distutils
+
+override_dh_installchangelogs:
+	dh_installchangelogs NEWS
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf storm.egg-info
+
+override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-build/python-storm::
-	# don't run mysql and postgresql tests as we don't have these databases
-	# setup in the build environment
-	python test
+	for python in $(shell pyversions -r); do \
+		$$python test; \
+		$$python-dbg test; \
+	done
+endif
+
+override_dh_strip:
+ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
+	dh_strip --dbg-package=python-storm-dbg
 endif

=== added directory 'source'
=== added file 'source/format'
--- source/format	1970-01-01 00:00:00 +0000
+++ source/format	2014-01-31 08:21:22 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)