diff -u pygdchart2-0.beta1/debian/changelog pygdchart2-0.beta1/debian/changelog
--- pygdchart2-0.beta1/debian/changelog
+++ pygdchart2-0.beta1/debian/changelog
@@ -1,27 +1,17 @@
-pygdchart2 (0.beta1-3.4ubuntu3) precise; urgency=low
+pygdchart2 (0.beta1-3.6) unstable; urgency=medium
 
-  * Rebuild to drop python2.6 dependencies and provides.
+  * Non-maintainer upload.
+  * Fix string size allocation error, thanks Kees Cook (Closes: #301563).
 
- -- Matthias Klose <doko@ubuntu.com>  Sat, 14 Apr 2012 13:43:31 +0000
+ -- Graham Inggs <ginggs@debian.org>  Mon, 18 Jan 2016 13:06:25 +0200
 
-pygdchart2 (0.beta1-3.4ubuntu2) natty; urgency=low
+pygdchart2 (0.beta1-3.5) unstable; urgency=medium
 
-  * Rebuild to add support for python 2.7.
+  * Non-maintainer upload.
+  * Port to dh-python2.  Closes: #786197
+  * Add dependency on ${misc:Depends} to python-gdchart2-doc.
 
- -- Matthias Klose <doko@ubuntu.com>  Fri, 03 Dec 2010 00:07:54 +0000
-
-pygdchart2 (0.beta1-3.4ubuntu1) karmic; urgency=low
-
-  * _gdchartc.c: fix string size allocation error (LP: #395204,
-    debian bug 301563).
-
- -- Kees Cook <kees@ubuntu.com>  Fri, 10 Jul 2009 13:48:40 -0700
-
-pygdchart2 (0.beta1-3.4build1) jaunty; urgency=low
-
-  * No change rebuild for python2.6.
-
- -- Matthias Klose <doko@ubuntu.com>  Thu, 26 Feb 2009 11:23:43 +0000
+ -- Mattia Rizzolo <mattia@debian.org>  Sat, 12 Dec 2015 18:23:39 +0000
 
 pygdchart2 (0.beta1-3.4) unstable; urgency=low
 
diff -u pygdchart2-0.beta1/debian/rules pygdchart2-0.beta1/debian/rules
--- pygdchart2-0.beta1/debian/rules
+++ pygdchart2-0.beta1/debian/rules
@@ -2,8 +2,6 @@
 # -*- mode: makefile; coding: utf-8 -*-
 # Copyright © 2004-2005 Jonas Smedegaard <dr@jones.dk>
 
-DEB_PYTHON_SYSTEM=pysupport
-
 # Set DEB_BUILD_OPTIONS=update in environment to regenerate control
 ifneq (,$(findstring update,$(DEB_BUILD_OPTIONS)))
 DEB_AUTO_UPDATE_DEBIAN_CONTROL := yes
reverted:
--- pygdchart2-0.beta1/debian/pyversions
+++ pygdchart2-0.beta1.orig/debian/pyversions
@@ -1 +0,0 @@
-2.3-
diff -u pygdchart2-0.beta1/debian/control pygdchart2-0.beta1/debian/control
--- pygdchart2-0.beta1/debian/control
+++ pygdchart2-0.beta1/debian/control
@@ -1,10 +1,10 @@
 Source: pygdchart2
 Section: python
 Priority: optional
-Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
-XSBC-Original-Maintainer: Jonas Smedegaard <dr@jones.dk>
+Maintainer: Jonas Smedegaard <dr@jones.dk>
 Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-all-dev (>= 2.3.5-11), python-support (>= 0.3.2), dh-buildinfo, libgdchart-gd2-noxpm-dev | libgdchart-gd2-dev, libgd2-noxpm-dev | libgd2-xpm-dev
+Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-all-dev (>= 2.3.5-11), dh-python, dh-buildinfo, libgdchart-gd2-noxpm-dev | libgdchart-gd2-dev, libgd2-noxpm-dev | libgd2-xpm-dev
+X-Python-Version: >= 2.3
 
 Package: python-gdchart2
 Architecture: any
@@ -22,7 +22,7 @@
 Package: python-gdchart2-doc
 Architecture: all
 Section: doc
-Depends: ${python:Depends}
+Depends: ${python:Depends}, ${misc:Depends}
 Description: Python OO interface to GDChart - docs
  Object-oriented Python interface to the nice 2d and 3d graphics library
  GDChart.
reverted:
--- pygdchart2-0.beta1/debian/pycompat
+++ pygdchart2-0.beta1.orig/debian/pycompat
@@ -1 +0,0 @@
-2
diff -u pygdchart2-0.beta1/debian/control.in pygdchart2-0.beta1/debian/control.in
--- pygdchart2-0.beta1/debian/control.in
+++ pygdchart2-0.beta1/debian/control.in
@@ -1,8 +1,7 @@
 Source: pygdchart2
 Section: python
 Priority: optional
-Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
-XSBC-Original-Maintainer: Jonas Smedegaard <dr@jones.dk>
+Maintainer: Jonas Smedegaard <dr@jones.dk>
 Standards-Version: 3.7.2
 Build-Depends: @cdbs@, libgdchart-gd2-noxpm-dev | libgdchart-gd2-dev, libgd2-noxpm-dev | libgd2-xpm-dev