[Python-apps-commits] r6177 - in packages/gespeaker/trunk/debian (6 files)

[muflone-guest at users.alioth.debian.org]

    Date: Saturday, October 9, 2010 @ 11:06:00
  Author: muflone-guest
Revision: 6177

debian/watch: restore fixed googlecode repository (#581622)
debian/control: bump Standards-Version 3.8.4
debian/patches/bug_597406.patch: closes bug #597406
debian/source/format: switched to format 3.0 (quilt)

Added:
  packages/gespeaker/trunk/debian/patches/
  packages/gespeaker/trunk/debian/patches/bug_597406.patch
  packages/gespeaker/trunk/debian/patches/series
Modified:
  packages/gespeaker/trunk/debian/changelog
  packages/gespeaker/trunk/debian/source/format
  packages/gespeaker/trunk/debian/watch

Modified: packages/gespeaker/trunk/debian/changelog
===================================================================
--- packages/gespeaker/trunk/debian/changelog	2010-10-09 05:13:05 UTC (rev 6176)
+++ packages/gespeaker/trunk/debian/changelog	2010-10-09 11:06:00 UTC (rev 6177)
@@ -1,9 +1,10 @@
 gespeaker (0.7-2) unstable; urgency=low
 
-  * debian/watch: now uses googlecode.debian.net
   * debian/control: bump Standards-Version 3.8.4
+  * Switched to format 3.0 (quilt)
+  * Change mbrola voices path (Closes: #597406)
 
- -- Fabio Castelli <muflone at vbsimple.net>  Sun, 06 Jun 2010 18:04:09 +0200
+ -- Fabio Castelli <muflone at vbsimple.net>  Sat, 09 Oct 2010 13:01:19 +0200
 
 gespeaker (0.7-1) unstable; urgency=low
 

Added: packages/gespeaker/trunk/debian/patches/bug_597406.patch
===================================================================
--- packages/gespeaker/trunk/debian/patches/bug_597406.patch	                        (rev 0)
+++ packages/gespeaker/trunk/debian/patches/bug_597406.patch	2010-10-09 11:06:00 UTC (rev 6177)
@@ -0,0 +1,54 @@
+Closes bug #597406
+Switch mbrola voices path to /usr/share/mbrola/$VOICE/$VOICE
+Index: gespeaker-0.7/src/EspeakFrontend.py
+===================================================================
+--- gespeaker-0.7.orig/src/EspeakFrontend.py	2010-10-09 12:05:09.000000000 +0200
++++ gespeaker-0.7/src/EspeakFrontend.py	2010-10-09 12:07:50.000000000 +0200
+@@ -178,7 +178,7 @@
+     voicesmb = []
+     pathVoices = '/usr/share/espeak-data/voices/mb/'
+     if not pathVoicesmb:
+-      pathVoicesmb = '/usr/share/mbrola/voices'
++      pathVoicesmb = '/usr/share/mbrola'
+     if os.path.isdir(pathVoices) and os.path.isdir(pathVoicesmb):
+       for voice in os.listdir(pathVoices):
+         # Only files
+@@ -189,7 +189,7 @@
+           # Check if it's a valid voice
+           for line in voicecontent:
+             if line[:5] == 'name ':
+-              voicesmb.append((line[5:], voice, os.path.isfile(os.path.join(pathVoicesmb, voice[3:]))))
++              voicesmb.append((line[5:], voice, os.path.isfile(os.path.join(pathVoicesmb, voice[3:6], voice[3:6]))))
+               break
+     return voicesmb
+ 
+Index: gespeaker-0.7/src/Settings.py
+===================================================================
+--- gespeaker-0.7.orig/src/Settings.py	2010-10-09 12:05:24.000000000 +0200
++++ gespeaker-0.7/src/Settings.py	2010-10-09 12:08:29.000000000 +0200
+@@ -76,7 +76,7 @@
+     'VoiceDelay': [int, 10, __sectionVoiceSetting],
+     'VoiceTypeMale': [strbool, True, __sectionVoiceSetting],
+     'VoiceLanguage': [str, _('default language'), __sectionVoiceSetting],
+-    'VoicesmbPath': [str, '/usr/share/mbrola/voices', __sectionMbrola]
++    'VoicesmbPath': [str, '/usr/share/mbrola', __sectionMbrola]
+   }
+ 
+ def save(filename=conffile, clearDefaults=False):
+Index: gespeaker-0.7/src/gespeakerUI.py
+===================================================================
+--- gespeaker-0.7.orig/src/gespeakerUI.py	2010-10-09 12:05:38.000000000 +0200
++++ gespeaker-0.7/src/gespeakerUI.py	2010-10-09 12:08:51.000000000 +0200
+@@ -445,9 +445,10 @@
+         self.espeak.play(cmd, self.cmdPlayer, self.recordToFile)
+       else:
+         args = {
+-          '%l': '%s/%s' % (
++          '%l': '%s/%s/%s' % (
+             Settings.get('VoicesmbPath'), 
+-            language.replace('mb-', '', 1))
++            language[3:6],
++            language[3:6])
+         }
+         cmdMbrola = [Settings.cmdMbrola] + [
+           args.get(p, p) for p in Settings.argsMbrola.split()]

Added: packages/gespeaker/trunk/debian/patches/series
===================================================================
--- packages/gespeaker/trunk/debian/patches/series	                        (rev 0)
+++ packages/gespeaker/trunk/debian/patches/series	2010-10-09 11:06:00 UTC (rev 6177)
@@ -0,0 +1 @@
+bug_597406.patch

Modified: packages/gespeaker/trunk/debian/source/format
===================================================================
--- packages/gespeaker/trunk/debian/source/format	2010-10-09 05:13:05 UTC (rev 6176)
+++ packages/gespeaker/trunk/debian/source/format	2010-10-09 11:06:00 UTC (rev 6177)
@@ -1 +1 @@
-1.0
+3.0 (quilt)

Modified: packages/gespeaker/trunk/debian/watch
===================================================================
--- packages/gespeaker/trunk/debian/watch	2010-10-09 05:13:05 UTC (rev 6176)
+++ packages/gespeaker/trunk/debian/watch	2010-10-09 11:06:00 UTC (rev 6177)
@@ -1,4 +1,5 @@
 # watch control file for uscan
 version=3
-http://googlecode.debian.net/p/gespeaker \
-  /p/gespeaker/gespeaker_(.*)_all\.tar\.gz
+http://code.google.com/p/gespeaker/downloads/list \
+  http://gespeaker.googlecode.com/files/gespeaker_(.*)_all\.tar\.gz
+