diff -u istanbul-0.2.2/debian/control istanbul-0.2.2/debian/control
--- istanbul-0.2.2/debian/control
+++ istanbul-0.2.2/debian/control
@@ -21,7 +21,7 @@
 	    python-gst0.10 (>= 0.10), python-glade2 (>= 2.8.2-3.1), 
 	    gettext, gstreamer0.10-plugins-good (>= 0.10.3),
 	    gstreamer0.10-plugins-base (>= 0.10.8), gstreamer0.10-x, 
-	    gstreamer0.10-alsa, python-gnome2, python-xlib
+	    gstreamer0.10-alsa [!kfreebsd-any], python-gnome2, python-xlib
 Suggests: fbpanel | perlpanel
 XB-Python-Version: ${python:Versions}
 Description: Desktop session recorder producing Ogg Theora video
diff -u istanbul-0.2.2/debian/changelog istanbul-0.2.2/debian/changelog
--- istanbul-0.2.2/debian/changelog
+++ istanbul-0.2.2/debian/changelog
@@ -1,3 +1,11 @@
+istanbul (0.2.2-8) unstable; urgency=medium
+
+  * Remove GStreamer alsa explicit audiosource, not available on kfreebsd-*
+    (Closes: #591739)
+  * Avoid overwriting directories when saving screencast (Closes: #592258)
+
+ -- Luca Bruno <lucab@debian.org>  Tue, 17 Aug 2010 11:39:08 +0200
+
 istanbul (0.2.2-7) unstable; urgency=low
 
   * Bumped Standards-version to 3.9.0 (no changes needed)
diff -u istanbul-0.2.2/debian/patches/series istanbul-0.2.2/debian/patches/series
--- istanbul-0.2.2/debian/patches/series
+++ istanbul-0.2.2/debian/patches/series
@@ -10,0 +11,2 @@
+dir-overwrite.diff
+kfreebsd-noalsa.diff
only in patch2:
unchanged:
--- istanbul-0.2.2.orig/debian/patches/kfreebsd-noalsa.diff
+++ istanbul-0.2.2/debian/patches/kfreebsd-noalsa.diff
@@ -0,0 +1,13 @@
+Index: istanbul-0.2.2/istanbul/main/screencast.py
+===================================================================
+--- istanbul-0.2.2.orig/istanbul/main/screencast.py	2010-08-17 11:38:02.898762661 +0200
++++ istanbul-0.2.2/istanbul/main/screencast.py	2010-08-17 11:38:51.154511463 +0200
+@@ -95,7 +95,7 @@
+             if Preferences().has_gconf():
+                 asource = 'gconfaudiosrc name=audiosource'
+             else:
+-                asource = 'alsasrc name=audiosource'
++                asource = 'autoaudiosrc name=audiosource'
+             acappipeline = '%s ! audioconvert ! vorbisenc' % asource
+ 
+         vencode_pipeline = 'video/x-raw-yuv,width=%d,height=%d,framerate=%s '\
only in patch2:
unchanged:
--- istanbul-0.2.2.orig/debian/patches/dir-overwrite.diff
+++ istanbul-0.2.2/debian/patches/dir-overwrite.diff
@@ -0,0 +1,27 @@
+Index: istanbul-0.2.2/istanbul/main/save_window.py
+===================================================================
+--- istanbul-0.2.2.orig/istanbul/main/save_window.py	2010-08-17 11:45:43.178263468 +0200
++++ istanbul-0.2.2/istanbul/main/save_window.py	2010-08-17 11:46:54.030511524 +0200
+@@ -265,7 +265,7 @@
+             try:
+                 trysave = gnomevfs.xfer_uri(gnomevfs.URI("file://%s" % self.location), 
+                     gnomevfs.URI(self.filechooser.get_uri()), 
+-                    gnomevfs.XFER_DELETE_ITEMS,
++                    gnomevfs.XFER_REMOVESOURCE,
+                     gnomevfs.XFER_ERROR_MODE_ABORT | XFER_TARGET_DEFAULT_PERMS, 
+                     gnomevfs.XFER_OVERWRITE_MODE_ABORT)
+             except gnomevfs.FileExistsError:
+@@ -281,10 +281,12 @@
+                 dialog.hide()
+                 if res == gtk.RESPONSE_YES:
+                     try:
++                        if os.path.isdir(self.filechooser.get_uri()[7:]):
++                            raise Exception()
+                         trysave = gnomevfs.xfer_uri(
+                         gnomevfs.URI("file://%s" % self.location), 
+                         gnomevfs.URI(self.filechooser.get_uri()), 
+-                        gnomevfs.XFER_DELETE_ITEMS,
++                        gnomevfs.XFER_REMOVESOURCE,
+                         gnomevfs.XFER_ERROR_MODE_ABORT | XFER_TARGET_DEFAULT_PERMS, 
+                         gnomevfs.XFER_OVERWRITE_MODE_REPLACE)
+                     except Exception: