[Python-modules-commits] r17159 - in packages/storm/trunk (5 files)

Thu May 26 15:12:14 UTC 2011

Date: Thursday, May 26, 2011 @ 15:12:13
  Author: nomadium-guest
Revision: 17159

* Set mergeWithUpstream on debian dir.
* Wrap Build-Depends and Depends lists.
* Migration from dh_pysupport to dh_python2 helper.
* Replace deprecated XS-P-V field with X-P-V and also remove XB-P-V field.

Modified:
  packages/storm/trunk/debian/	(properties)
  packages/storm/trunk/debian/changelog
  packages/storm/trunk/debian/control
  packages/storm/trunk/debian/copyright
  packages/storm/trunk/debian/rules


Property changes on: packages/storm/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Modified: packages/storm/trunk/debian/changelog
===================================================================

--- packages/storm/trunk/debian/changelog	2011-05-26 14:44:36 UTC (rev 17158)
+++ packages/storm/trunk/debian/changelog	2011-05-26 15:12:13 UTC (rev 17159)
@@ -1,10 +1,12 @@
-storm (0.18-1) UNRELEASED; urgency=low
+storm (0.18-0miguel1) unstable; urgency=low
 
   * New upstream release.
   * Initial release in Debian. (Closes: #511253).
   * Update dates in debian/copyright file.
+  * Migration from dh_pysupport to dh_python2 helper.
+  * Replace deprecated XS-P-V field with X-P-V and also remove XB-P-V field.
 
- -- Miguel Landaeta <miguel at miguel.cc>  Thu, 18 Nov 2010 19:34:24 -0430
+ -- Miguel Landaeta <miguel at miguel.cc>  Thu, 28 Apr 2011 14:36:01 -0430
 
 storm (0.15-0ubuntu1) karmic; urgency=low
 

Modified: packages/storm/trunk/debian/control
===================================================================
--- packages/storm/trunk/debian/control	2011-05-26 14:44:36 UTC (rev 17158)
+++ packages/storm/trunk/debian/control	2011-05-26 15:12:13 UTC (rev 17159)
@@ -3,52 +3,25 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Miguel Landaeta <miguel at miguel.cc>
-Build-Depends: debhelper (>= 7.0.50~), python-all-dev (>= 2.4), python-support,
- python-all-dbg (>= 2.4), python-setuptools
-Standards-Version: 3.9.1
-XS-Python-Version: all
+Build-Depends:
+ debhelper (>= 7.0.50~),
+ python-all-dbg (>= 2.6.6-3~),
+ python-all-dev (>= 2.6.6-3~),
+ python-setuptools
+Standards-Version: 3.9.2
+X-Python-Version: >= 2.4
 Homepage: http://storm.canonical.com/
 Vcs-Svn: svn://svn.debian.org/svn/python-modules/packages/storm/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/storm/trunk/
 
-Package: python-storm
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}
-Provides: ${python:Provides}
-Suggests: python-psycopg2, python-mysqldb, python-pysqlite2
-XB-Python-Version: ${python:Versions}
-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).
- 
 Package: python-storm-dbg
-Section: debug
-Priority: extra
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
- python-storm (= ${binary:Version})
-Recommends: python-dbg
+Depends:
+ python-storm (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+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
@@ -75,3 +48,6 @@
     backends have around 100 lines of code).
  .
  This package contains the extension built for the Python debug interpreter.
+Section: debug
+Priority: extra
+Recommends: python-dbg

Modified: packages/storm/trunk/debian/copyright
===================================================================
--- packages/storm/trunk/debian/copyright	2011-05-26 14:44:36 UTC (rev 17158)
+++ packages/storm/trunk/debian/copyright	2011-05-26 15:12:13 UTC (rev 17159)
@@ -3,11 +3,11 @@
 
 It was downloaded from https://launchpad.net/storm/+download
 
-Upstream Author: 
+Upstream Author:
 
     Gustavo Niemeyer <gustavo at niemeyer.net>
 
-Copyright: 
+Copyright:
 
     Copyright (c) 2006-2010 Canonical
 

Modified: packages/storm/trunk/debian/rules
===================================================================
--- packages/storm/trunk/debian/rules	2011-05-26 14:44:36 UTC (rev 17158)
+++ packages/storm/trunk/debian/rules	2011-05-26 15:12:13 UTC (rev 17159)
@@ -1,8 +1,8 @@
 #!/usr/bin/make -f
 %:
-	dh $@
+	dh $@ --with python2
 
-override_dh_auto_build::
+override_dh_auto_build:
 	for python in $(shell pyversions -r); do \
 		$$python setup.py build; \
 	done
@@ -26,7 +26,6 @@
 
 override_dh_strip:
 	dh_strip --dbg-package=python-storm-dbg
-	cd debian/python-storm-dbg/usr/lib/debug/usr/lib && mv pyshared pymodules
 
 get-orig-source:
 	cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \


