[SCM] lives packaging branch, master, updated. debian/1.1.8-1-35-g5982331

Tue Jan 12 17:27:33 UTC 2010

The following commit has been merged in the master branch:
commit 99cfa8efb6fe264ef4151e1d6d857ed8014b41f6
Author: Harry Rickards <harry at linux.com>
Date:   Tue Jan 12 16:53:19 2010 +0000

    Added patch that replaces all mentions of cdda2wav with icedax

diff --git a/debian/patches/cdda2wav_to_icedax.diff b/debian/patches/cdda2wav_to_icedax.diff
new file mode 100644
index 0000000..5e5a42f
--- /dev/null
+++ b/debian/patches/cdda2wav_to_icedax.diff
@@ -0,0 +1,721 @@
+---
+ README            |    2 +-
+ po/ar.po          |    4 ++--
+ po/ca.po          |   10 +++++-----
+ po/cs.po          |    8 ++++----
+ po/de_DE.po       |    8 ++++----
+ po/en_GB.po       |    8 ++++----
+ po/es.po          |   12 ++++++------
+ po/et.po          |    4 ++--
+ po/fi.po          |   12 ++++++------
+ po/fr.po          |   12 ++++++------
+ po/gl.po          |    4 ++--
+ po/he.po          |   12 ++++++------
+ po/hu.po          |   12 ++++++------
+ po/it.po          |   12 ++++++------
+ po/ja.po          |   12 ++++++------
+ po/lives.pot      |    4 ++--
+ po/nl_NL.po       |    8 ++++----
+ po/pl.po          |    4 ++--
+ po/pt.po          |   12 ++++++------
+ po/pt_BR.po       |   12 ++++++------
+ po/ru.po          |   12 ++++++------
+ po/sk.po          |   12 ++++++------
+ po/tr.po          |    8 ++++----
+ po/uz.po          |    4 ++--
+ po/zh_CN.po       |    8 ++++----
+ smogrify          |    8 ++++----
+ src/gui.c         |    4 ++--
+ src/main.c        |   12 ++++++------
+ src/main.h        |    2 +-
+ src/preferences.c |    2 +-
+ 30 files changed, 122 insertions(+), 122 deletions(-)
+
+--- lives.orig/README
++++ lives/README
+@@ -34,7 +34,7 @@ mencoder (highly recommended)
+ libmjpeg-tools (recommended)
+ 
+ xmms (optional)
+-cdda2wav (optional)
++icedax (optional)
+ 
+ 
+ 
+--- lives.orig/po/ar.po
++++ lives/po/ar.po
+@@ -145,11 +145,11 @@ msgid "xmms...NOT DETECTED..."
+ msgstr ""
+ 
+ #: src/main.c:1194
+-msgid "cdda2wav...detected..."
++msgid "icedax...detected..."
+ msgstr ""
+ 
+ #: src/main.c:1195
+-msgid "cdda2wav...NOT DETECTED..."
++msgid "icedax...NOT DETECTED..."
+ msgstr ""
+ 
+ #: src/main.c:1196
+--- lives.orig/po/ca.po
++++ lives/po/ca.po
+@@ -162,12 +162,12 @@ msgid "xmms...NOT DETECTED..."
+ msgstr "xmms...NO S'HA DETECTAT..."
+ 
+ #: src/main.c:1194
+-msgid "cdda2wav...detected..."
++msgid "icedax...detected..."
+ msgstr ""
+ 
+ #: src/main.c:1195
+-msgid "cdda2wav...NOT DETECTED..."
+-msgstr "cdda2wav...NO S'HA DETECTAT..."
++msgid "icedax...NOT DETECTED..."
++msgstr "icedax...NO S'HA DETECTAT..."
+ 
+ #: src/main.c:1196
+ msgid "jackd...detected..."
+@@ -8467,8 +8467,8 @@ msgstr ""
+ #~ msgid "$file"
+ #~ msgstr "_Fitxer"
+ 
+-#~ msgid "cdda2wav is required for this function."
+-#~ msgstr "Ã‰s necessari cdda2wav per aquesta funciÃ³"
++#~ msgid "icedax is required for this function."
++#~ msgstr "Ã‰s necessari icedax per aquesta funciÃ³"
+ 
+ #~ msgid "Please install it first."
+ #~ msgstr "InstalÂ·leu-ho primer si us plau"
+--- lives.orig/po/cs.po
++++ lives/po/cs.po
+@@ -167,12 +167,12 @@ msgid "xmms...NOT DETECTED..."
+ msgstr "xmms... NENALEZENO..."
+ 
+ #: src/main.c:1194
+-msgid "cdda2wav...detected..."
+-msgstr "cdda2wav... nalezen..."
++msgid "icedax...detected..."
++msgstr "icedax... nalezen..."
+ 
+ #: src/main.c:1195
+-msgid "cdda2wav...NOT DETECTED..."
+-msgstr "cdda2wav... NENALEZEN..."
++msgid "icedax...NOT DETECTED..."
++msgstr "icedax... NENALEZEN..."
+ 
+ #: src/main.c:1196
+ msgid "jackd...detected..."
+--- lives.orig/po/de_DE.po
++++ lives/po/de_DE.po
+@@ -151,12 +151,12 @@ msgid "xmms...NOT DETECTED..."
+ msgstr "xmms...nicht gefunden..."
+ 
+ #: src/main.c:1194
+-msgid "cdda2wav...detected..."
+-msgstr "cdda2wav...gefunden..."
++msgid "icedax...detected..."
++msgstr "icedax...gefunden..."
+ 
+ #: src/main.c:1195
+-msgid "cdda2wav...NOT DETECTED..."
+-msgstr "cdda2wav...nicht gefunden..."
++msgid "icedax...NOT DETECTED..."
++msgstr "icedax...nicht gefunden..."
+ 
+ #: src/main.c:1196
+ msgid "jackd...detected..."
+--- lives.orig/po/en_GB.po
++++ lives/po/en_GB.po
+@@ -165,12 +165,12 @@ msgid "xmms...NOT DETECTED..."
+ msgstr "xmms...NOT DETECTED..."
+ 
+ #: src/main.c:1194
+-msgid "cdda2wav...detected..."
+-msgstr "cdda2wav...detected..."
++msgid "icedax...detected..."
++msgstr "icedax...detected..."
+ 
+ #: src/main.c:1195
+-msgid "cdda2wav...NOT DETECTED..."
+-msgstr "cdda2wav...NOT DETECTED..."
++msgid "icedax...NOT DETECTED..."
++msgstr "icedax...NOT DETECTED..."
+ 
+ #: src/main.c:1196
+ msgid "jackd...detected..."
+--- lives.orig/po/es.po
++++ lives/po/es.po
+@@ -164,12 +164,12 @@ msgid "xmms...NOT DETECTED..."
+ msgstr "xmms... NO DETECTADO"
+ 
+ #: src/main.c:1194
+-msgid "cdda2wav...detected..."
+-msgstr "cdda2wav... detectado"
++msgid "icedax...detected..."
++msgstr "icedax... detectado"
+ 
+ #: src/main.c:1195
+-msgid "cdda2wav...NOT DETECTED..."
+-msgstr "cdda2wav... NO DETECTADO..."
++msgid "icedax...NOT DETECTED..."
++msgstr "icedax... NO DETECTADO..."
+ 
+ #: src/main.c:1196
+ msgid "jackd...detected..."
+@@ -8952,8 +8952,8 @@ msgstr ""
+ #~ msgid "LiVES audio error."
+ #~ msgstr "Error de audio LiVES"
+ 
+-#~ msgid "cdda2wav is required for this function."
+-#~ msgstr "Se requiere cdda2wav para esta funciÃ³n."
++#~ msgid "icedax is required for this function."
++#~ msgstr "Se requiere icedax para esta funciÃ³n."
+ 
+ #~ msgid "Please install it first."
+ #~ msgstr "InstÃ¡lalo primero, por favor."
+--- lives.orig/po/et.po
++++ lives/po/et.po
+@@ -145,11 +145,11 @@ msgid "xmms...NOT DETECTED..."
+ msgstr ""
+ 
+ #: src/main.c:1194
+-msgid "cdda2wav...detected..."
++msgid "icedax...detected..."
+ msgstr ""
+ 
+ #: src/main.c:1195
+-msgid "cdda2wav...NOT DETECTED..."
++msgid "icedax...NOT DETECTED..."
+ msgstr ""
+ 
+ #: src/main.c:1196
+--- lives.orig/po/fi.po
++++ lives/po/fi.po
+@@ -161,12 +161,12 @@ msgid "xmms...NOT DETECTED..."
+ msgstr "xmms...EI HAVAITTU..."
+ 
+ #: src/main.c:1194
+-msgid "cdda2wav...detected..."
+-msgstr "cdda2wav...havaittu..."
++msgid "icedax...detected..."
++msgstr "icedax...havaittu..."
+ 
+ #: src/main.c:1195
+-msgid "cdda2wav...NOT DETECTED..."
+-msgstr "cdda2wav...EI HAVAITTU..."
++msgid "icedax...NOT DETECTED..."
++msgstr "icedax...EI HAVAITTU..."
+ 
+ #: src/main.c:1196
+ msgid "jackd...detected..."
+@@ -9112,8 +9112,8 @@ msgstr ""
+ #~ msgid "LiVES audio error."
+ #~ msgstr "LiVES-Ã¤Ã¤nivirhe."
+ 
+-#~ msgid "cdda2wav is required for this function."
+-#~ msgstr "TÃ¤hÃ¤n toimintoon tarvitaan cdda2wav."
++#~ msgid "icedax is required for this function."
++#~ msgstr "TÃ¤hÃ¤n toimintoon tarvitaan icedax."
+ 
+ #~ msgid "Please install it first."
+ #~ msgstr "Asenna se ensin."
+--- lives.orig/po/fr.po
++++ lives/po/fr.po
+@@ -173,12 +173,12 @@ msgid "xmms...NOT DETECTED..."
+ msgstr "xmms...NON DÃ‰TECTÃ‰..."
+ 
+ #: src/main.c:1194
+-msgid "cdda2wav...detected..."
+-msgstr "cdda2wav...dÃ©tectÃ©..."
++msgid "icedax...detected..."
++msgstr "icedax...dÃ©tectÃ©..."
+ 
+ #: src/main.c:1195
+-msgid "cdda2wav...NOT DETECTED..."
+-msgstr "cdda2wav...NON DÃ‰TECTÃ‰..."
++msgid "icedax...NOT DETECTED..."
++msgstr "icedax...NON DÃ‰TECTÃ‰..."
+ 
+ #: src/main.c:1196
+ msgid "jackd...detected..."
+@@ -9302,8 +9302,8 @@ msgstr ""
+ #~ msgid "LiVES audio error."
+ #~ msgstr "LiVES erreur audio."
+ 
+-#~ msgid "cdda2wav is required for this function."
+-#~ msgstr "cdda2wav est nÃ©cessaire pour cette opÃ©ration."
++#~ msgid "icedax is required for this function."
++#~ msgstr "icedax est nÃ©cessaire pour cette opÃ©ration."
+ 
+ #~ msgid "Please install it first."
+ #~ msgstr "A installer au prÃ©alable."
+--- lives.orig/po/gl.po
++++ lives/po/gl.po
+@@ -145,11 +145,11 @@ msgid "xmms...NOT DETECTED..."
+ msgstr ""
+ 
+ #: src/main.c:1194
+-msgid "cdda2wav...detected..."
++msgid "icedax...detected..."
+ msgstr ""
+ 
+ #: src/main.c:1195
+-msgid "cdda2wav...NOT DETECTED..."
++msgid "icedax...NOT DETECTED..."
+ msgstr ""
+ 
+ #: src/main.c:1196
+--- lives.orig/po/he.po
++++ lives/po/he.po
+@@ -167,12 +167,12 @@ msgid "xmms...NOT DETECTED..."
+ msgstr "xmms...×œ× ×–×•×”×”..."
+ 
+ #: src/main.c:1194
+-msgid "cdda2wav...detected..."
+-msgstr "cdda2wav...×–×•×”×”"
++msgid "icedax...detected..."
++msgstr "icedax...×–×•×”×”"
+ 
+ #: src/main.c:1195
+-msgid "cdda2wav...NOT DETECTED..."
+-msgstr "cdda2wav...×œ× ×–×•×”×”"
++msgid "icedax...NOT DETECTED..."
++msgstr "icedax...×œ× ×–×•×”×”"
+ 
+ #: src/main.c:1196
+ msgid "jackd...detected..."
+@@ -9660,8 +9660,8 @@ msgstr "×˜×•×¢×Ÿ ×ž×™×¤×•×™ ×”×ª×§×Ÿ ×ž×
+ #~ msgid "LiVES audio error."
+ #~ msgstr "×©×’×™××ª ×©×ž×¢ ×©×œ LiVES"
+ 
+-#~ msgid "cdda2wav is required for this function."
+-#~ msgstr "cdda2wav ×”×›×¨×—×™ ×œ×¤×•× ×§×¦×™×” ×–×•."
++#~ msgid "icedax is required for this function."
++#~ msgstr "icedax ×”×›×¨×—×™ ×œ×¤×•× ×§×¦×™×” ×–×•."
+ 
+ #~ msgid "Please install it first."
+ #~ msgstr "× × ×œ×”×ª×§×™×Ÿ ×–××ª ×§×•×“×."
+--- lives.orig/po/hu.po
++++ lives/po/hu.po
+@@ -171,12 +171,12 @@ msgid "xmms...NOT DETECTED..."
+ msgstr "xmms...NEM TALÃLOM"
+ 
+ #: src/main.c:1194
+-msgid "cdda2wav...detected..."
+-msgstr "cdda2wav...megtalÃ¡lva..."
++msgid "icedax...detected..."
++msgstr "icedax...megtalÃ¡lva..."
+ 
+ #: src/main.c:1195
+-msgid "cdda2wav...NOT DETECTED..."
+-msgstr "cdda2wav...NEM TALÃLOM..."
++msgid "icedax...NOT DETECTED..."
++msgstr "icedax...NEM TALÃLOM..."
+ 
+ #: src/main.c:1196
+ msgid "jackd...detected..."
+@@ -9745,8 +9745,8 @@ msgstr "EszkÃ¶zlista betÃ¶ltÃ©se innen: 
+ #~ msgid "LiVES audio error."
+ #~ msgstr "LiVES hang hiba."
+ 
+-#~ msgid "cdda2wav is required for this function."
+-#~ msgstr "cdda2wav szÃ¼ksÃ©ges."
++#~ msgid "icedax is required for this function."
++#~ msgstr "icedax szÃ¼ksÃ©ges."
+ 
+ #~ msgid "Please install it first."
+ #~ msgstr "KÃ©rlek, elÅ‘bb telepÃtsd fel."
+--- lives.orig/po/it.po
++++ lives/po/it.po
+@@ -166,12 +166,12 @@ msgid "xmms...NOT DETECTED..."
+ msgstr "xmms...NON RILEVATO..."
+ 
+ #: src/main.c:1194
+-msgid "cdda2wav...detected..."
+-msgstr "cdda2wav...rilevato..."
++msgid "icedax...detected..."
++msgstr "icedax...rilevato..."
+ 
+ #: src/main.c:1195
+-msgid "cdda2wav...NOT DETECTED..."
+-msgstr "cdda2wav...NON RILEVATO..."
++msgid "icedax...NOT DETECTED..."
++msgstr "icedax...NON RILEVATO..."
+ 
+ #: src/main.c:1196
+ msgid "jackd...detected..."
+@@ -9817,8 +9817,8 @@ msgstr "Caricando la mappatura del dispo
+ #~ msgid "LiVES audio error."
+ #~ msgstr "Errore audio LiVES."
+ 
+-#~ msgid "cdda2wav is required for this function."
+-#~ msgstr "cdda2wav Ã¨ richiesto per questa funzione."
++#~ msgid "icedax is required for this function."
++#~ msgstr "icedax Ã¨ richiesto per questa funzione."
+ 
+ #~ msgid "Please install it first."
+ #~ msgstr "Per piacere installalo prima."
+--- lives.orig/po/ja.po
++++ lives/po/ja.po
+@@ -152,12 +152,12 @@ msgid "xmms...NOT DETECTED..."
+ msgstr "xmms...æœªæ¤œå‡º..."
+ 
+ #: src/main.c:1194
+-msgid "cdda2wav...detected..."
+-msgstr "cdda2wav...æ¤œå‡º..."
++msgid "icedax...detected..."
++msgstr "icedax...æ¤œå‡º..."
+ 
+ #: src/main.c:1195
+-msgid "cdda2wav...NOT DETECTED..."
+-msgstr "cdda2wav...æœªæ¤œå‡º..."
++msgid "icedax...NOT DETECTED..."
++msgstr "icedax...æœªæ¤œå‡º..."
+ 
+ #: src/main.c:1196
+ msgid "jackd...detected..."
+@@ -9596,8 +9596,8 @@ msgstr "ãƒ‡ãƒã‚¤ã‚¹ãƒžãƒƒãƒ—ã‚’ãƒ•ã‚¡ã‚
+ #~ msgid "LiVES audio error."
+ #~ msgstr "LiVESéŸ³å£°ã‚¨ãƒ©ãƒ¼"
+ 
+-#~ msgid "cdda2wav is required for this function."
+-#~ msgstr "ã“ã®æ©Ÿèƒ½ã«ã¯cdda2wavãŒå¿…è¦ã§ã™ã€‚"
++#~ msgid "icedax is required for this function."
++#~ msgstr "ã“ã®æ©Ÿèƒ½ã«ã¯icedaxãŒå¿…è¦ã§ã™ã€‚"
+ 
+ #~ msgid "Please install it first."
+ #~ msgstr "å…ˆã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ä¸‹ã•ã„ã€‚"
+--- lives.orig/po/lives.pot
++++ lives/po/lives.pot
+@@ -144,11 +144,11 @@ msgid "xmms...NOT DETECTED..."
+ msgstr ""
+ 
+ #: src/main.c:1194
+-msgid "cdda2wav...detected..."
++msgid "icedax...detected..."
+ msgstr ""
+ 
+ #: src/main.c:1195
+-msgid "cdda2wav...NOT DETECTED..."
++msgid "icedax...NOT DETECTED..."
+ msgstr ""
+ 
+ #: src/main.c:1196
+--- lives.orig/po/nl_NL.po
++++ lives/po/nl_NL.po
+@@ -151,12 +151,12 @@ msgid "xmms...NOT DETECTED..."
+ msgstr "xmms...NIET GEDETECTEERD..."
+ 
+ #: src/main.c:1194
+-msgid "cdda2wav...detected..."
+-msgstr "cdda2wav...gedetecteerd..."
++msgid "icedax...detected..."
++msgstr "icedax...gedetecteerd..."
+ 
+ #: src/main.c:1195
+-msgid "cdda2wav...NOT DETECTED..."
+-msgstr "cdda2wav...NIET GEDETECTEERD..."
++msgid "icedax...NOT DETECTED..."
++msgstr "icedax...NIET GEDETECTEERD..."
+ 
+ #: src/main.c:1196
+ msgid "jackd...detected..."
+--- lives.orig/po/pl.po
++++ lives/po/pl.po
+@@ -145,11 +145,11 @@ msgid "xmms...NOT DETECTED..."
+ msgstr ""
+ 
+ #: src/main.c:1194
+-msgid "cdda2wav...detected..."
++msgid "icedax...detected..."
+ msgstr ""
+ 
+ #: src/main.c:1195
+-msgid "cdda2wav...NOT DETECTED..."
++msgid "icedax...NOT DETECTED..."
+ msgstr ""
+ 
+ #: src/main.c:1196
+--- lives.orig/po/pt.po
++++ lives/po/pt.po
+@@ -162,12 +162,12 @@ msgid "xmms...NOT DETECTED..."
+ msgstr "xmms...NÃO DETECTADO..."
+ 
+ #: src/main.c:1194
+-msgid "cdda2wav...detected..."
+-msgstr "cdda2wav...detectado..."
++msgid "icedax...detected..."
++msgstr "icedax...detectado..."
+ 
+ #: src/main.c:1195
+-msgid "cdda2wav...NOT DETECTED..."
+-msgstr "cdda2wav...NÃO DETECTADO..."
++msgid "icedax...NOT DETECTED..."
++msgstr "icedax...NÃO DETECTADO..."
+ 
+ #: src/main.c:1196
+ msgid "jackd...detected..."
+@@ -9629,8 +9629,8 @@ msgstr ""
+ #~ msgid "LiVES audio error."
+ #~ msgstr "Erro de áudio no LiVES."
+ 
+-#~ msgid "cdda2wav is required for this function."
+-#~ msgstr "cdda2wav é necessário para esta função."
++#~ msgid "icedax is required for this function."
++#~ msgstr "icedax é necessário para esta função."
+ 
+ #~ msgid "Please install it first."
+ #~ msgstr "Por favor instale-o primeiro."
+--- lives.orig/po/pt_BR.po
++++ lives/po/pt_BR.po
+@@ -159,12 +159,12 @@ msgid "xmms...NOT DETECTED..."
+ msgstr "xmms...NÃO DETECTADO..."
+ 
+ #: src/main.c:1194
+-msgid "cdda2wav...detected..."
+-msgstr "cdda2wav...detectado..."
++msgid "icedax...detected..."
++msgstr "icedax...detectado..."
+ 
+ #: src/main.c:1195
+-msgid "cdda2wav...NOT DETECTED..."
+-msgstr "cdda2wav...NÃO DETECTADO..."
++msgid "icedax...NOT DETECTED..."
++msgstr "icedax...NÃO DETECTADO..."
+ 
+ #: src/main.c:1196
+ msgid "jackd...detected..."
+@@ -9702,8 +9702,8 @@ msgstr "Carregando mapa de dispositivos 
+ #~ msgid "LiVES audio error."
+ #~ msgstr "Erro de áudio no LiVES."
+ 
+-#~ msgid "cdda2wav is required for this function."
+-#~ msgstr "cdda2wav é necessário para esta função."
++#~ msgid "icedax is required for this function."
++#~ msgstr "icedax é necessário para esta função."
+ 
+ #~ msgid "Please install it first."
+ #~ msgstr "Por favor instale-o primeiro."
+--- lives.orig/po/ru.po
++++ lives/po/ru.po
+@@ -167,12 +167,12 @@ msgid "xmms...NOT DETECTED..."
+ msgstr "xmms...ÐÐ• ÐžÐ‘ÐÐÐ Ð£Ð–Ð•Ð..."
+ 
+ #: src/main.c:1194
+-msgid "cdda2wav...detected..."
+-msgstr "cdda2wav...Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½..."
++msgid "icedax...detected..."
++msgstr "icedax...Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½..."
+ 
+ #: src/main.c:1195
+-msgid "cdda2wav...NOT DETECTED..."
+-msgstr "cdda2wav...ÐÐ• ÐžÐ‘ÐÐÐ Ð£Ð–Ð•Ð..."
++msgid "icedax...NOT DETECTED..."
++msgstr "icedax...ÐÐ• ÐžÐ‘ÐÐÐ Ð£Ð–Ð•Ð..."
+ 
+ #: src/main.c:1196
+ msgid "jackd...detected..."
+@@ -8525,8 +8525,8 @@ msgstr ""
+ #~ msgid "LiVES audio error."
+ #~ msgstr "LiVES:- Ð£ÑÐ¸Ð»Ð¸Ñ‚ÑŒ Ð·Ð²ÑƒÐº"
+ 
+-#~ msgid "cdda2wav is required for this function."
+-#~ msgstr "Ð´Ð»Ñ ÑÑ‚Ð¾Ð¹ Ñ„ÑƒÐ½ÐºÑ†Ð¸Ð¸ Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼ cdda2wav"
++#~ msgid "icedax is required for this function."
++#~ msgstr "Ð´Ð»Ñ ÑÑ‚Ð¾Ð¹ Ñ„ÑƒÐ½ÐºÑ†Ð¸Ð¸ Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼ icedax"
+ 
+ #~ msgid "You must set the CD device first in Preferences."
+ #~ msgstr "Ð’Ñ‹ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ Ð²Ð½Ð°Ñ‡Ð°Ð»Ðµ ÑƒÐºÐ°Ð·Ð°Ñ‚ÑŒ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð¾ CD Ð² ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð°Ñ…."
+--- lives.orig/po/sk.po
++++ lives/po/sk.po
+@@ -164,12 +164,12 @@ msgid "xmms...NOT DETECTED..."
+ msgstr "xmms...NENÃJDENÃ..."
+ 
+ #: src/main.c:1194
+-msgid "cdda2wav...detected..."
+-msgstr "cdda2wav...nÃ¡jdenÃ½..."
++msgid "icedax...detected..."
++msgstr "icedax...nÃ¡jdenÃ½..."
+ 
+ #: src/main.c:1195
+-msgid "cdda2wav...NOT DETECTED..."
+-msgstr "cdda2wav...NENÃJDENÃ..."
++msgid "icedax...NOT DETECTED..."
++msgstr "icedax...NENÃJDENÃ..."
+ 
+ #: src/main.c:1196
+ msgid "jackd...detected..."
+@@ -9604,8 +9604,8 @@ msgstr "NaÄÃtavam zariadenie pre mapov
+ #~ msgid "LiVES audio error."
+ #~ msgstr "LiVES chyba zvuku."
+ 
+-#~ msgid "cdda2wav is required for this function."
+-#~ msgstr "cdda2wav je potrebnÃ½ pre tÃºto funkciu."
++#~ msgid "icedax is required for this function."
++#~ msgstr "icedax je potrebnÃ½ pre tÃºto funkciu."
+ 
+ #~ msgid "Please install it first."
+ #~ msgstr "ProsÃm najskÃ´r ho nainÅ¡talujte."
+--- lives.orig/po/tr.po
++++ lives/po/tr.po
+@@ -155,12 +155,12 @@ msgid "xmms...NOT DETECTED..."
+ msgstr "xmms...BULUNAMADI..."
+ 
+ #: src/main.c:1194
+-msgid "cdda2wav...detected..."
+-msgstr "cdda2wav...bulundu..."
++msgid "icedax...detected..."
++msgstr "icedax...bulundu..."
+ 
+ #: src/main.c:1195
+-msgid "cdda2wav...NOT DETECTED..."
+-msgstr "cdda2wav...BULUNAMADI..."
++msgid "icedax...NOT DETECTED..."
++msgstr "icedax...BULUNAMADI..."
+ 
+ #: src/main.c:1196
+ msgid "jackd...detected..."
+--- lives.orig/po/uz.po
++++ lives/po/uz.po
+@@ -145,11 +145,11 @@ msgid "xmms...NOT DETECTED..."
+ msgstr ""
+ 
+ #: src/main.c:1194
+-msgid "cdda2wav...detected..."
++msgid "icedax...detected..."
+ msgstr ""
+ 
+ #: src/main.c:1195
+-msgid "cdda2wav...NOT DETECTED..."
++msgid "icedax...NOT DETECTED..."
+ msgstr ""
+ 
+ #: src/main.c:1196
+--- lives.orig/po/zh_CN.po
++++ lives/po/zh_CN.po
+@@ -160,12 +160,12 @@ msgid "xmms...NOT DETECTED..."
+ msgstr "xmms...æœªå‘çŽ°..."
+ 
+ #: src/main.c:1194
+-msgid "cdda2wav...detected..."
+-msgstr "cdda2wav...å‘çŽ°..."
++msgid "icedax...detected..."
++msgstr "icedax...å‘çŽ°..."
+ 
+ #: src/main.c:1195
+-msgid "cdda2wav...NOT DETECTED..."
+-msgstr "cdda2wav...æœªå‘çŽ°..."
++msgid "icedax...NOT DETECTED..."
++msgstr "icedax...æœªå‘çŽ°..."
+ 
+ #: src/main.c:1196
+ msgid "jackd...detected..."
+--- lives.orig/smogrify
++++ lives/smogrify
+@@ -2510,9 +2510,9 @@ if (defined($ARGV[0])) {
+ 
+     if ($command eq "cdopen") {
+ 
+-	$cdda2wav_command=&location("cdda2wav");
+-	if ($cdda2wav_command eq "") {
+-	    &sig_error("cdda2wav is required for this function.","Please install it first.");
++	$icedax_command=&location("icedax");
++	if ($icedax_command eq "") {
++	    &sig_error("icedax is required for this function.","Please install it first.");
+ 	}
+ 
+ 	$cdplay_device=&rc_get("cdplay_device");
+@@ -2527,7 +2527,7 @@ if (defined($ARGV[0])) {
+ 	    unlink $audiofile;
+ 	}
+ 
+-	system("$cdda2wav_command -q -x -D $cdplay_device -t $track $audiofile >/dev/null 2>&1");
++	system("$icedax_command -q -x -D $cdplay_device -t $track $audiofile >/dev/null 2>&1");
+ 	$f_size=-s $audiofile;
+ 	# the '-x' option will force these
+ 	$arate=44100;
+--- lives.orig/src/gui.c
++++ lives/src/gui.c
+@@ -1008,7 +1008,7 @@ create_LiVES (void)
+   gtk_container_add (GTK_CONTAINER (audio_menu), mainw->eject_cd);
+ 
+   if (capable->smog_version_correct) {
+-    if (!(capable->has_cdda2wav&&strlen (prefs->cdplay_device))) {
++    if (!(capable->has_icedax&&strlen (prefs->cdplay_device))) {
+       gtk_widget_set_sensitive (mainw->load_cdtrack, FALSE);
+       gtk_widget_set_sensitive (mainw->eject_cd, FALSE);
+     }
+@@ -2437,7 +2437,7 @@ create_LiVES (void)
+   g_signal_connect (GTK_OBJECT (mainw->load_audio), "activate",
+                       G_CALLBACK (on_load_audio_activate),
+                       NULL);
+-  if (capable->has_cdda2wav) {
++  if (capable->has_icedax) {
+     g_signal_connect (GTK_OBJECT (mainw->load_cdtrack), "activate",
+                       G_CALLBACK (on_load_cdtrack_activate),
+                       NULL);
+--- lives.orig/src/main.c
++++ lives/src/main.c
+@@ -1191,8 +1191,8 @@ void do_start_messages(void) {
+   else d_print(_ ("sox...NOT DETECTED\n"));
+   if (capable->has_xmms) d_print(_ ("xmms...detected..."));
+   else d_print(_ ("xmms...NOT DETECTED..."));
+-  if (capable->has_cdda2wav) d_print(_ ("cdda2wav...detected..."));
+-  else d_print(_ ("cdda2wav...NOT DETECTED..."));
++  if (capable->has_icedax) d_print(_ ("icedax...detected..."));
++  else d_print(_ ("icedax...NOT DETECTED..."));
+   if (capable->has_jackd) d_print(_ ("jackd...detected..."));
+   else d_print(_ ("jackd...NOT DETECTED..."));
+   if (capable->has_pulse_audio) d_print(_ ("pulse audio...detected..."));
+@@ -1377,7 +1377,7 @@ capability *get_capabilities (void) {
+   capable->has_sox=FALSE;
+   capable->has_xmms=FALSE;
+   capable->has_dvgrab=FALSE;
+-  capable->has_cdda2wav=FALSE;
++  capable->has_icedax=FALSE;
+   capable->has_jackd=FALSE;
+   capable->has_gdb=FALSE;
+   capable->has_pulse_audio=FALSE;
+@@ -1489,8 +1489,8 @@ capability *get_capabilities (void) {
+   get_location("dvgrab",string,256);
+   if (strlen(string)) capable->has_dvgrab=TRUE;
+ 
+-  get_location("cdda2wav",string,256);
+-  if (strlen(string)) capable->has_cdda2wav=TRUE;
++  get_location("icedax",string,256);
++  if (strlen(string)) capable->has_icedax=TRUE;
+ 
+   get_location("jackd",string,256);
+   if (strlen(string)) capable->has_jackd=TRUE;
+@@ -2078,7 +2078,7 @@ void sensitize(void) {
+   gtk_widget_set_sensitive (mainw->loop_video, mainw->current_file>0&&(cfile->achans>0&&cfile->frames>0));
+   gtk_widget_set_sensitive (mainw->loop_continue, TRUE);
+   gtk_widget_set_sensitive (mainw->load_audio, TRUE);
+-  if (capable->has_cdda2wav&&strlen (prefs->cdplay_device)) gtk_widget_set_sensitive (mainw->load_cdtrack, TRUE);
++  if (capable->has_icedax&&strlen (prefs->cdplay_device)) gtk_widget_set_sensitive (mainw->load_cdtrack, TRUE);
+   gtk_widget_set_sensitive (mainw->rename, mainw->current_file>0&&!cfile->opening);
+   gtk_widget_set_sensitive (mainw->change_speed, mainw->current_file>0);
+   gtk_widget_set_sensitive (mainw->resample_video, mainw->current_file>0&&cfile->frames>0);
+--- lives.orig/src/main.h
++++ lives/src/main.h
+@@ -434,7 +434,7 @@ typedef struct {
+   gboolean has_mplayer;
+   gboolean has_convert;
+   gboolean has_composite;
+-  gboolean has_cdda2wav;
++  gboolean has_icedax;
+   gboolean has_midistartstop;
+   gboolean has_jackd;
+   gboolean has_pulse_audio;
+--- lives.orig/src/preferences.c
++++ lives/src/preferences.c
+@@ -2851,7 +2851,7 @@ _prefsw *create_prefs_dialog (void) {
+ 
+    g_signal_connect (GTK_FILE_CHOOSER(buttond), "selection-changed",G_CALLBACK (on_fileread_clicked),(gpointer)prefsw->cdplay_entry);
+ 
+-   if (capable->has_cdda2wav) {
++   if (capable->has_icedax) {
+      gtk_widget_show (prefsw->cdplay_entry);
+      gtk_widget_show (hbox19);
+    }
diff --git a/debian/patches/series b/debian/patches/series
index d86abb6..cd08216 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+cdda2wav_to_icedax.diff
 removepy.diff
 imageloading.diff

-- 
lives packaging

