Merge lp:~e7appew/ubuntu/wily/audio-convert/nmu into lp:ubuntu/wily/audio-convert

[Carlos Maddela]

* Bumped Standards Version to 3.9.6.
* Refreshed unicode patch to remove mojibake.
* Fix MusePack conversion (Closes LP: #545544).
* Fix transfer of ID3 tags (Closes LP: #180451).
* Bump suggested packages to recommended (Closes LP: #460749).

[Marc Deslauriers (mdeslaur)]

The merge proposal looks good, but please make the following changes so it can be uploaded to the development release (yakkety):

- Change version to 0.3.1.1-0ubuntu7 and target to yakkety
- Remove "Non-maintainer upload." line from changelog (Ubuntu has no maintainers)

Once that's done, please test build it, I couldn't get it to build in yakkety, it failed with the following error:

dh_install: Cannot find (any matches for) "=>" (tried in "." and "debian/tmp")
dh_install: missing files, aborting

Thanks!

review: Needs Fixing

[lp:~e7appew/ubuntu/wily/audio-convert/nmu]

9. By Carlos Maddela on 2016-05-31

Bumped Standards Version to 3.9.8.

10. By Carlos Maddela on 2016-05-31

Refreshed unicode patch to remove mojibake.

11. By Carlos Maddela on 2016-05-31

Fix MusePack conversion (Closes LP: #545544).

[Carlos Maddela (e7appew)]

I have updated the changes as you have requested. I wasn't able to
reproduce the build error that you got, but I've made sure that it
builds in both xenial and yakkety.

On 31/05/16 22:43, Marc Deslauriers wrote:
> Review: Needs Fixing
>
> The merge proposal looks good, but please make the following changes so it can be uploaded to the development release (yakkety):
>
> - Change version to 0.3.1.1-0ubuntu7 and target to yakkety
> - Remove "Non-maintainer upload." line from changelog (Ubuntu has no maintainers)
>
> Once that's done, please test build it, I couldn't get it to build in yakkety, it failed with the following error:
>
> dh_install: Cannot find (any matches for) "=>" (tried in "." and "debian/tmp")
> dh_install: missing files, aborting
>
> Thanks!

[lp:~e7appew/ubuntu/wily/audio-convert/nmu]

12. By Carlos Maddela on 2016-05-31

Fix transfer of ID3 tags (Closes LP: #180451).

13. By Carlos Maddela on 2016-05-31

Bump suggested packages to recommended (Closes LP: #460749).

14. By Carlos Maddela on 2016-05-31

Updated upstream URLs.

15. By Carlos Maddela on 2016-05-31

Release 0.3.1.1-0ubuntu7

[Carlos Maddela (e7appew)]

I was able to reproduce this build error in another project I've been
working on. The reason it occurs is that
debian/nautilus-script-audio-convert.install needs to be executable. I
have updated that file as executable in my local git repo, so I don't
understand why it hasn't propagated up to Launchpad. Perhaps there is a
bug in git-remote-bzr.

On 31/05/16 22:43, Marc Deslauriers wrote:
> Review: Needs Fixing
>
> The merge proposal looks good, but please make the following changes so it can be uploaded to the development release (yakkety):
>
> - Change version to 0.3.1.1-0ubuntu7 and target to yakkety
> - Remove "Non-maintainer upload." line from changelog (Ubuntu has no maintainers)
>
> Once that's done, please test build it, I couldn't get it to build in yakkety, it failed with the following error:
>
> dh_install: Cannot find (any matches for) "=>" (tried in "." and "debian/tmp")
> dh_install: missing files, aborting
>
> Thanks!

Unmerged revisions

15. By Carlos Maddela on 2016-05-31

Release 0.3.1.1-0ubuntu7

14. By Carlos Maddela on 2016-05-31

Updated upstream URLs.

13. By Carlos Maddela on 2016-05-31

Bump suggested packages to recommended (Closes LP: #460749).

12. By Carlos Maddela on 2016-05-31

Fix transfer of ID3 tags (Closes LP: #180451).

11. By Carlos Maddela on 2016-05-31

Fix MusePack conversion (Closes LP: #545544).

10. By Carlos Maddela on 2016-05-31

Refreshed unicode patch to remove mojibake.

9. By Carlos Maddela on 2016-05-31

Bumped Standards Version to 3.9.8.

=== modified file 'audio-convert'
--- audio-convert	2007-04-09 21:25:41 +0000
+++ audio-convert	2016-05-31 23:18:55 +0000
@@ -437,7 +437,7 @@
 
 is_mac()
 {
-	file -b "$1" | grep 'Monkey' && echo $1 | grep -i '\.ape$'
+	file -b "$1" | grep 'data' && echo $1 | grep -i '\.ape$'
 }
 
 is_aac()
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-09-24 07:43:22 +0000
+++ debian/changelog	2016-05-31 23:18:55 +0000
@@ -1,3 +1,14 @@
+audio-convert (0.3.1.1-0ubuntu7) yakkety; urgency=low
+
+  * Bumped Standards Version to 3.9.8.
+  * Refreshed unicode patch to remove mojibake.
+  * Fix MusePack conversion (Closes LP: #545544).
+  * Fix transfer of ID3 tags (Closes LP: #180451).
+  * Bump suggested packages to recommended (Closes LP: #460749).
+  * Updated upstream URLs.
+
+ -- Carlos Maddela <[e-mail]>  Wed, 01 Jun 2016 07:37:43 +1000
+
 audio-convert (0.3.1.1-0ubuntu6) quantal; urgency=low
 
   * debian/control: Added ${misc:Depends} and Homepage field 
 
=== modified file 'debian/compat'
--- debian/compat	2005-12-18 20:23:28 +0000
+++ debian/compat	2016-05-31 23:18:55 +0000
@@ -1,1 +1,1 @@
-5
+9
 
=== modified file 'debian/control'
--- debian/control	2012-09-24 07:43:22 +0000
+++ debian/control	2016-05-31 23:18:55 +0000
@@ -2,16 +2,18 @@
 Section: sound
 Priority: optional
 Maintainer: Lukas Fittl <[e-mail]>
-Build-Depends: debhelper (>= 5), cdbs
-Standards-Version: 3.7.3
-Homepage: http://freecode.com/projects/audio-convert
+Build-Depends: debhelper (>= 9), dh-exec
+Standards-Version: 3.9.8
+Homepage: https://savannah.nongnu.org/projects/audio-convert
 
 Package: nautilus-script-audio-convert
 Section: sound
 Architecture: all
-Depends: ${misc:Depends}, nautilus-scripts-manager, file, zenity, gawk | mawk
-Suggests: lame, vorbis-tools, flac, faac, faad, mplayer | mplayer-nogui
-Description: A nautilus audio converter script
+Depends: ${misc:Depends}, nautilus-scripts-manager, file, zenity, gawk | mawk,
+ id3v2
+Recommends: lame, vorbis-tools, flac, faac, faad, mplayer | mplayer-nogui,
+ musepack-tools
+Description: Nautilus audio converter script
  audio convert is a script that converts between WAV, Ogg, MP3, MPC, FLAC, APE,
  AAC, and WMA files. It has an easy-to-use interface that makes it possible to
  fill in the tags for a few formats, copy the tags from input files into the
 
=== modified file 'debian/copyright'
--- debian/copyright	2007-12-17 12:48:54 +0000
+++ debian/copyright	2016-05-31 23:18:55 +0000
@@ -1,27 +1,33 @@
-This package was debianized by Lukas Fittl <[e-mail]> on
-Sun, 18 Dec 2005 20:23:28 +0100
-
-It was downloaded from http://freshmeat.net/projects/audio-convert
-
-Upstream Author: thetroublemaker <[e-mail]>
-
-Copyright: Copyright (C) 2005  linfasoft
-
-License:
-
-   This package is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This package is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this package; if not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: audio-convert
+Source: https://savannah.nongnu.org/projects/audio-convert
+
+Files: *
+Copyright: 2005 thetroublemaker <[e-mail]>
+           2005 linfasoft
+License: GPL-2+
+
+Files: debian/*
+Copyright: 2005-2007 Lukas Fittl <[e-mail]>
+           2007      Emmet Hikory <[e-mail]>
+           2010      Brian Murray <[e-mail]>
+           2012      Benjamin Kerensa <[e-mail]>
+           2016      Carlos Maddela <[e-mail]>
+License: GPL-2+
+
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
=== added file 'debian/nautilus-script-audio-convert.install'
--- debian/nautilus-script-audio-convert.install	1970-01-01 00:00:00 +0000
+++ debian/nautilus-script-audio-convert.install	2016-05-31 23:18:55 +0000
@@ -0,0 +1,2 @@
+#!/usr/bin/dh-exec
+audio-convert => /usr/share/nautilus-scripts/ConvertAudioFile
 
=== modified file 'debian/patches/01_fix_unicode.patch'
--- debian/patches/01_fix_unicode.patch	2006-05-10 01:33:25 +0000
+++ debian/patches/01_fix_unicode.patch	2016-05-31 23:18:55 +0000
@@ -1,16 +1,82 @@
-diff -Naur audio-convert-0.3.1.1.orig/audio-convert audio-convert-0.3.1.1/audio-convert
---- audio-convert-0.3.1.1.orig/audio-convert	2005-11-12 00:50:42.000000000 +0100
-+++ audio-convert-0.3.1.1/audio-convert	2006-05-10 01:24:03.000000000 +0200
-@@ -74,7 +74,7 @@
- 	options="choose from the followin' options:"
- 	options_conflict="options one and two conflict. please unselect one of them"
- case $LANG in
--        ######## Français ########
-+        ######## Français ########
-         fr* )
-         	title="audio convert "$version""
-         	pleasesel="Merci de selectionner au moins un fichier."
-@@ -102,13 +102,13 @@
+From: Lukas Fittl <[e-mail]>
+Date: Sun, 21 Feb 2016 18:48:06 +1100
+Subject: Fix unicode
+
+Description: Fix unicode
+Author: Lukas Fittl <[e-mail]>
+Origin: vendor, https://launchpadlibrarian.net/2549375/fix_42841.patch
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/audio-convert/+bug/42841
+Last-Update: 2016-02-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ ChangeLog     |  4 +--
+ README.ES     | 14 +++++------
+ audio-convert | 78 +++++++++++++++++++++++++++++------------------------------
+ 3 files changed, 48 insertions(+), 48 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 1c32341..b635e62 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -9,7 +9,7 @@
+ 
+ 2005-11-06	thetroublemaker <[e-mail]>
+ 
+-	* fixed the 'é' bug in 'ask_track' in french translation
++	* fixed the 'é' bug in 'ask_track' in french translation
+ 	  and in 'recur' in portuguese translation
+ 	* modified 'mp3_parse_fields' function for efficiency
+ 	* added the program title to the completed message
+@@ -26,7 +26,7 @@
+ 
+ 	* fixed a bug in the french translation which prevented
+ 	  quality from bein' asked, which of course prevented
+-	  pretty much every other step. replaced 'é' with 'e'
++	  pretty much every other step. replaced 'é' with 'e'
+ 
+ 2005-11-03	thetroublemaker <[e-mail]>
+ 
+diff --git a/README.ES b/README.ES
+index 0e5307a..4bfbf30 100644
+--- a/README.ES
++++ b/README.ES
+@@ -1,7 +1,7 @@
+ 11/07/2005   (MM/DD/YY Spanish way :) )
+ 
+-=== Introducción ===
+-Documentación del "audio convert script" en castellano.
++=== Introducción ===
++Documentación del "audio convert script" en castellano.
+ 
+ === Como utilizar el "script" ===
+ 
+@@ -10,14 +10,14 @@ Documentaci
+ 		
+ 	* Para instalarlo como un "script" de Rox,
+ 
+-	* Para utilizarlo como un bash "script" se requiere estar en X y tener zenity instalado, simplemente entra: "audio-convert path/to/archivo..." y especifica tantos archivos como quieras, estos serán procesados uno por uno al igual que sucede cuando seleccionas múltiples archivos en nautilus o Rox.
++	* Para utilizarlo como un bash "script" se requiere estar en X y tener zenity instalado, simplemente entra: "audio-convert path/to/archivo..." y especifica tantos archivos como quieras, estos serán procesados uno por uno al igual que sucede cuando seleccionas múltiples archivos en nautilus o Rox.
+ 	
+-=== Explicación de algunos valores ===
++=== Explicación de algunos valores ===
+ 	
+-	* La elección de calidad para mp3, ogg, y mpc se entiende claramente y no necesita mayor explicación. Estas están en orden ascendente, el primer parámetro tiene la calidad mas baja posible, mientras que el último tiene la calidad mas alta; el valor sugerido esta casi siempre cercano a la de mejor calidad.
++	* La elección de calidad para mp3, ogg, y mpc se entiende claramente y no necesita mayor explicación. Estas están en orden ascendente, el primer parámetro tiene la calidad mas baja posible, mientras que el último tiene la calidad mas alta; el valor sugerido esta casi siempre cercano a la de mejor calidad.
+ 	
+-	* En cuanto a los formatos flac y ape, tal vez sea necesario explicar un poco, estos están en orden ascendente al igual que los anteriores. La elección de calidad en estos casos se refiere a la calidad con la cual son comprimidos, mientras más alta la calidad que se elija, mayor serán comprimidos; generalmente elegir la mayor calidad posible es la mejor opción, pero ten en cuenta que demorará más tiempo en comprimirlos.
++	* En cuanto a los formatos flac y ape, tal vez sea necesario explicar un poco, estos están en orden ascendente al igual que los anteriores. La elección de calidad en estos casos se refiere a la calidad con la cual son comprimidos, mientras más alta la calidad que se elija, mayor serán comprimidos; generalmente elegir la mayor calidad posible es la mejor opción, pero ten en cuenta que demorará más tiempo en comprimirlos.
+ 	
+ === EOF ===
+ Sugerencias, bugs y comentarios a: http://savannah.nongnu.org/projects/audio-convert/ o por email: <[e-mail]> 
+-Nota: Debes mandarlos en ingles! :)  
+\ No newline at end of file
++Nota: Debes mandarlos en ingles! :)
+diff --git a/audio-convert b/audio-convert
+index e83cc0e..d86c4e6 100755
+--- a/audio-convert
++++ b/audio-convert
+@@ -102,13 +102,13 @@ case $LANG in
  		choix="formato di conversione:"
  		warning="attenzione"
  		proceed="esiste! sovrascrivo?"
@@ -26,7 +92,7 @@
  		ask_compression="scegli il livello di compressione:"
  		confirmation="vuoi convertire"
  		decoding="sto decodificando il file:"
-@@ -125,17 +125,17 @@
+@@ -125,17 +125,17 @@ case $LANG in
  		title="audio convert "$version""
  		pleasesel="por favor, selecione pelo menos um arquivo."
  		noselec=""$title" converter arquivos de audio. "$pleasesel""
@@ -51,7 +117,7 @@
  		decoding="decodificando arquivo:";;
  	######## dutch ########
  	nl* )
-@@ -163,47 +163,47 @@
+@@ -163,47 +163,47 @@ case $LANG in
  	######## german ########
  	de* )
                 title="Audio konvertier Skript "$version""
@@ -115,126 +181,49 @@
  	       no_codec="No tenrs el codec correcto para descodificar el elijido archivo. Falta:"
  	       not_supported="Format no es  soportado";;
  	######## polish ########
-@@ -212,24 +212,24 @@
- 		pleasesel="wybierz co najmniej jeden plik."
+@@ -213,23 +213,23 @@ case $LANG in
  		noselec="konwersja pliku "$title". "$pleasesel""
  		choix="rozszerzenie pliku wynikowego:"
--		warning="ostrzeżenie"
+ 		warning="ostrzeżenie"
 -		proceed="już istnieje. zastÄ~EpiÄ~G ?"
 -		recur=""$title" nie można konwertowaÄ~G katalogów. "$pleasesel""
-+		warning="ostrzeÃ…Å’enie"
-+		proceed="juÅŒ istnieje. zastÄ~EpiÄ~G ?"
-+		recur=""$title" nie moÅŒna konwertowaÄ~G katalogów. "$pleasesel""
++		proceed="już istnieje. zastąpić ?"
++		recur=""$title" nie można konwertować katalogów. "$pleasesel""
  		conversion="konwersja pliku:"
 -		ask_artist="podaj nazwÄ~Y wykonawcy:"
 -		ask_album="podaj nazwÄ~Y albumu:"
 -		ask_song="podaj nazwÄ~Y utworu:"
 -		ask_track="podaj numer Å~[cieżki:"
 -		ask_quality="wybierz wymagany poziom jakoÅ~[ci:"
-+		ask_artist="podaj nazwÄ~Y wykonawcy:"
-+		ask_album="podaj nazwÄ~Y albumu:"
-+		ask_song="podaj nazwÄ~Y utworu:"
-+		ask_track="podaj numer Ã…~[cieÃ…Å’ki:"
-+		ask_quality="wybierz wymagany poziom jakoÃ…~[ci:"
++		ask_artist="podaj nazwÄ™ wykonawcy:"
++		ask_album="podaj nazwÄ™ albumu:"
++		ask_song="podaj nazwÄ™ utworu:"
++		ask_track="podaj numer ścieżki:"
++		ask_quality="wybierz wymagany poziom jakości:"
  		ask_compression="wybierz wymagany poziom kompresji:"
 -		confirmation="chcesz użyÄ~G konwersji"
-+		confirmation="chcesz uÅŒyÄ~G konwersji"
++		confirmation="chcesz użyć konwersji"
  		decoding="dekodowany plik:"
 -		ask_fields="chcesz umieÅ~[ciÄ~G tagi ?"
 -		ask_confirmation_question="chcesz używaÄ~G potwierdzenia przed każdÄ~E konwersjÄ~E ?"
-+		ask_fields="chcesz umieÅ~[ciÄ~G tagi ?"
-+		ask_confirmation_question="chcesz uÅŒywaÄ~G potwierdzenia przed kaÅŒdÄ~E konwersjÄ~E ?"
++		ask_fields="chcesz umieścić tagi ?"
++		ask_confirmation_question="chcesz używać potwierdzenia przed każdą konwersją ?"
  		no_codec="nie posiadasz odpowiedniego kodeka dla wykonania wymaganej operacji. missin' codec:"
 -		not_supported="brak obsÅ~Bugi wskazanego formatu"
 -		completed="konwersjÄ~Y zakoÅ~Dczono. Pa, pa!"
 -		ask_to_pass="chcesz eksportowaÄ~G metatagi do innych plików?"
-+		not_supported="brak obsÃ…~Bugi wskazanego formatu"
-+		completed="konwersjÄ~Y zakoÅ~Dczono. Pa, pa!"
-+		ask_to_pass="chcesz eksportowaÄ~G metatagi do innych plików?"
++		not_supported="brak obsługi wskazanego formatu"
++		completed="konwersję zakończono. Pa, pa!"
++		ask_to_pass="chcesz eksportować metatagi do innych plików?"
  esac
  
  #################################################
-@@ -1172,7 +1172,7 @@
- 
- #################################################
- #       PROGRAMME
--#### Pas de fichiers sélectionné ###
-+#### Pas de fichiers sélectionné ###
- if [ $# -eq 0 ]; then
-         zenity --error --title="$warning" --text="$noselec"
-         exit 1
-@@ -1279,8 +1279,8 @@
- then			# formats to convert to
-         depformat="$depformat wav"
- fi
--######## Fenêtre principale ########
--while [ ! "$formatout" ] # Réafficher la fenêtre tant que l'utilisateur n'a pas fait de choix
-+######## Fenêtre principale ########
-+while [ ! "$formatout" ] # Réafficher la fenêtre tant que l'utilisateur n'a pas fait de choix
- do
- 
- 
-@@ -1309,7 +1309,7 @@
+@@ -1309,7 +1309,7 @@ file_number=$#
                  #echo "# $conversion $in_file"
                  i=`echo $i | sed 's/"//g'`
                  while `true`; do
 -                        ########## Le fichier de sortie existe déjÃ| , l'écraser ? ##########
-+                        ########## Le fichier de sortie existe déjÃ| , l'écraser ? ##########
++                        ########## Le fichier de sortie existe déjà , l'écraser ? ##########
                          if ls "$out_file" | grep -v "^ls"
                          then
                                  if !(`gdialog --title "$warning" --yesno "$out_file $proceed" 200 100`)
-diff -Naur audio-convert-0.3.1.1.orig/ChangeLog audio-convert-0.3.1.1/ChangeLog
---- audio-convert-0.3.1.1.orig/ChangeLog	2005-11-12 00:50:42.000000000 +0100
-+++ audio-convert-0.3.1.1/ChangeLog	2006-05-10 01:24:59.000000000 +0200
-@@ -9,7 +9,7 @@
- 
- 2005-11-06	thetroublemaker <[e-mail]>
- 
--	* fixed the 'é' bug in 'ask_track' in french translation
-+	* fixed the 'é' bug in 'ask_track' in french translation
- 	  and in 'recur' in portuguese translation
- 	* modified 'mp3_parse_fields' function for efficiency
- 	* added the program title to the completed message
-@@ -26,7 +26,7 @@
- 
- 	* fixed a bug in the french translation which prevented
- 	  quality from bein' asked, which of course prevented
--	  pretty much every other step. replaced 'é' with 'e'
-+	  pretty much every other step. replaced 'é' with 'e'
- 
- 2005-11-03	thetroublemaker <[e-mail]>
- 
-diff -Naur audio-convert-0.3.1.1.orig/README.ES audio-convert-0.3.1.1/README.ES
---- audio-convert-0.3.1.1.orig/README.ES	2005-11-12 00:50:42.000000000 +0100
-+++ audio-convert-0.3.1.1/README.ES	2006-05-10 01:24:46.000000000 +0200
-@@ -1,7 +1,7 @@
- 11/07/2005   (MM/DD/YY Spanish way :) )
- 
--=== Introducción ===
--Documentación del "audio convert script" en castellano.
-+=== Introducción ===
-+Documentación del "audio convert script" en castellano.
- 
- === Como utilizar el "script" ===
- 
-@@ -10,14 +10,14 @@
- 		
- 	* Para instalarlo como un "script" de Rox,
- 
--	* Para utilizarlo como un bash "script" se requiere estar en X y tener zenity instalado, simplemente entra: "audio-convert path/to/archivo..." y especifica tantos archivos como quieras, estos serán procesados uno por uno al igual que sucede cuando seleccionas múltiples archivos en nautilus o Rox.
-+	* Para utilizarlo como un bash "script" se requiere estar en X y tener zenity instalado, simplemente entra: "audio-convert path/to/archivo..." y especifica tantos archivos como quieras, estos serán procesados uno por uno al igual que sucede cuando seleccionas múltiples archivos en nautilus o Rox.
- 	
--=== Explicación de algunos valores ===
-+=== Explicación de algunos valores ===
- 	
--	* La elección de calidad para mp3, ogg, y mpc se entiende claramente y no necesita mayor explicación. Estas están en orden ascendente, el primer parámetro tiene la calidad mas baja posible, mientras que el último tiene la calidad mas alta; el valor sugerido esta casi siempre cercano a la de mejor calidad.
-+	* La elección de calidad para mp3, ogg, y mpc se entiende claramente y no necesita mayor explicación. Estas están en orden ascendente, el primer parámetro tiene la calidad mas baja posible, mientras que el último tiene la calidad mas alta; el valor sugerido esta casi siempre cercano a la de mejor calidad.
- 	
--	* En cuanto a los formatos flac y ape, tal vez sea necesario explicar un poco, estos están en orden ascendente al igual que los anteriores. La elección de calidad en estos casos se refiere a la calidad con la cual son comprimidos, mientras más alta la calidad que se elija, mayor serán comprimidos; generalmente elegir la mayor calidad posible es la mejor opción, pero ten en cuenta que demorará más tiempo en comprimirlos.
-+	* En cuanto a los formatos flac y ape, tal vez sea necesario explicar un poco, estos están en orden ascendente al igual que los anteriores. La elección de calidad en estos casos se refiere a la calidad con la cual son comprimidos, mientras más alta la calidad que se elija, mayor serán comprimidos; generalmente elegir la mayor calidad posible es la mejor opción, pero ten en cuenta que demorará más tiempo en comprimirlos.
- 	
- === EOF ===
- Sugerencias, bugs y comentarios a: http://savannah.nongnu.org/projects/audio-convert/ o por email: <[e-mail]> 
--Nota: Debes mandarlos en ingles! :)  
-\ No newline at end of file
-+Nota: Debes mandarlos en ingles! :)  
 
=== added file 'debian/patches/02_fix_monkey_audio_detection.patch'
--- debian/patches/02_fix_monkey_audio_detection.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/02_fix_monkey_audio_detection.patch	2016-05-31 23:18:55 +0000
@@ -0,0 +1,28 @@
+From: Carlos Maddela <[e-mail]>
+Date: Sun, 21 Feb 2016 18:24:23 +1100
+Subject: Fix monkey audio file detection
+
+Description: Fix monkey audio file detection
+Author: Sebastian Stark (kybercran)
+Origin: vendor, https://launchpadlibrarian.net/7101413/ConvertAudioFile.diff
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/audio-convert/+bug/99957
+Last-Update: 2016-02-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ audio-convert | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/audio-convert b/audio-convert
+index db4b883..6f47e40 100755
+--- a/audio-convert
++++ b/audio-convert
+@@ -437,7 +437,7 @@ is_flac()
+ 
+ is_mac()
+ {
+-	file -b "$1" | grep 'data' && echo $1 | grep -i '\.ape$'
++	file -b "$1" | grep 'Monkey' && echo $1 | grep -i '\.ape$'
+ }
+ 
+ is_aac()
 
=== added file 'debian/patches/03_fix_musepack_conv.patch'
--- debian/patches/03_fix_musepack_conv.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/03_fix_musepack_conv.patch	2016-05-31 23:18:55 +0000
@@ -0,0 +1,53 @@
+From: Carlos Maddela <[e-mail]>
+Date: Sun, 21 Feb 2016 19:44:11 +1100
+Subject: Fix MusePack conversion
+
+Description: Fix MusePack conversion
+Author: Carlos Maddela <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/audio-convert/+bug/545544
+Last-Update: 2016-02-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ audio-convert | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/audio-convert b/audio-convert
+index 1cb11bc..c8c299a 100755
+--- a/audio-convert
++++ b/audio-convert
+@@ -473,7 +473,7 @@ ogg_encode ()
+ 
+ mpc_encode ()
+ {
+-	mppenc --$quality "$2" "$3" 2>&1 | awk -vRS='\r' '!/^$/{if (NR>5) print $1; fflush();}' | zenity --progress --title="$title" --text="$conversion $1" --auto-close
++	mpcenc --$quality "$2" "$3" 2>&1 | awk -vRS='\r' '!/^$/{if (NR>5) print $1; fflush();}' | zenity --progress --title="$title" --text="$conversion $1" --auto-close
+ }
+ 
+ flac_encode ()
+@@ -512,7 +512,7 @@ ogg_decode ()
+ mpc_decode ()
+ {
+ 	temp_file=`echo "$1" | sed 's/\.\w*$/'.wav'/'`
+-	mppdec "$1" "$temp_file" 2>&1 | awk -vRS='\r' -F'[ (]+' '!/s/{gsub(/(%)/," ");if(NR>5)print $5; fflush();}' | zenity --progress --title="$title" --text="$2 $1" --auto-close
++	mpcdec "$1" "$temp_file" 2>&1 | awk -vRS='\r' -F'[ (]+' '!/s/{gsub(/(%)/," ");if(NR>5)print $5; fflush();}' | zenity --progress --title="$title" --text="$2 $1" --auto-close
+ }
+ 
+ flac_decode ()
+@@ -1211,14 +1211,14 @@ else    # if we don't have vorbis-tools, check if the file to convert is an ogg
+                 exit 1
+         fi
+ fi
+-if which mppenc 2>/dev/null
++if which mpcenc 2>/dev/null
+ then
+         if !(is_mpc "$1")	# if we have musepack-tools, and the file to convert is not
+         then			# an mpc, add mpc to the list of formats to convert to
+                 depformat="$depformat mpc"
+         fi
+ fi
+-if !(which mppdec 2>/dev/null)
++if !(which mpcdec 2>/dev/null)
+ then    # if we don't have musepack-tools, check if the file to convert is an mpc
+         if (is_mpc "$1")
+         then
 
=== added file 'debian/patches/04_fix_id3_transfer.patch'
--- debian/patches/04_fix_id3_transfer.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/04_fix_id3_transfer.patch	2016-05-31 23:18:55 +0000
@@ -0,0 +1,122 @@
+From: Carlos Maddela <[e-mail]>
+Date: Mon, 22 Feb 2016 04:38:52 +1100
+Subject: Fix transfer of ID3 tags
+
+Description: Fix transfer of ID3 tags
+ Use id3v2 instead of id3info/id3tag since it properly handles character
+ encoding.
+Author: Carlos Maddela <[e-mail]>
+Origin: vendor
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/audio-convert/+bug/180451
+Last-Update: 2016-02-22
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ audio-convert | 28 ++++++++++++++--------------
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/audio-convert b/audio-convert
+index c8c299a..dfa3b27 100755
+--- a/audio-convert
++++ b/audio-convert
+@@ -33,7 +33,7 @@
+ #       mplayer -- if you want to decode wma files
+ #       lame
+ #       vorbis tools
+-#       id3tag
++#       id3v2
+ #       musepack-tools
+ #	flac
+ #	mac
+@@ -304,10 +304,10 @@ get_metatags ()
+ {
+ 	if (is_mp3 "$1")
+ 	then
+-		artist_name=`id3info "$1" | awk '/TPE1/ { print substr($0, match($0, /:/) + 2 ) }'`
+-		album_name=`id3info "$1" | awk '/TALB/ { print substr($0, match($0, /:/) + 2 ) }'`
+-		song_name=`id3info "$1" | awk '/TIT2/ { print substr($0, match($0, /:/) + 2 ) }'`
+-		track_number=`id3info "$1" | awk '/TRCK/ { print substr($0, match($0, /:/) + 2 ) }'`
++		artist_name=`id3v2 -l "$1" | awk '/TPE1/ { print substr($0, match($0, /:/) + 2 ) }'`
++		album_name=`id3v2 -l "$1" | awk '/TALB/ { print substr($0, match($0, /:/) + 2 ) }'`
++		song_name=`id3v2 -l "$1" | awk '/TIT2/ { print substr($0, match($0, /:/) + 2 ) }'`
++		track_number=`id3v2 -l "$1" | awk '/TRCK/ { print substr($0, match($0, /:/) + 2 ) }'`
+ 	fi
+ 	if (is_ogg "$1")
+         then
+@@ -344,11 +344,11 @@ mp3_parse_fields ()
+         fi
+         if [ "$song_name" ]
+         then
+-                mp3_fields=("${mp3_fields[@]}" -s"$song_name")
++                mp3_fields=("${mp3_fields[@]}" -t"$song_name")
+         fi
+         if [ "$track_number" ]
+         then
+-                mp3_fields=("${mp3_fields[@]}" -t"$track_number")
++                mp3_fields=("${mp3_fields[@]}" -T"$track_number")
+         fi
+ }
+ 
+@@ -716,7 +716,7 @@ caf () # fonction "convert audio file"
+ 			if [ $pass_metatags -eq 0 ] || [ $fields -eq 0 ]
+ 			then
+ 				mp3_parse_fields
+-				id3tag "${mp3_fields[@]}" "$2"
++				id3v2 "${mp3_fields[@]}" "$2"
+ 			fi
+ 			rm -f "$temp_file"
+ 			break
+@@ -781,7 +781,7 @@ caf () # fonction "convert audio file"
+                         then
+ 	                        get_field_names "$1"
+ 				mp3_parse_fields
+-				id3tag "${mp3_fields[@]}" "$2"
++				id3v2 "${mp3_fields[@]}" "$2"
+ 				break
+ 			fi
+                         mpc_decode "$1" "$decoding"
+@@ -853,7 +853,7 @@ caf () # fonction "convert audio file"
+ 			if [ $pass_metatags -eq 0 ] || [ $fields -eq 0 ]
+ 			then
+ 				mp3_parse_fields
+-				id3tag "${mp3_fields[@]}" "$2"
++				id3v2 "${mp3_fields[@]}" "$2"
+ 			fi
+ 			rm -f "$temp_file"
+ 			break
+@@ -917,7 +917,7 @@ caf () # fonction "convert audio file"
+                         then
+ 				get_field_names "$1"
+ 				mp3_parse_fields
+-				id3tag "${mp3_fields[@]}" "$2"
++				id3v2 "${mp3_fields[@]}" "$2"
+ 				break
+ 			fi
+ 			mac_decode "$1" "$decoding"
+@@ -989,7 +989,7 @@ caf () # fonction "convert audio file"
+                         if [ $pass_metatags -eq 0 ] || [ $fields -eq 0 ]
+                         then
+                                 mp3_parse_fields
+-                                id3tag "${mp3_fields[@]}" "$2"
++                                id3v2 "${mp3_fields[@]}" "$2"
+                         fi
+                         rm -f "$temp_file"
+                         break
+@@ -1053,7 +1053,7 @@ caf () # fonction "convert audio file"
+                         then
+ 	                        get_field_names "$1"
+ 				mp3_parse_fields
+-				id3tag "${mp3_fields[@]}" "$2"
++				id3v2 "${mp3_fields[@]}" "$2"
+ 				break
+ 			fi
+ 			break
+@@ -1106,7 +1106,7 @@ caf () # fonction "convert audio file"
+                         then
+ 	                        get_field_names "$1"
+ 				mp3_parse_fields
+-				id3tag "${mp3_fields[@]}" "$2"
++				id3v2 "${mp3_fields[@]}" "$2"
+ 				break
+ 			fi
+                         rm -f "$temp_file"
 
=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2016-05-31 23:18:55 +0000
@@ -0,0 +1,4 @@
+01_fix_unicode.patch
+02_fix_monkey_audio_detection.patch
+03_fix_musepack_conv.patch
+04_fix_id3_transfer.patch
 
=== removed file 'debian/postinst'
--- debian/postinst	2010-04-07 14:45:33 +0000
+++ debian/postinst	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-#!/bin/sh
-# postinst script for audio-convert
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    configure|abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
 
=== removed file 'debian/prerm'
--- debian/prerm	2010-04-07 14:45:33 +0000
+++ debian/prerm	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-#!/bin/sh
-# prerm script for #PACKAGE#
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <prerm> `remove'
-#        * <old-prerm> `upgrade' <new-version>
-#        * <new-prerm> `failed-upgrade' <old-version>
-#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-#        * <deconfigured's-prerm> `deconfigure' `in-favour'
-#          <package-being-installed> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    remove|upgrade|deconfigure|failed-upgrade)
-    ;;
-
-    *)
-        echo "prerm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
 
=== modified file 'debian/rules'
--- debian/rules	2007-12-17 12:48:54 +0000
+++ debian/rules	2016-05-31 23:18:55 +0000
@@ -1,9 +1,35 @@
 #!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-
-DEB_INSTALL_CHANGELOGS_ALL := ChangeLog
-
-install/nautilus-script-audio-convert::
-	install -D -T audio-convert "debian/nautilus-script-audio-convert/usr/share/nautilus-scripts/ConvertAudioFile"
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#export DH_VERBOSE = 1
+
+# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/*
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/default.mk
+
+# see FEATURE AREAS in dpkg-buildflags(1)
+#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+# see ENVIRONMENT in dpkg-buildflags(1)
+# package maintainers to append CFLAGS
+#export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
+# package maintainers to append LDFLAGS
+#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
+
+# main packaging script based on dh7 syntax
+%:
+	dh $@ 
+
+override_dh_installchangelogs:
+	dh_installchangelogs ChangeLog
+
+# dh_make generated override targets
+# This is example for Cmake (See https://bugs.debian.org/641051 )
+#override_dh_auto_configure:
+#	dh_auto_configure -- \
+#	-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+
+
+
+
 
=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2016-05-31 23:18:55 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)
 
=== modified file 'debian/watch'
--- debian/watch	2007-12-17 12:48:54 +0000
+++ debian/watch	2016-05-31 23:18:55 +0000
@@ -1,2 +1,2 @@
 version=3
-http://freshmeat.net/projects/audio-convert (?:.*/)?audio-convert-?_?([\d+\.]+|\d+)\.tar.* debian uupdate
+http://download.savannah.gnu.org/releases/audio-convert (?:.*/)?audio-convert-?_?([\d+\.]+|\d+)\.tar.* debian uupdate