--- linkchecker-5.2.orig/debian/changelog
+++ linkchecker-5.2/debian/changelog
@@ -1,3 +1,17 @@
+linkchecker (5.2-1ubuntu1) maverick; urgency=low
+
+  [ Lorenzo De Liso ]
+  * Merge from debian unstable (LP: #598608), remaining changes:
+    - Python 2.6 transition:
+      + Adjust debian/linkchecker*.install files from
+        "python2.5/site-packages" to "python*/*-packages"
+
+  [ Stefano Rivera ]
+  * Correctly clean and apply my Python 2.6 transition improvements as in
+    Debian Bug #587219
+
+ -- Lorenzo De Liso <blackz@ubuntu.com>  Fri, 25 Jun 2010 20:40:14 +0200
+
 linkchecker (5.2-1) unstable; urgency=low
 
   * New upstream release.
@@ -9,6 +23,17 @@
 
  -- Bastian Kleineidam <calvin@debian.org>  Mon, 08 Mar 2010 09:26:02 +0100
 
+linkchecker (5.1-2ubuntu1) maverick; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+   - Python 2.6 transition:
+    + Adjust debian/linkchecker*.install files from
+      "python2.5/site-packages" to "python*/*-packages"
+    + Bump up python-all-dev build-dependency and set
+      XS-Python-Versions to current.
+
+ -- Andrew Starr-Bochicchio <a.starr.b@gmail.com>  Fri, 18 Jun 2010 15:09:24 -0400
+
 linkchecker (5.1-2) unstable; urgency=low
 
   * Added dependency on QT sqlite database package for linkchecker-gui
@@ -19,6 +44,17 @@
 
  -- Bastian Kleineidam <calvin@debian.org>  Mon, 15 Feb 2010 23:38:59 +0100
 
+linkchecker (5.1-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Python 2.6 transition:
+      + Adjust debian/linkchecker*.install files to install all the python
+        stuffs correctly.
+      + Bump up python-dev build-dependency and set XS-Python-Versions to
+        current.
+
+ -- Nick Ellery <nick.ellery@ubuntu.com>  Mon, 10 Aug 2009 16:41:32 -0700
+
 linkchecker (5.1-1) unstable; urgency=low
 
   * New upstream release.
--- linkchecker-5.2.orig/debian/control
+++ linkchecker-5.2/debian/control
@@ -1,7 +1,8 @@
 Source: linkchecker
 Section: web
 Priority: optional
-Maintainer: Bastian Kleineidam <calvin@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Bastian Kleineidam <calvin@debian.org>
 Build-Depends: python-all-dev (>= 2.5), debhelper (>= 7), gettext,
  cdbs (>= 0.4.43), python-central (>= 0.6), qt4-dev-tools
 XS-Python-Standards-Version: 0.4
--- linkchecker-5.2.orig/debian/linkchecker.install
+++ linkchecker-5.2/debian/linkchecker.install
@@ -3,14 +3,14 @@
 usr/share/man/man5/linkcheckerrc.5
 usr/share/man/de/man1/linkchecker.1
 usr/share/man/de/man5/linkcheckerrc.5
-usr/lib/python2.5/site-packages/_LinkChecker_configdata.py
-usr/lib/python2.5/site-packages/linkcheck/*.py
-usr/lib/python2.5/site-packages/linkcheck/HtmlParser
-usr/lib/python2.5/site-packages/linkcheck/cache
-usr/lib/python2.5/site-packages/linkcheck/checker
-usr/lib/python2.5/site-packages/linkcheck/configuration
-usr/lib/python2.5/site-packages/linkcheck/director
-usr/lib/python2.5/site-packages/linkcheck/dns
-usr/lib/python2.5/site-packages/linkcheck/htmlutil
-usr/lib/python2.5/site-packages/linkcheck/logger
-usr/lib/python2.5/site-packages/linkcheck/network
+usr/lib/python*/*-packages/_LinkChecker_configdata.py
+usr/lib/python*/*-packages/linkcheck/*.py
+usr/lib/python*/*-packages/linkcheck/HtmlParser
+usr/lib/python*/*-packages/linkcheck/cache
+usr/lib/python*/*-packages/linkcheck/checker
+usr/lib/python*/*-packages/linkcheck/configuration
+usr/lib/python*/*-packages/linkcheck/director
+usr/lib/python*/*-packages/linkcheck/dns
+usr/lib/python*/*-packages/linkcheck/htmlutil
+usr/lib/python*/*-packages/linkcheck/logger
+usr/lib/python*/*-packages/linkcheck/network
--- linkchecker-5.2.orig/debian/rules
+++ linkchecker-5.2/debian/rules
@@ -42,3 +42,10 @@
 	install -m 644 build/share/locale/de/LC_MESSAGES/LinkChecker.mo $(LOCALE)/de/LC_MESSAGES/
 # apache configuration
 	install -m 644 config/linkchecker.apache2.conf $(ETC)/apache2/conf.d/linkchecker
+
+clean::
+	rm -f doc/html/*.qch doc/html/*.qhc
+	rm -f _LinkChecker_configdata.py
+
+common-binary-arch::
+	sed -i '1s,#!/usr/bin/python2\..,#!/usr/bin/python,' $(CURDIR)/debian/tmp/usr/bin/*
--- linkchecker-5.2.orig/debian/linkchecker-gui.install
+++ linkchecker-5.2/debian/linkchecker-gui.install
@@ -1,5 +1,5 @@
 usr/bin/linkchecker-gui
-usr/lib/python2.5/site-packages/linkcheck/gui
+usr/lib/python*/*-packages/linkcheck/gui
 usr/share/man/man1/linkchecker-gui.1
 usr/share/man/de/man1/linkchecker-gui.1
 usr/share/linkchecker/lccollection.qhc