diff -u w3m-el-1.4.4/debian/changelog w3m-el-1.4.4/debian/changelog
--- w3m-el-1.4.4/debian/changelog
+++ w3m-el-1.4.4/debian/changelog
@@ -1,3 +1,23 @@
+w3m-el (1.4.4-3ubuntu1) gutsy; urgency=low
+
+  * debian/compat: Fix lintian warning by setting this to 5.
+  * debian/control:
+    - (Build-Depends): Add debhelper.
+    - (Build-Depends-Indep): Add emacs22 and emacs-snapshot, but after
+      emacs21, so we don't have to wait for emacs22 to be accepted into
+      the archive.
+    - (Depends): Add emacs22.
+    - (Standards-Version): Update to 3.7.2.
+    - (Maintainer, Original-Maintainer): Follow policy.
+  * debian/emacsen-install: Create symlinks for .el files, rather than
+    copying .el files and then removing them.  This makes find-function
+    work.
+  * debian/rules:
+    - Remove DH_COMPAT to silence lintian.
+    - (clean): Silence lintian warning.
+
+ -- Michael W. Olson (GNU address) <mwolson@gnu.org>  Tue, 10 Jul 2007 21:35:16 -0400
+
 w3m-el (1.4.4-3) unstable; urgency=low
 
   * change dependency: Depends: emacs21 | emacs-snapshot | apel,
diff -u w3m-el-1.4.4/debian/control w3m-el-1.4.4/debian/control
--- w3m-el-1.4.4/debian/control
+++ w3m-el-1.4.4/debian/control
@@ -1,14 +1,15 @@
 Source: w3m-el
 Section: web
 Priority: optional
-Maintainer: Fumitoshi UKAI <ukai@debian.or.jp>
-Build-Depends: debhelper (>= 3.0.0)
-Build-Depends-Indep: emacs21
-Standards-Version: 3.5.7
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Fumitoshi UKAI <ukai@debian.or.jp>
+Build-Depends: debhelper (>= 5.0.0)
+Build-Depends-Indep: emacs21 | emacs22 | emacs-snapshot
+Standards-Version: 3.7.2
 
 Package: w3m-el
 Architecture: all
-Depends: emacs21 | emacs-snapshot | apel (>= 10.5), w3m (>= 0.3) | w3m-ssl (>= 0.3) | w3mmee (>= 0.3)
+Depends: emacs22 | emacs21 | emacs-snapshot | apel (>= 10.5), w3m (>= 0.3) | w3m-ssl (>= 0.3) | w3mmee (>= 0.3)
 Recommends: apel (>= 10.5), flim, mule-ucs, imagemagick, wv, xlhtml, ppthtml
 Suggests: bitmap-mule
 Conflicts: mew (<< 2.0), flim (<< 1.14.3), apel (<< 10.5)
diff -u w3m-el-1.4.4/debian/emacsen-install w3m-el-1.4.4/debian/emacsen-install
--- w3m-el-1.4.4/debian/emacsen-install
+++ w3m-el-1.4.4/debian/emacsen-install
@@ -56,10 +56,10 @@
 #     install-info-altdir --quiet --section "" "" --dirname=${FLAVOR} /usr/info/${PACKAGE}.info.gz
 # fi
 
-(cd ${ELDIR}; FILES=`echo *.el`; cp ${FILES} ${ELCDIR})
-(cd ${ELDIR}/shimbun; FILES=`echo *.el`; cp ${FILES} ${ELCDIR}/shimbun)
 cd ${ELCDIR}
 rm -f *.elc shimbun/*.elc
+ln -sf ${ELDIR}/*.el .
+(cd ${ELCDIR}/shimbun; ln -sf ${ELDIR}/shimbun/*.el .)
 if [ ${FLAVOR} = mule2 ]; then
   ${FLAVOR} -q -no-site-file -batch -f batch-byte-compile regexp-opt.el
 fi
@@ -71,7 +71,7 @@
 fi
 
 ${FLAVOR} ${FLAGS} -f w3mhack-compile 2>&1 | gzip -9 > CompilationLog.gz
-rm -f `ls -1 *.el | grep -v 'w3m-\(kwds\|load\).el'` path.el shimbun/*.el path.elc
+rm -f path.el path.elc
 
 # force to recopmile wl for shimbun module
 #  fix "Cannot open load file: elmo-shimbun"
diff -u w3m-el-1.4.4/debian/rules w3m-el-1.4.4/debian/rules
--- w3m-el-1.4.4/debian/rules
+++ w3m-el-1.4.4/debian/rules
@@ -5,9 +5,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatability version to use.
-export DH_COMPAT=3
-
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
@@ -29,7 +26,7 @@
 	rm -f build-stamp configure-stamp
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) clean
+	[ ! -f config.status ] || $(MAKE) clean
 	-rm -f config.log config.cache config.status
 	dh_clean
 
only in patch2:
unchanged:
--- w3m-el-1.4.4.orig/debian/compat
+++ w3m-el-1.4.4/debian/compat
@@ -0,0 +1 @@
+5