diff -u nautilus-clamscan-0.2.2/debian/nautilus-clamscan.install nautilus-clamscan-0.2.2/debian/nautilus-clamscan.install
--- nautilus-clamscan-0.2.2/debian/nautilus-clamscan.install
+++ nautilus-clamscan-0.2.2/debian/nautilus-clamscan.install
@@ -1 +1 @@
-nautilus-clamscan.py /usr/lib/nautilus/extensions-1.0/python/
+nautilus-clamscan.py /usr/lib/nautilus/extensions-2.0/python/
diff -u nautilus-clamscan-0.2.2/debian/watch nautilus-clamscan-0.2.2/debian/watch
--- nautilus-clamscan-0.2.2/debian/watch
+++ nautilus-clamscan-0.2.2/debian/watch
@@ -2 +2,2 @@
-http://launchpad.net/nautilus-clamscan/trunk/(.*)/+download/nautilus-clamscan-(.*)\.tar\.gz
+https://launchpad.net/nautilus-clamscan/+download \
+http://launchpad.net/nautilus-clamscan/trunk/.*/\+download/nautilus-clamscan-(.*)\.tar\.gz
diff -u nautilus-clamscan-0.2.2/debian/control nautilus-clamscan-0.2.2/debian/control
--- nautilus-clamscan-0.2.2/debian/control
+++ nautilus-clamscan-0.2.2/debian/control
@@ -10,7 +10,7 @@
 
 Package: nautilus-clamscan
 Architecture: all
-Depends: ${python:Depends}, python-gtk2, python-clamav, clamav, python-nautilus
+Depends: ${python:Depends}, ${misc:Depends}, python-gtk2, python-clamav, python-nautilus
 XB-Python-Version: ${python:Versions}
 Description: Antivirus scanning for Nautilus
  Nautilus-clamscan is a Nautilus extension that adds a "Scan for viruses" item
diff -u nautilus-clamscan-0.2.2/debian/changelog nautilus-clamscan-0.2.2/debian/changelog
--- nautilus-clamscan-0.2.2/debian/changelog
+++ nautilus-clamscan-0.2.2/debian/changelog
@@ -1,3 +1,16 @@
+nautilus-clamscan (0.2.2-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/watch: Fix broken watch file. (Closes: #550765)
+  * debian/control:
+   - Add missing misc:Depends.
+   - Don't depend on clamav directly. (Closes: #529186)
+  * debian/nautilus-clamscan.install:
+   - Install to correct nautilus extensions directory. (Closes: #539813).
+  * debian/source/format: Declare package as 1.0 format. 
+
+ -- Andrew Starr-Bochicchio <a.starr.b@gmail.com>  Mon, 14 Jun 2010 12:38:32 -0400
+
 nautilus-clamscan (0.2.2-2) unstable; urgency=low
 
   * Install nautilus-clamscan.py to /usr/lib/nautilus/extensions-1.0/python/
only in patch2:
unchanged:
--- nautilus-clamscan-0.2.2.orig/debian/source/format
+++ nautilus-clamscan-0.2.2/debian/source/format
@@ -0,0 +1 @@
+1.0