[Python-apps-commits] r7206 - in packages/slapos.core/trunk/debian (3 files)

[arnau at users.alioth.debian.org]

    Date: Saturday, June 18, 2011 @ 07:35:04
  Author: arnau
Revision: 7206

Add fix_zc.buildout_conflict.patch and conflict against python-zc.buildout (workaround for upstream bug).

Added:
  packages/slapos.core/trunk/debian/patches/fix_zc.buildout_conflict.patch
Modified:
  packages/slapos.core/trunk/debian/control
  packages/slapos.core/trunk/debian/patches/series

Modified: packages/slapos.core/trunk/debian/control
===================================================================
--- packages/slapos.core/trunk/debian/control	2011-06-18 07:31:04 UTC (rev 7205)
+++ packages/slapos.core/trunk/debian/control	2011-06-18 07:35:04 UTC (rev 7206)
@@ -21,7 +21,9 @@
           slapformat
 Conflicts: python-slapos.slap,
            slapgrid,
-           slapformat
+           slapformat,
+# slapos.grid (upstream bug)
+           python-zc.buildout
 Depends: ${misc:Depends},
          ${python:Depends},
 # slapos.slap
@@ -32,8 +34,7 @@
          python-netaddr (>= 0.7.5~),
 # slapos.grid (python 2.6 because of supervisor)
          python-initgroups,
-         python-argparse,
-         python-zc.buildout (>= 1.5.0)
+         python-argparse
 Breaks: ${python:Breaks}
 # slapos.grid
 Recommends: libc6-dev | libc-dev,

Added: packages/slapos.core/trunk/debian/patches/fix_zc.buildout_conflict.patch
===================================================================
--- packages/slapos.core/trunk/debian/patches/fix_zc.buildout_conflict.patch	                        (rev 0)
+++ packages/slapos.core/trunk/debian/patches/fix_zc.buildout_conflict.patch	2011-06-18 07:35:04 UTC (rev 7206)
@@ -0,0 +1,19 @@
+Author: Arnaud Fontaine <arnau at debian.org>
+Forwarded: no
+Description: Remove zc.buildout from install_requires
+ The package currently conflicts on python-zc.buildout because of an
+ upstream bug.
+
+Index: slapos.core-0.3~20110608+1.git9496d81.obsolete.0.260002630137937/setup.py
+===================================================================
+--- slapos.core-0.3~20110608+1.git9496d81.obsolete.0.260002630137937.orig/setup.py	2011-06-18 16:25:58.860004928 +0900
++++ slapos.core-0.3~20110608+1.git9496d81.obsolete.0.260002630137937/setup.py	2011-06-18 16:26:06.660004928 +0900
+@@ -39,8 +39,6 @@
+       'supervisor', # slapgrid uses supervisor to manage processes
+       'xml_marshaller>=0.9.3', # to unmarshall/marshall python objects to/from
+                                # XML
+-      'zc.buildout>=1.5.0', # slapgrid uses buildout as its backend to do the
+-                            # job
+       'zope.interface', # slap library implementes interfaces
+         ] + additional_install_requires,
+       zip_safe=False, # proxy depends on Flask, which has issues with

Modified: packages/slapos.core/trunk/debian/patches/series
===================================================================
--- packages/slapos.core/trunk/debian/patches/series	2011-06-18 07:31:04 UTC (rev 7205)
+++ packages/slapos.core/trunk/debian/patches/series	2011-06-18 07:35:04 UTC (rev 7206)
@@ -1,2 +1,3 @@
 system_configuration_file_by_default.patch
 fix_python26_missing_initgroups.patch
+fix_zc.buildout_conflict.patch