diff -u dansguardian-2.9.9.7/debian/changelog dansguardian-2.9.9.7/debian/changelog
--- dansguardian-2.9.9.7/debian/changelog
+++ dansguardian-2.9.9.7/debian/changelog
@@ -1,3 +1,12 @@
+dansguardian (2.9.9.7-2.1ubuntu1) karmic; urgency=low
+
+  * Merge from Debian unstable, remaining changes (LP: #372357)
+  * Patched to compile with GCC-4.4
+    - debian/patches/52_gcc44_build_fix.dpatch (proposed patch from
+      Debian #526156)
+
+ -- Imre Gergely <gimre@narancs.net>  Wed, 06 May 2009 22:28:14 +0300
+
 dansguardian (2.9.9.7-2.1) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -6,6 +15,13 @@
 
  -- Imre Gergely <gimre@narancs.net>  Sun, 19 Apr 2009 09:42:35 +0300
 
+dansguardian (2.9.9.7-2ubuntu1) jaunty; urgency=low
+
+  * new PPA test build with clamav 0.95
+    - debian/patches/50_clamav095_support.dpatch
+
+ -- Imre Gergely <gimre@narancs.net>  Tue, 07 Apr 2009 21:19:22 +0300
+
 dansguardian (2.9.9.7-2) unstable; urgency=low
 
   [ Thomas Viehmann ]
@@ -216,0 +233 @@
+
diff -u dansguardian-2.9.9.7/debian/patches/00list dansguardian-2.9.9.7/debian/patches/00list
--- dansguardian-2.9.9.7/debian/patches/00list
+++ dansguardian-2.9.9.7/debian/patches/00list
@@ -6,0 +7 @@
+52_gcc44_build_fix.dpatch
only in patch2:
unchanged:
--- dansguardian-2.9.9.7.orig/debian/patches/52_gcc44_build_fix.dpatch
+++ dansguardian-2.9.9.7/debian/patches/52_gcc44_build_fix.dpatch
@@ -0,0 +1,52 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 52_gcc44_build_fix.dpatch by Imre Gergely <gimre@narancs.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: add some #include's to compile correctly with GCC 4.4
+## DP: proposed patch from Debian bug #526156
+
+@DPATCH@
+diff -urNad dansguardian-2.9.9.7~/src/contentscanners/clamav.cpp dansguardian-2.9.9.7/src/contentscanners/clamav.cpp
+--- dansguardian-2.9.9.7~/src/contentscanners/clamav.cpp	2009-05-06 22:21:28.000000000 +0300
++++ dansguardian-2.9.9.7/src/contentscanners/clamav.cpp	2009-05-06 22:23:01.000000000 +0300
+@@ -33,6 +33,7 @@
+ #include <unistd.h>
+ #include <clamav.h>
+ #include <fcntl.h>
++#include <stdio.h>
+ 
+ 
+ // GLOBALS
+diff -urNad dansguardian-2.9.9.7~/src/contentscanners/commandlinescan.cpp dansguardian-2.9.9.7/src/contentscanners/commandlinescan.cpp
+--- dansguardian-2.9.9.7~/src/contentscanners/commandlinescan.cpp	2008-06-10 12:47:55.000000000 +0300
++++ dansguardian-2.9.9.7/src/contentscanners/commandlinescan.cpp	2009-05-06 22:22:41.000000000 +0300
+@@ -34,6 +34,7 @@
+ #include <sys/stat.h>
+ #include <sys/wait.h>
+ #include <unistd.h>
++#include <stdio.h>
+ #include <list>
+ 
+ 
+diff -urNad dansguardian-2.9.9.7~/src/contentscanners/icapscan.cpp dansguardian-2.9.9.7/src/contentscanners/icapscan.cpp
+--- dansguardian-2.9.9.7~/src/contentscanners/icapscan.cpp	2008-06-10 12:41:51.000000000 +0300
++++ dansguardian-2.9.9.7/src/contentscanners/icapscan.cpp	2009-05-06 22:23:42.000000000 +0300
+@@ -36,6 +36,7 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <netdb.h>		// for gethostby
++#include <stdio.h>
+ 
+ 
+ // DEFINES
+diff -urNad dansguardian-2.9.9.7~/src/downloadmanagers/fancy.cpp dansguardian-2.9.9.7/src/downloadmanagers/fancy.cpp
+--- dansguardian-2.9.9.7~/src/downloadmanagers/fancy.cpp	2008-06-10 12:41:25.000000000 +0300
++++ dansguardian-2.9.9.7/src/downloadmanagers/fancy.cpp	2009-05-06 22:22:23.000000000 +0300
+@@ -32,6 +32,7 @@
+ #include <unistd.h>
+ #include <iostream>
+ #include <math.h>
++#include <stdio.h>
+ 
+ 
+ // GLOBALS