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

[arnau at users.alioth.debian.org]

    Date: Wednesday, June 29, 2011 @ 12:35:32
  Author: arnau
Revision: 7243

Drop debian/patches/fix_zc.buildout_conflict.patch because it was applied upstream.

Modified:
  packages/slapos.core/trunk/debian/changelog
  packages/slapos.core/trunk/debian/patches/series
Deleted:
  packages/slapos.core/trunk/debian/patches/fix_zc.buildout_conflict.patch

Modified: packages/slapos.core/trunk/debian/changelog
===================================================================
--- packages/slapos.core/trunk/debian/changelog	2011-06-29 12:18:06 UTC (rev 7242)
+++ packages/slapos.core/trunk/debian/changelog	2011-06-29 12:35:32 UTC (rev 7243)
@@ -4,6 +4,8 @@
   * debian/copyright:
     + State that slapos/libnetworkcache.py is distributed under ZPL 2.1.
   * Add debian/watch.
+  * debian/patches/fix_zc.buildout_conflict.patch:
+    + Drop because it was applied upstream.
 
  -- Arnaud Fontaine <arnau at debian.org>  Wed, 29 Jun 2011 14:05:39 +0200
 

Deleted: packages/slapos.core/trunk/debian/patches/fix_zc.buildout_conflict.patch
===================================================================
--- packages/slapos.core/trunk/debian/patches/fix_zc.buildout_conflict.patch	2011-06-29 12:18:06 UTC (rev 7242)
+++ packages/slapos.core/trunk/debian/patches/fix_zc.buildout_conflict.patch	2011-06-29 12:35:32 UTC (rev 7243)
@@ -1,19 +0,0 @@
-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-29 12:18:06 UTC (rev 7242)
+++ packages/slapos.core/trunk/debian/patches/series	2011-06-29 12:35:32 UTC (rev 7243)
@@ -1,3 +1,2 @@
 system_configuration_file_by_default.patch
 fix_python26_missing_initgroups.patch
-fix_zc.buildout_conflict.patch