1 files changed, 76 insertions, 0 deletions
diff --git a/debian/patches/70_fix_upd_progress.patch b/debian/patches/70_fix_upd_progress.patch
new file mode 100644
index 0000000..0f35ebe
--- /dev/null
+++ b/debian/patches/70_fix_upd_progress.patch
@@ -0,0 +1,76 @@
+Fix the --upd-progress function which dies with the following
+traceback.  Debian #351453
+
+> 11510:tbm@derision: ~/tmp/jack/jack-1210f412] jack --upd-progress
+> This is jack 3.1.1 (C)2004 Arne Zellentin <zarne@users.sf.net>
+> Traceback (most recent call last):
+>   File "/usr/bin/jack", line 136, in ?
+>     jack_prepare.update_progress(todo)
+>   File "/usr/lib/python2.3/site-packages/jack_prepare.py", line 341, in update_progress
+>     if not status[num]['dae']:
+> NameError: global name 'status' is not defined
+
+(and when this is fixed, dies because the ogg modules is not loaded)
+
+
+Depends on 33_flac_mutagen.patch
+
+
+diff -urN jack-3.1.1+cvs20050801~/jack jack-3.1.1+cvs20050801/jack
+--- jack-3.1.1+cvs20050801~/jack	2006-02-13 21:49:58.000000000 +0000
++++ jack-3.1.1+cvs20050801/jack	2006-02-13 23:45:35.000000000 +0000
+@@ -132,7 +132,7 @@
+ 
+ ### (6) update progress file at user's request (operation mode)
+ if cf['_upd_progress']:
+-    jack_prepare.update_progress(todo)
++    jack_prepare.update_progress(status, todo)
+     sys.exit(0)
+ 
+ ### (7) now read in the progress file
+diff -urN jack-3.1.1+cvs20050801~/jack_init.py jack-3.1.1+cvs20050801/jack_init.py
+--- jack-3.1.1+cvs20050801~/jack_init.py	2006-02-13 21:49:58.000000000 +0000
++++ jack-3.1.1+cvs20050801/jack_init.py	2006-02-13 23:46:31.000000000 +0000
+@@ -56,10 +56,8 @@
+ try:
+     import ogg.vorbis
+ except:
+-    class dummy_ogg:
+-        def __init__(self):
+-            warning("ogg module not installed, ogg support disabled")
+-    ogg = dummy_ogg()
++    warning("ogg module not installed, ogg support disabled")
++    ogg = None
+ 
+ try:
+     import mutagen.flac as flac
+diff -urN jack-3.1.1+cvs20050801~/jack_prepare.py jack-3.1.1+cvs20050801/jack_prepare.py
+--- jack-3.1.1+cvs20050801~/jack_prepare.py	2006-02-13 21:49:58.000000000 +0000
++++ jack-3.1.1+cvs20050801/jack_prepare.py	2006-02-13 23:45:55.000000000 +0000
+@@ -37,6 +37,7 @@
+ import jack_tag
+ 
+ from jack_globals import *
++from jack_init import ogg
+ 
+ tracknum = None
+ datatracks = []
+@@ -326,7 +327,7 @@
+     status['all']['id3_year'] = ["-1",]
+     return status
+ 
+-def update_progress(todo):
++def update_progress(status, todo):
+     ext = jack_targets.targets[jack_helpers.helpers[cf['_encoder']]['target']]['file_extension']
+     "update progress file at user's request (operation mode)"
+ 
+@@ -342,7 +343,7 @@
+                     if ext == ".mp3":
+                         x = jack_mp3.mp3format(i[NAME] + ext)
+                         temp_rate = x['bitrate']
+-                    elif ext == ".ogg":
++                    elif ext == ".ogg" and ogg:
+                         x = ogg.vorbis.VorbisFile(i[NAME] + ext)
+                         temp_rate = int(x.raw_total(0) * 8 / x.time_total(0) / 1000 + 0.5)
+                     else:
+