diff -u winpdb-1.4.8/debian/changelog winpdb-1.4.8/debian/changelog
--- winpdb-1.4.8/debian/changelog
+++ winpdb-1.4.8/debian/changelog
@@ -1,3 +1,17 @@
+winpdb (1.4.8-2) unstable; urgency=low
+
+  * Including some ideas from #670968:
+    - Migrating to dh_python2
+    - Bumping Standards-Version to 3.9.3, no changs needed.
+    - Fix copyright-with-old-dh-make-debian-copyright (Lintian)
+      and update copyright years.
+    - Fix menu-icon-missing (Lintian)
+    Closes: #670968
+  * Add debian/README.source 
+  * Tidy debian/rules, add versioned debhelper dependency. 
+
+ -- Bernd Zeimetz <bzed@debian.org>  Mon, 30 Apr 2012 23:51:13 +0200
+
 winpdb (1.4.8-1) unstable; urgency=low
 
   * Updating watch file to reflect the new file location.
diff -u winpdb-1.4.8/debian/rules winpdb-1.4.8/debian/rules
--- winpdb-1.4.8/debian/rules
+++ winpdb-1.4.8/debian/rules
@@ -9,16 +9,15 @@
 	docbook-to-man $< > $@
 
 %:
-	dh $@
+	dh --with python2 $@
 
 build: build-stamp
 
 build-stamp: $(DPATCH_STAMPFN) $(MANPAGES)
-	dh build
+	dh --with python2 build
 	touch $@
 
-binary-indep: build-stamp
-	dh $@ --before dh_pysupport
+override_dh_python2:
 	install -m 644 $(CURDIR)/artwork/$(PKGNAME)-icon-16.png \
                        $(CURDIR)/debian/$(PKGNAME)/usr/share/icons/hicolor/16x16/apps/$(PKGNAME).png
 	install -m 644 $(CURDIR)/artwork/$(PKGNAME)-icon-32.png \
@@ -33,12 +32,8 @@
-	dh $@ --remaining
-
-binary-arch:
-	#nothing to do
-binary: binary-indep
+	dh_python2
 
 clean: clean-patched unpatch
 clean-patched:
-	dh clean
+	dh --with python2 clean
 	rm -f $(MANPAGES) build-stamp
 
-.PHONY: clean binary unpatch patch clean-patched binary-indep binary-arch
+.PHONY: clean unpatch patch clean-patched
diff -u winpdb-1.4.8/debian/control winpdb-1.4.8/debian/control
--- winpdb-1.4.8/debian/control
+++ winpdb-1.4.8/debian/control
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Bernd Zeimetz <bzed@debian.org>
 Uploaders: Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7), python, dpatch
-Build-Depends-Indep: docbook-to-man, lsb-release, python-support (>= 0.6.4)
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 7.0.50~), python (>= 2.6.6-3~), dpatch
+Build-Depends-Indep: docbook-to-man, lsb-release
+Standards-Version: 3.9.3
 Homepage: http://www.winpdb.org/
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/winpdb/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/winpdb/trunk/
diff -u winpdb-1.4.8/debian/winpdb.install winpdb-1.4.8/debian/winpdb.install
--- winpdb-1.4.8/debian/winpdb.install
+++ winpdb-1.4.8/debian/winpdb.install
@@ -1,0 +2 @@
+debian/winpdb.xpm usr/share/pixmaps/
diff -u winpdb-1.4.8/debian/copyright winpdb-1.4.8/debian/copyright
--- winpdb-1.4.8/debian/copyright
+++ winpdb-1.4.8/debian/copyright
@@ -32,5 +32,5 @@
 version 2, can be found in `/usr/share/common-licenses/GPL-2'.
 
-The Debian packaging is (C) 2007, Bernd Zeimetz <bernd@bzed.de> and
+The Debian packaging is Copyright (C) 2007-2012, Bernd Zeimetz <bernd@bzed.de> and
 is licensed under the GPL 2, see above.
 
only in patch2:
unchanged:
--- winpdb-1.4.8.orig/debian/README.source
+++ winpdb-1.4.8/debian/README.source
@@ -0,0 +1,3 @@
+This package uses dpatch to manage its patches. Install
+the dpatch package and read /usr/share/doc/dpatch/README.source.gz
+for details.