[Debian-olpc-devel] Bug#616955: [PATCH] Use python-2 build system instead of pycentral

[أحمد المحمودي]

From: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>

+ debian/rules: Unset DEB_PYTHON_SYSTEM (default is python-2)
+ debian/control, debian/control.in:
  - Remove X*-Python-Version fields
  - Remove python-central from Build-Deps
  - Bumped python-all-dev Build-Dep to 2.6.6-3~
---
 debian/control    |    5 +----
 debian/control.in |    2 --
 debian/rules      |    1 -
 3 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index 166d35b..480124b 100644
--- a/debian/control
+++ b/debian/control
@@ -7,9 +7,8 @@ Build-Depends: autotools-dev,
  devscripts (>= 2.10.7~),
  debhelper (>= 6),
  dh-buildinfo,
- python-central,
  cdbs (>= 0.4.75~),
- python-all-dev,
+ python-all-dev (>= 2.6.6-3~),
  libabiword-2.8-dev (>= 2.8.1-1.0),
  python-gtk2-dev,
  libfribidi-dev (>= 0.10.4),
@@ -27,13 +26,11 @@ Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/git/collab-maint/pyabiword
 Vcs-Browser: http://git.debian.org/?p=collab-maint/pyabiword.git
 Homepage: http://www.abisource.com/wiki/PyAbiWord
-XS-Python-Version: all
 
 Package: python-abiword
 Architecture: any
 Depends: ${shlibs:Depends}, ${python:Depends}, ${cdbs:Depends}, ${misc:Depends}
 Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
 Description: Python AbiWidget and TableWidget wrappers
  PyAbiWord is a set of wrappers around AbiWidget that enable Python
  programmers to use AbiWord in their PyGtk applications.
diff --git a/debian/control.in b/debian/control.in
index 1a69a39..8bd167a 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -8,13 +8,11 @@ Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/git/collab-maint/pyabiword
 Vcs-Browser: http://git.debian.org/?p=collab-maint/pyabiword.git
 Homepage: http://www.abisource.com/wiki/PyAbiWord
-XS-Python-Version: all
 
 Package: python-abiword
 Architecture: any
 Depends: ${shlibs:Depends}, ${python:Depends}, ${cdbs:Depends}, ${misc:Depends}
 Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
 Description: Python AbiWidget and TableWidget wrappers
  PyAbiWord is a set of wrappers around AbiWidget that enable Python
  programmers to use AbiWord in their PyGtk applications.
diff --git a/debian/rules b/debian/rules
index 85e71e7..7c350a1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 DEB_BUILDDIR = build
-DEB_PYTHON_SYSTEM = pycentral
 include /usr/share/cdbs/1/rules/upstream-tarball.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-- 
1.7.4.1