[Python-apps-commits] r7607 - in packages/slapos.core/trunk/debian (changelog control rules)

[arnau at users.alioth.debian.org]

    Date: Wednesday, October 5, 2011 @ 05:44:26
  Author: arnau
Revision: 7607

+ Use python2.7 instead (as supervisor is now working fine with
  python2.7) and Build-Depends explicitely on >= 2.7.2-2~ because of a
  bug when generating Depends in previous versions. Closes: #643999.

Modified:
  packages/slapos.core/trunk/debian/changelog
  packages/slapos.core/trunk/debian/control
  packages/slapos.core/trunk/debian/rules

Modified: packages/slapos.core/trunk/debian/changelog
===================================================================
--- packages/slapos.core/trunk/debian/changelog	2011-10-04 22:38:37 UTC (rev 7606)
+++ packages/slapos.core/trunk/debian/changelog	2011-10-05 05:44:26 UTC (rev 7607)
@@ -1,3 +1,12 @@
+slapos.core (0.12-2) unstable; urgency=low
+
+  * debian/control:
+    + Use python2.7 instead (as supervisor is now working fine with
+      python2.7) and Build-Depends explicitely on >= 2.7.2-2~ because of a
+      bug when generating Depends in previous versions. Closes: #643999.
+
+ -- Arnaud Fontaine <arnau at debian.org>  Wed, 05 Oct 2011 14:07:41 +0900
+
 slapos.core (0.12-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/slapos.core/trunk/debian/control
===================================================================
--- packages/slapos.core/trunk/debian/control	2011-10-04 22:38:37 UTC (rev 7606)
+++ packages/slapos.core/trunk/debian/control	2011-10-05 05:44:26 UTC (rev 7607)
@@ -4,12 +4,11 @@
 Section: net
 Priority: optional
 Build-Depends: python-setuptools (>= 0.6b3),
-               python (>= 2.6.6-14~),
-               python2.6 (>= 2.6.6-14~),
+               python (>= 2.7.2-2~),
                debhelper (>= 7.4.3)
 Build-Depends-Indep: po-debconf
 Standards-Version: 3.9.2
-X-Python-Version: 2.6
+X-Python-Version: 2.7
 Homepage: http://www.slapos.org
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/slapos.core/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/slapos.core/trunk/
@@ -35,25 +34,13 @@
          bridge-utils,
          uml-utilities,
          python-netaddr (>= 0.7.5~),
-# slapos.grid (python 2.6 because of supervisor)
-         python-initgroups,
-         python-argparse,
-# Added manually due to bug in dh_python2 (fixed in 2.7.2-2)
-# http://alioth.debian.org/scm/loggerhead/pkg-python/python-defaults-debian/revision/224/dh_python2
-         python-flask,
-         python-lxml,
-         python-netifaces,
-         python-pkg-resources,
-         python-setuptools,
-         python-zope.interface,
-         supervisor
 Breaks: ${python:Breaks}
 # slapos.grid
 Recommends: libc6-dev | libc-dev,
             gcc | c-compiler,
             g++ | c++-compiler,
             make,
-            python2.6-dev
+            python2.7-dev
 Description: Client-side to deploy applications with SlapOS 
  SlapOS allows one to turn any application into SaaS (Service as a System),
  PaaS (Platform as a Service) or IaaS (Infrastructure as a Service) without

Modified: packages/slapos.core/trunk/debian/rules
===================================================================
--- packages/slapos.core/trunk/debian/rules	2011-10-04 22:38:37 UTC (rev 7606)
+++ packages/slapos.core/trunk/debian/rules	2011-10-05 05:44:26 UTC (rev 7607)
@@ -4,7 +4,7 @@
 	dh $@ --with python2
 
 override_dh_auto_install:
-	python2.6 setup.py install --root=debian/slapos-client --install-layout=deb \
+	python setup.py install --root=debian/slapos-client --install-layout=deb \
 		--install-scripts=/usr/sbin/
 
 	# Only slapconsole script is not supposed to be ran by root