Please unblock dvdisaster 0.70.3-2
Hi,
please unblock dvdisaster 0.70.3-2, it fixes #405757, debdiff is attached.
--
Address: Daniel Baumann, Burgunderstrasse 3, CH-4562 Biberist
Email: daniel.baumann@panthera-systems.net
Internet: http://people.panthera-systems.net/~daniel-baumann/
diff -u dvdisaster-0.70.3/debian/patches/00list dvdisaster-0.70.3/debian/patches/00list
--- dvdisaster-0.70.3/debian/patches/00list
+++ dvdisaster-0.70.3/debian/patches/00list
@@ -5,0 +6 @@
+06-glib
diff -u dvdisaster-0.70.3/debian/changelog dvdisaster-0.70.3/debian/changelog
--- dvdisaster-0.70.3/debian/changelog
+++ dvdisaster-0.70.3/debian/changelog
@@ -1,3 +1,10 @@
+dvdisaster (0.70.3-2) unstable; urgency=medium
+
+ * Added patch from Carsten Gnoerlich <carsten@dvdisaster.com> to fix issues
+ with glib threading (Closes: #405757).
+
+ -- Daniel Baumann <daniel@debian.org> Wed, 17 Jan 2007 10:42:00 +0100
+
dvdisaster (0.70.3-1) unstable; urgency=low
* New upstream release.
only in patch2:
unchanged:
--- dvdisaster-0.70.3.orig/debian/patches/06-glib.dpatch
+++ dvdisaster-0.70.3/debian/patches/06-glib.dpatch
@@ -0,0 +1,85 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 06-glib.dpatch by Carsten Gnoerlich <carsten@dvdisaster.com>
+##
+## DP: Fixes issue with glib threading (Closes: #405757).
+
+@DPATCH@
+
+diff -Naur dvdisaster-0.70.3.orig/udf.c dvdisaster-0.70.3/udf.c
+--- dvdisaster-0.70.3.orig/udf.c 2006-12-10 17:58:35.000000000 +0000
++++ dvdisaster-0.70.3/udf.c 2007-01-17 09:39:58.000000000 +0000
+@@ -181,25 +181,28 @@
+ gint64 header_modulo;
+ int read_count = 0;
+ int answered_continue = FALSE;
++ int warning_shown = FALSE;
+
+ /*** Quick search at fixed offsets relative to ISO filesystem */
+
+- if(!max_sectors && dh->isoInfo)
+- { gint64 iso_size = dh->isoInfo->volumeSize;
+-
+- /* Iso size is correct; look for root sector at +2 */
+-
+- if(try_sector(dh, iso_size, &eh) == HEADER_FOUND)
+- { Verbose("Root sector search at +0 successful\n");
+- return eh;
+- }
++ if(!max_sectors)
++ { if(dh->isoInfo)
++ { gint64 iso_size = dh->isoInfo->volumeSize;
++
++ /* Iso size is correct; look for root sector at +2 */
++
++ if(try_sector(dh, iso_size, &eh) == HEADER_FOUND)
++ { Verbose("Root sector search at +0 successful\n");
++ return eh;
++ }
+
+- /* Strange stuff. Sometimes the iso size is increased by 150
+- sectors by the burning software. */
++ /* Strange stuff. Sometimes the iso size is increased by 150
++ sectors by the burning software. */
+
+- if(try_sector(dh, iso_size-150, &eh) == HEADER_FOUND)
+- { Verbose("Root sector search at -150 successful\n");
+- return eh;
++ if(try_sector(dh, iso_size-150, &eh) == HEADER_FOUND)
++ { Verbose("Root sector search at -150 successful\n");
++ return eh;
++ }
+ }
+
+ return NULL;
+@@ -244,14 +247,23 @@
+ SetBit(try_next_header, pos);
+ read_count++;
+ if(!answered_continue && read_count > 5)
+- { int answer = ModalDialog(GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, insert_buttons,
+- _("Faster medium initialization\n\n"
+- "Searching rewriteable media for error correction data may take a long time.\n"
+- "Press \"Skip RS02 test\" if you are certain that this medium was\n"
+- "not augmented with RS02 error correction data."));
+-
+- if(answer) goto bail_out;
+- answered_continue = TRUE;
++ { if(Closure->guiMode)
++ { int answer = ModalDialog(GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, insert_buttons,
++ _("Faster medium initialization\n\n"
++ "Searching rewriteable media for error correction data may take a long time.\n"
++ "Press \"Skip RS02 test\" if you are certain that this medium was\n"
++ "not augmented with RS02 error correction data."));
++
++ if(answer) goto bail_out;
++ answered_continue = TRUE;
++ }
++ if(!Closure->guiMode && !warning_shown)
++ { PrintCLI(_("\nSearching rewriteable media for error correction data may take a long time.\n"
++ "If you are certain that this medium was not augmented with RS02 error correction\n"
++ "data, you might wish to abort this command and re-run with the option\n"
++ "--query-size=udf\n"));
++ warning_shown = TRUE;
++ }
+ }
+ goto check_next_header;
+ case TRY_NEXT_MODULO:
Reply to: