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

[arnau at users.alioth.debian.org]

    Date: Wednesday, March 27, 2013 @ 08:06:05
  Author: arnau
Revision: 9514

Use Debian buildout, otherwise SR fails to build because at bootstrap,
official zc.buildout is installed and later conflict with SlapOS patched
zc.buildout as they are both in eggs directory.

Modified:
  packages/slapos.core/trunk/debian/changelog
  packages/slapos.core/trunk/debian/control
  packages/slapos.core/trunk/debian/patches/fix_tests_install_requires.patch
  packages/slapos.core/trunk/debian/patches/series
  packages/slapos.core/trunk/debian/pydist-overrides
Deleted:
  packages/slapos.core/trunk/debian/patches/do_not_use_debian_zc.buildout.patch

Modified: packages/slapos.core/trunk/debian/changelog
===================================================================
--- packages/slapos.core/trunk/debian/changelog	2013-03-26 21:09:37 UTC (rev 9513)
+++ packages/slapos.core/trunk/debian/changelog	2013-03-27 08:06:05 UTC (rev 9514)
@@ -1,3 +1,13 @@
+slapos.core (0.35.1-3) unstable; urgency=low
+
+  * debian/control, debian/pydist-overrides,
+    debian/patches/do_not_use_debian_zc.buildout.patch:
+    + Use Debian buildout, otherwise SR fails to build because at
+      bootstrap, official zc.buildout is installed and later conflict with
+      SlapOS patched zc.buildout as they are both in eggs directory.
+
+ -- Arnaud Fontaine <arnau at debian.org>  Wed, 27 Mar 2013 13:23:19 +0900
+
 slapos.core (0.35.1-2) unstable; urgency=low
 
   * debian/patches/fix_tests_install_requires.patch, debian/pydist-overrides:

Modified: packages/slapos.core/trunk/debian/control
===================================================================
--- packages/slapos.core/trunk/debian/control	2013-03-26 21:09:37 UTC (rev 9513)
+++ packages/slapos.core/trunk/debian/control	2013-03-27 08:06:05 UTC (rev 9514)
@@ -44,8 +44,6 @@
 Conflicts: slapgrid,
            slapformat,
            slapos-client (<< 0.25-1~),
-# slapos.grid (upstream bug)
-           python-zc.buildout
 Depends: ${misc:Depends},
          ${python:Depends},
          slapos-client (= ${binary:Version}),

Deleted: packages/slapos.core/trunk/debian/patches/do_not_use_debian_zc.buildout.patch
===================================================================
--- packages/slapos.core/trunk/debian/patches/do_not_use_debian_zc.buildout.patch	2013-03-26 21:09:37 UTC (rev 9513)
+++ packages/slapos.core/trunk/debian/patches/do_not_use_debian_zc.buildout.patch	2013-03-27 08:06:05 UTC (rev 9514)
@@ -1,12 +0,0 @@
-Index: slapos.core-0.35.1/setup.py
-===================================================================
---- slapos.core-0.35.1.orig/setup.py	2013-02-28 19:39:50.728890913 +0900
-+++ slapos.core-0.35.1/setup.py	2013-02-28 19:40:07.645065734 +0900
-@@ -45,7 +45,6 @@
-           'xml_marshaller>=0.9.3', # to unmarshall/marshall python objects to/from
-                                    # XML
-           'zope.interface', # slap library implementes interfaces
--          'zc.buildout',
-         ] + additional_install_requires,
-       zip_safe=False, # proxy depends on Flask, which has issues with
-                       # accessing templates

Modified: packages/slapos.core/trunk/debian/patches/fix_tests_install_requires.patch
===================================================================
--- packages/slapos.core/trunk/debian/patches/fix_tests_install_requires.patch	2013-03-26 21:09:37 UTC (rev 9513)
+++ packages/slapos.core/trunk/debian/patches/fix_tests_install_requires.patch	2013-03-27 08:06:05 UTC (rev 9514)
@@ -1,8 +1,6 @@
-Index: slapos.core-0.35.1/setup.py
-===================================================================
---- slapos.core-0.35.1.orig/setup.py	2013-03-04 19:01:26.946622882 +0900
-+++ slapos.core-0.35.1/setup.py	2013-03-04 19:04:23.012503183 +0900
-@@ -38,14 +38,16 @@
+--- a/setup.py
++++ b/setup.py
+@@ -38,15 +38,17 @@
            'lxml', # needed to play with XML trees
            'netaddr>=0.7.5', # to play safely with IPv6 prefixes
            'netifaces', # to fetch information about network devices
@@ -13,6 +11,7 @@
            'xml_marshaller>=0.9.3', # to unmarshall/marshall python objects to/from
                                     # XML
            'zope.interface', # slap library implementes interfaces
+           'zc.buildout',
          ] + additional_install_requires,
 +      tests_require=[
 +          'unittest2',

Modified: packages/slapos.core/trunk/debian/patches/series
===================================================================
--- packages/slapos.core/trunk/debian/patches/series	2013-03-26 21:09:37 UTC (rev 9513)
+++ packages/slapos.core/trunk/debian/patches/series	2013-03-27 08:06:05 UTC (rev 9514)
@@ -1,4 +1,3 @@
 system_configuration_file_by_default.patch
 slapos_command_split_up.patch
-do_not_use_debian_zc.buildout.patch
 fix_tests_install_requires.patch

Modified: packages/slapos.core/trunk/debian/pydist-overrides
===================================================================
--- packages/slapos.core/trunk/debian/pydist-overrides	2013-03-26 21:09:37 UTC (rev 9513)
+++ packages/slapos.core/trunk/debian/pydist-overrides	2013-03-27 08:06:05 UTC (rev 9514)
@@ -1,3 +1,2 @@
 setuptools python-pkg-resources, python-setuptools
 xml_marshaller python-xmlmarshaller
-zc.buildout