[Python-modules-commits] r8271 - in packages/python-axiom/trunk/debian (4 files)

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

    Date: Friday, April 17, 2009 @ 22:39:16
  Author: mithrandi-guest
Revision: 8271

Revert column quoting patch and add Conflicts: on older libsqlite3-0.

Modified:
  packages/python-axiom/trunk/debian/changelog
  packages/python-axiom/trunk/debian/control
  packages/python-axiom/trunk/debian/rules
Deleted:
  packages/python-axiom/trunk/debian/patches/

Modified: packages/python-axiom/trunk/debian/changelog
===================================================================
--- packages/python-axiom/trunk/debian/changelog	2009-04-17 20:14:37 UTC (rev 8270)
+++ packages/python-axiom/trunk/debian/changelog	2009-04-17 22:39:16 UTC (rev 8271)
@@ -1,16 +1,16 @@
 python-axiom (0.5.31-1) UNRELEASED; urgency=low
 
-  [ Tristan Seligmann ]
-  * Remove the build dir from the initial destination and not from the
-    pysupport one, to avoid relying on pysupport internals. (Closes: #516757)
-
   [ Vincent Bernat ]
   * New upstream release.
   * Bump Standards-Version to 3.8.1. No changes required.
-  * Add a patch to handle sqlite >= 3.6.4. Closes: #520338. Older
-    databases need to be fixed by hand.
   * Ship examples in /usr/share/doc/python-axiom/examples. Closes: #520340.
 
+  [ Tristan Seligmann ]
+  * Remove the build dir from the initial destination and not from the
+    pysupport one, to avoid relying on pysupport internals. (Closes: #516757)
+  * Conflict with older sqlite3 versions to avoid an issue with some internal
+    axiom column names. (Closes: #520338)
+
  -- Vincent Bernat <bernat at debian.org>  Wed, 18 Mar 2009 21:18:39 +0100
 
 python-axiom (0.5.30-1) unstable; urgency=low

Modified: packages/python-axiom/trunk/debian/control
===================================================================
--- packages/python-axiom/trunk/debian/control	2009-04-17 20:14:37 UTC (rev 8270)
+++ packages/python-axiom/trunk/debian/control	2009-04-17 22:39:16 UTC (rev 8271)
@@ -13,6 +13,7 @@
 Package: python-axiom
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}, python-twisted-core, python-twisted-conch, python-epsilon (>= 0.5.11), python-pysqlite2, python-zopeinterface
+Conflicts: libsqlite3-0 (< 3.6.12)
 Description: Python object database
  Divmod Axiom is an object database, or alternatively, an
  object-relational mapper, implemented on top of Python.

Modified: packages/python-axiom/trunk/debian/rules
===================================================================
--- packages/python-axiom/trunk/debian/rules	2009-04-17 20:14:37 UTC (rev 8270)
+++ packages/python-axiom/trunk/debian/rules	2009-04-17 22:39:16 UTC (rev 8271)
@@ -3,7 +3,6 @@
 DEB_INSTALL_MANPAGES_python-axiom := debian/axiomatic.1
 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
 PKGDIR=debian/python-axiom/
 
 install/python-axiom::