Merge 1.0 branch to the trunk

git-svn-id: svn://scm.gforge.inria.fr/svnroot/openalea/trunk@3689 04ea39c6-a500-0410-8508-e77fe2a861cf
openalea · Dec 21, 2012 · 05f25fe · 05f25fe
1 parent aa53efb
commit 05f25fe
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 34 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,15 @@
+openalea-core (1.0.1~ppa8) quantal; urgency=low
+
+  *  Port to Quantal 
+
+ -- Christophe Pradal <christophe.pradal@cirad.fr>  Mon, 10 Dec 2012 15:17:38 +0100
+
+openalea-core (1.0.1~ppa2) precise; urgency=low
+
+  * Switch to dh_python2 
+
+ -- Christophe Pradal <christophe.pradal@cirad.fr>  Tue, 11 Sep 2012 15:42:12 +0200
+
 openalea-core (1.0.1~ppa1) precise; urgency=low
 
   * Release 1.0 

diff --git a/debian/control b/debian/control
@@ -2,14 +2,11 @@ Source: openalea-core
 Maintainer: OpenAlea consortium <christophe.pradal@cirad.fr>
 Section: python
 Priority: optional
-Build-Depends: python-setuptools (>= 0.6b3), debhelper (>= 7), python-support (>= 0.8.4), python-openalea.deploy
-Standards-Version: 3.9.1
-XS-Python-Version: current
+Build-Depends: python-all (>= 2.6.6-3~), python-setuptools, debhelper (>= 7), python-openalea.deploy
 
 Package: python-openalea.core
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}, python-openalea.deploy
-XB-Python-Version: ${python:Versions}
 Provides: ${python:Provides}
 Description: OpenAlea Component platform core.
  OpenAlea.Core is able to discover and manage packages and logical components, build and evaluate dataflows and Generate final applications
diff --git a/debian/python-openalea.core.preinst b/debian/python-openalea.core.preinst
diff --git a/debian/rules b/debian/rules
@@ -1,22 +1,9 @@
 #!/usr/bin/make -f
 
-# This file was automatically generated by stdeb 0.6.0 at
-# Tue, 21 Sep 2010 16:27:36 +0200
-
-# Unset the environment variables set by dpkg-buildpackage. (This is
-# necessary because distutils is brittle with compiler/linker flags
-# set. Specifically, packages using f2py will break without this.)
-unexport CPPFLAGS
-unexport CFLAGS
-unexport CXXFLAGS
-unexport FFLAGS
-unexport LDFLAGS
-
-#exports specified using stdeb Setup-Env-Vars:
-export DH_OPTIONS=--buildsystem=python_distutils
-
+# This file was automatically generated by stdeb 0.6.0+git at
+# Tue, 11 Sep 2012 15:20:08 +0200
 
 %:
-	dh $@
+	dh $@ --with python2 --buildsystem=python_distutils