Bug#617089: sugar-datastore-0.84: diff for NMU version 0.84.1-3.1

[Luca Falavigna]

tags 617089 + patch
tags 617089 + pending
thanks

Dear maintainer,

I've prepared an NMU for sugar-datastore-0.84 (versioned as 0.84.1-3.1) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru sugar-datastore-0.84-0.84.1/debian/changelog sugar-datastore-0.84-0.84.1/debian/changelog
--- sugar-datastore-0.84-0.84.1/debian/changelog	2010-10-12 14:15:02.000000000 +0200
+++ sugar-datastore-0.84-0.84.1/debian/changelog	2013-07-09 20:05:01.000000000 +0200
@@ -1,3 +1,10 @@
+sugar-datastore-0.84 (0.84.1-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Convert to dh_python2 (Closes: #617089).
+
+ -- Luca Falavigna <dktrkr...@debian.org>  Tue, 09 Jul 2013 20:04:50 +0200
+
 sugar-datastore-0.84 (0.84.1-3) unstable; urgency=low
 
   * Bump Policy compliance to standards-version 3.9.1.
diff -Nru sugar-datastore-0.84-0.84.1/debian/control sugar-datastore-0.84-0.84.1/debian/control
--- sugar-datastore-0.84-0.84.1/debian/control	2010-10-12 14:15:12.000000000 +0200
+++ sugar-datastore-0.84-0.84.1/debian/control	2013-07-09 20:05:44.000000000 +0200
@@ -5,16 +5,15 @@
 Uploaders: Jonas Smedegaard <d...@jones.dk>
 Build-Depends: autotools-dev,
  devscripts (>= 2.10.7~),
- python-central,
- cdbs (>= 0.4.75~),
- python-all-dev,
+ cdbs (>= 0.4.90~),
+ python-all-dev (>= 2.6.6-3~),
  debhelper (>= 6),
  dh-buildinfo
 Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/git/collab-maint/sugar-datastore.git
 Vcs-Browser: http://git.debian.org/?p=collab-maint/sugar-datastore.git;a=shortlog;h=refs/heads/master-0.84
 Homepage: http://wiki.sugarlabs.org/go/Sugar
-XS-Python-Version: >= 2.5
+X-Python-Version: >= 2.5
 
 Package: python-carquinyol-0.84
 Architecture: any
@@ -24,7 +23,6 @@
 Breaks: ${cdbs:Breaks}
 Conflicts: ${cdbs:Conflicts}
 Replaces: ${cdbs:Replaces}
-XB-Python-Version: ${python:Versions}
 Description: Sugar graphical shell - datastore
  Sugar is a graphical user interface aimed at children.
  .
diff -Nru sugar-datastore-0.84-0.84.1/debian/pycompat sugar-datastore-0.84-0.84.1/debian/pycompat
--- sugar-datastore-0.84-0.84.1/debian/pycompat	2010-07-21 11:41:11.000000000 +0200
+++ sugar-datastore-0.84-0.84.1/debian/pycompat	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-2
diff -Nru sugar-datastore-0.84-0.84.1/debian/rules sugar-datastore-0.84-0.84.1/debian/rules
--- sugar-datastore-0.84-0.84.1/debian/rules	2010-10-12 14:13:58.000000000 +0200
+++ sugar-datastore-0.84-0.84.1/debian/rules	2013-07-09 20:05:54.000000000 +0200
@@ -19,7 +19,7 @@
 # 02111-1307 USA.
 
 DEB_BUILDDIR = build
-DEB_PYTHON_SYSTEM = pycentral
+DEB_PYTHON2_MODULE_PACKAGES = python-carquinyol-0.84
 include /usr/share/cdbs/1/rules/upstream-tarball.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/python-autotools.mk