diff -u linkchecker-4.8/_linkchecker_configdata.py linkchecker-4.8/_linkchecker_configdata.py
--- linkchecker-4.8/_linkchecker_configdata.py
+++ linkchecker-4.8/_linkchecker_configdata.py
@@ -1,8 +1,8 @@
 # -*- coding: iso-8859-1 -*-
 # this file is automatically created by setup.py
-config_dir = '/home/calvin/src/build-area/linkchecker-4.8/config'
-install_data = '/home/calvin/src/build-area/linkchecker-4.8'
-install_scripts = '/home/calvin/src/build-area/linkchecker-4.8'
+config_dir = '/home/hellboy/merges/linkchecker-4.8/config'
+install_data = '/home/hellboy/merges/linkchecker-4.8'
+install_scripts = '/home/hellboy/merges/linkchecker-4.8'
 name = u'linkchecker'
 version = u'4.8'
 author = u'Bastian Kleineidam'
only in patch2:
unchanged:
--- linkchecker-4.8.orig/debian/control
+++ linkchecker-4.8/debian/control
@@ -1,7 +1,8 @@
 Source: linkchecker
 Section: web
 Priority: optional
-Maintainer: Bastian Kleineidam <calvin@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Bastian Kleineidam <calvin@debian.org>
 Build-Depends: python-all-dev (>= 2.4), debhelper (>= 5.0.37.2), gettext, cdbs (>= 0.4.43), python-central (>= 0.5)
 XS-Python-Standards-Version: 0.4
 XS-Python-Version: >= 2.4
only in patch2:
unchanged:
--- linkchecker-4.8.orig/debian/rules
+++ linkchecker-4.8/debian/rules
@@ -37,6 +37,20 @@
 # install bash_completion script
 	install -m 644 config/linkchecker-completion $(ETC)/bash_completion.d
 
+	: # Replace all '#!' calls to python with /usr/bin/python
+	: # and make them executable
+	for i in `find debian/linkchecker -type f`; do \
+	  sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \
+		$$i > $$i.temp; \
+	  if cmp --quiet $$i $$i.temp; then \
+	    rm -f $$i.temp; \
+	  else \
+	    mv -f $$i.temp $$i; \
+	    chmod 755 $$i; \
+	    echo "fixed interpreter: $$i"; \
+	  fi; \
+	done
+
 binary-post-install/linkchecker::
 # remove the README file which somehow gets installed
 	rm $(DOCDIR)/README
only in patch2:
unchanged:
--- linkchecker-4.8.orig/debian/changelog
+++ linkchecker-4.8/debian/changelog
@@ -1,3 +1,11 @@
+linkchecker (4.8-1ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - Drop dependency on versioned python package.
+    - Modify Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- Stefan Ebner <hellboy195@gmail.com>  Fri, 4 Jan 2007 22:52:11 +0100
+
 linkchecker (4.8-1) unstable; urgency=low
 
   * New upstream release.
@@ -10,6 +18,14 @@
 
  -- Bastian Kleineidam <calvin@debian.org>  Tue, 16 Oct 2007 20:00:25 +0200
 
+linkchecker (4.7-2ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - Drop dependency on versioned python package.
+    - Modify Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- Andrea Veri <bluekuja@ubuntu.com>  Tue, 19 Jun 2007 23:43:11 +0200
+
 linkchecker (4.7-2) unstable; urgency=low
 
   * On some installations old files are lingering around after purging
@@ -19,6 +35,14 @@
 
  -- Bastian Kleineidam <calvin@debian.org>  Tue, 19 Jun 2007 16:57:03 +0200
 
+linkchecker (4.7-1ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - Drop dependency on versioned python package.
+  * Modify Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- Andrea Veri <bluekuja@ubuntu.com>  Sun, 17 Jun 2007 11:32:09 +0200
+
 linkchecker (4.7-1) unstable; urgency=low
 
   * New upstream release.
@@ -27,6 +51,12 @@
 
  -- Bastian Kleineidam <calvin@debian.org>  Mon, 19 Feb 2007 20:22:47 +0100
 
+linkchecker (4.6-1ubuntu1) feisty; urgency=low
+
+  * Drop dependency on versioned python package.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 15 Jan 2007 17:45:04 +0100
+
 linkchecker (4.6-1) unstable; urgency=low
 
   * New upstream release.