diff -u clamav-0.91.2/debian/control clamav-0.91.2/debian/control
--- clamav-0.91.2/debian/control
+++ clamav-0.91.2/debian/control
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
 XSBC-Original-Maintainer: Stephen Gran <sgran@debian.org>
 Uploaders: Thomas Lamy <Thomas.Lamy@in-online.net>
-Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>=5.0), zlib1g-dev (>=1:1.1.4), libbz2-dev, libmilter-dev, libgmp3-dev, libwrap0-dev, libcurl-dev, dpatch, perl, bc
+Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>=5.0), zlib1g-dev (>=1:1.1.4), libbz2-dev, libmilter-dev, libgmp3-dev, libwrap0-dev, libcurl4-gnutls-dev, dpatch, perl, bc
 Standards-Version: 3.7.2
 
 Package: clamav-base
@@ -45,7 +45,7 @@
 
 Package: clamav
 Architecture: any
-Depends: ${shlibs:Depends}, clamav-freshclam | clamav-data, libcurl3
+Depends: ${shlibs:Depends}, clamav-freshclam | clamav-data, libcurl3-gnutls
 Recommends: arj, unzoo, clamav-base
 Suggests: unrar (>=3.0-1), lha, clamav-docs
 Description: antivirus scanner for Unix
@@ -76,7 +76,7 @@
 Package: libclamav-dev
 Section: libdevel
 Architecture: any
-Depends: libclamav2 (= ${binary:Version}), libcurl3-dev, libssl-dev, libidn11-dev, libc6-dev | libc-dev, zlib1g-dev (>=1:1.1.4), libbz2-dev, libgmp3-dev
+Depends: libclamav2 (= ${binary:Version}), libcurl4-gnutls-dev, libssl-dev, libidn11-dev, libc6-dev | libc-dev, zlib1g-dev (>=1:1.1.4), libbz2-dev, libgmp3-dev
 Description: clam Antivirus library development files
  Clam AntiVirus is an anti-virus toolkit for Unix. The main purpose of this
  software is the integration with mail servers (attachment scanning). The
@@ -109,7 +109,7 @@
 
 Package: clamav-daemon
 Architecture: any
-Depends: ${shlibs:Depends}, clamav-base(>= ${source:Version}), clamav-freshclam | clamav-data, lsb-base (>> 3.0), ucf, libcurl3
+Depends: ${shlibs:Depends}, clamav-base(>= ${source:Version}), clamav-freshclam | clamav-data, lsb-base (>> 3.0), ucf, libcurl3-gnutls
 Suggests: daemon, clamav-docs
 Description: antivirus scanner daemon
  Clam AntiVirus is an anti-virus toolkit for Unix. The main purpose of this
@@ -146,7 +146,7 @@
 Conflicts: clamav-data
 Provides: clamav-data
 Suggests: clamav-docs
-Depends: ${misc:Depends}, clamav-base (>= ${source:Version}), ${shlibs:Depends} , debianutils (>= 1.6), ucf (>= 0.28), logrotate, lsb-base (>> 3.0), libcurl3
+Depends: ${misc:Depends}, clamav-base (>= ${source:Version}), ${shlibs:Depends} , debianutils (>= 1.6), ucf (>= 0.28), logrotate, lsb-base (>> 3.0), libcurl3-gnutls
 Description: downloads clamav virus databases from the Internet
  Clam AntiVirus is an anti-virus toolkit for Unix. The main purpose of this
  software is the integration with mail servers (attachment scanning). The
@@ -164,7 +164,7 @@
 Suggests: daemon, clamav-docs
 Priority: extra
 Recommends: clamav-daemon
-Depends: ${shlibs:Depends}, clamav-base (>= ${source:Version}), clamav-freshclam | clamav-data, lsb-base (>> 3.0), libcurl3
+Depends: ${shlibs:Depends}, clamav-base (>= ${source:Version}), clamav-freshclam | clamav-data, lsb-base (>> 3.0), libcurl3-gnutls
 Description: antivirus scanner for sendmail
  Clam AntiVirus is an anti-virus toolkit for Unix. The main purpose of this
  software is the integration with mail servers (attachment scanning). The
diff -u clamav-0.91.2/debian/clamav-base.postinst.in clamav-0.91.2/debian/clamav-base.postinst.in
--- clamav-0.91.2/debian/clamav-base.postinst.in
+++ clamav-0.91.2/debian/clamav-base.postinst.in
@@ -254,7 +254,7 @@
     [ -z "$PhishingRestrictedScan" ] && PhishingRestrictedScan=true
     [ -z "$PhishingAlwaysBlockSSLMismatch" ] && PhishingAlwaysBlockSSLMismatch=false
     [ -z "$PhishingAlwaysBlockCloak" ] && PhishingAlwaysBlockCloak=false
-    [ -z "$DetectPUA" ] && DetectPUA=no
+    [ -z "$DetectPUA" ] && DetectPUA=false
 
     cat >> $DEBCONFFILE << EOF
 User $user
diff -u clamav-0.91.2/debian/changelog clamav-0.91.2/debian/changelog
--- clamav-0.91.2/debian/changelog
+++ clamav-0.91.2/debian/changelog
@@ -1,3 +1,30 @@
+clamav (0.91.2-1ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable (LP: #135846). Remaining Ubuntu changes:
+    - Update debian/watch so it works
+    - Add libcurl3-gnutls depends for clamav-freshclam, clamav-milter,
+      clamav-daemon
+    - In debian/clamav-base.postinst.in add test on upgrade to create
+      /var/run/clamav if it does not exist
+    - debian/control: Maintainers updated for Ubuntu.
+    - debian/clamav-freshclam.init.in specify pidfile when starting.
+  * Add an explicit Build-Depends on libcurl4-gnutls-dev (was libcurl-dev).
+  * Change Build-Depends in libclamav-dev to libcurl4-gnutls-dev
+    (was libcurl3-dev).
+ 
+ -- Cesare Tirabassi <cesare.tirabassi@gmail.com>  Thu, 30 Aug 2007 16:28:07 +0200
+
+clamav (0.91.2-1) unstable; urgency=low
+
+  * New upstream version
+    - fix call to tolower() which led to a crash in libclamav
+    - fix possible NULL dereference, e.g. when parsing email with RFC2397
+      URI
+    - fix floating point exception when using ScanOLE2
+    - fix possible NULL dereference in rtf.c
+
+ -- Stephen Gran <sgran@debian.org>  Tue, 21 Aug 2007 11:17:01 +0100
+
 clamav (0.91.2-0ubuntu1) gutsy; urgency=low
 
   * New upstream release