diff -u skstream-0.3.6/debian/rules skstream-0.3.6/debian/rules
--- skstream-0.3.6/debian/rules
+++ skstream-0.3.6/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpatch/dpatch.make
+
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
@@ -17,7 +19,7 @@
 	INSTALL_PROGRAM += -s
 endif
 
-config.status: configure
+config.status: patch-stamp configure
 	dh_testdir
 	CFLAGS="$(CFLAGS)" LDFLAGS=-lstdc++ ./configure \
 		--host=$(DEB_HOST_GNU_TYPE) \
@@ -27,7 +29,6 @@
 		--infodir=\$${prefix}/share/info \
 		--disable-dependency-tracking \
 		--disable-debug
-
 build: build-stamp
 build-stamp:  config.status
 	dh_testdir
@@ -36,7 +37,7 @@
 
 	touch build-stamp
 
-clean:
+clean:  unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp 
diff -u skstream-0.3.6/debian/control skstream-0.3.6/debian/control
--- skstream-0.3.6/debian/control
+++ skstream-0.3.6/debian/control
@@ -1,9 +1,10 @@
 Source: skstream
 Priority: optional
 Section: libs
-Maintainer: Michael Koch <konqueror@gmx.de>
-Build-Depends: debhelper (>= 5), libcppunit-dev
-Standards-Version: 3.7.3
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Michael Koch <konqueror@gmx.de>
+Build-Depends: debhelper (>= 5), libcppunit-dev, dpatch
+Standards-Version: 3.8.0
 
 Package: libskstream-0.3-dev
 Section: libdevel
diff -u skstream-0.3.6/debian/changelog skstream-0.3.6/debian/changelog
--- skstream-0.3.6/debian/changelog
+++ skstream-0.3.6/debian/changelog
@@ -1,3 +1,12 @@
+skstream (0.3.6-3ubuntu1) intrepid; urgency=low
+
+  * Add dpatch patch system
+    - Add 01_skstream-0.3.6-gcc43.dpatch (LP: #249226)
+  * Bump Standards-Version to 3.8.0
+    - Add debian/README.source
+
+ -- Nathan Handler <nhandler@ubuntu.com>  Fri, 25 Jul 2008 21:32:34 -0500
+
 skstream (0.3.6-3) unstable; urgency=low
 
   * Include stdlib.h when necessary. Closes: #455324.
only in patch2:
unchanged:
--- skstream-0.3.6.orig/debian/README.source
+++ skstream-0.3.6/debian/README.source
@@ -0,0 +1 @@
+Use dpatch-edit-patch, see man dpatch-edit-patch for details on how to do this.
only in patch2:
unchanged:
--- skstream-0.3.6.orig/debian/patches/00list
+++ skstream-0.3.6/debian/patches/00list
@@ -0,0 +1 @@
+01_skstream-0.3.6-gcc43.dpatch
only in patch2:
unchanged:
--- skstream-0.3.6.orig/debian/patches/01_skstream-0.3.6-gcc43.dpatch
+++ skstream-0.3.6/debian/patches/01_skstream-0.3.6-gcc43.dpatch
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_skstream-0.3.6-gcc43.dpatch by Nathan Handler <nhandler@ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch from Fedora to rebuild for gcc 4.3
+
+@DPATCH@
+diff -urNad skstream-0.3.6~/skstream/skserver.cpp skstream-0.3.6/skstream/skserver.cpp
+--- skstream-0.3.6~/skstream/skserver.cpp	2008-07-25 20:32:43.000000000 -0500
++++ skstream-0.3.6/skstream/skserver.cpp	2008-07-25 20:57:11.000000000 -0500
+@@ -41,6 +41,7 @@
+ 
+ #include <iostream>
+ #include <cstdio>
++#include <cstring>
+ 
+ #include <string.h>
+ 
+diff -urNad skstream-0.3.6~/skstream/skstream.cpp skstream-0.3.6/skstream/skstream.cpp
+--- skstream-0.3.6~/skstream/skstream.cpp	2008-07-25 20:32:43.000000000 -0500
++++ skstream-0.3.6/skstream/skstream.cpp	2008-07-25 20:56:52.000000000 -0500
+@@ -42,6 +42,7 @@
+ #endif // _WIN32
+ 
+ #include <cstdio>
++#include <cstring>
+ #include <cassert>
+ 
+ #include <string.h>