Merge lp:~e7appew/ubuntu/wily/audio-convert/nmu into lp:ubuntu/wily/audio-convert
- Wily (15.10)
- nmu
- Merge into wily
Status: | Needs review |
---|---|
Proposed branch: | lp:~e7appew/ubuntu/wily/audio-convert/nmu |
Merge into: | lp:ubuntu/wily/audio-convert |
Diff against target: |
776 lines (+397/-228) 16 files modified
audio-convert (+1/-1) debian/changelog (+11/-0) debian/compat (+1/-1) debian/control (+8/-6) debian/copyright (+33/-27) debian/nautilus-script-audio-convert.install (+2/-0) debian/patches/01_fix_unicode.patch (+98/-109) debian/patches/02_fix_monkey_audio_detection.patch (+28/-0) debian/patches/03_fix_musepack_conv.patch (+53/-0) debian/patches/04_fix_id3_transfer.patch (+122/-0) debian/patches/series (+4/-0) debian/postinst (+0/-38) debian/prerm (+0/-37) debian/rules (+34/-8) debian/source/format (+1/-0) debian/watch (+1/-1) |
To merge this branch: | bzr merge lp:~e7appew/ubuntu/wily/audio-convert/nmu |
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Marc Deslauriers | Needs Fixing | ||
Review via email: mp+286759@code.launchpad.net |
Commit message
- 9. By Carlos Maddela
-
Bumped Standards Version to 3.9.8.
- 10. By Carlos Maddela
-
Refreshed unicode patch to remove mojibake.
- 11. By Carlos Maddela
-
Fix MusePack conversion (Closes LP: #545544).
Carlos Maddela (e7appew) wrote : | # |
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!
- 12. By Carlos Maddela
-
Fix transfer of ID3 tags (Closes LP: #180451).
- 13. By Carlos Maddela
-
Bump suggested packages to recommended (Closes LP: #460749).
- 14. By Carlos Maddela
-
Updated upstream URLs.
- 15. By Carlos Maddela
-
Release 0.3.1.1-0ubuntu7
Carlos Maddela (e7appew) wrote : | # |
I was able to reproduce this build error in another project I've been
working on. The reason it occurs is that
debian/
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
-
Release 0.3.1.1-0ubuntu7
- 14. By Carlos Maddela
-
Updated upstream URLs.
- 13. By Carlos Maddela
-
Bump suggested packages to recommended (Closes LP: #460749).
- 12. By Carlos Maddela
-
Fix transfer of ID3 tags (Closes LP: #180451).
- 11. By Carlos Maddela
-
Fix MusePack conversion (Closes LP: #545544).
- 10. By Carlos Maddela
-
Refreshed unicode patch to remove mojibake.
- 9. By Carlos Maddela
-
Bumped Standards Version to 3.9.8.
Preview Diff
1 | === modified file 'audio-convert' |
2 | --- audio-convert 2007-04-09 21:25:41 +0000 |
3 | +++ audio-convert 2016-05-31 23:18:55 +0000 |
4 | @@ -437,7 +437,7 @@ |
5 | |
6 | is_mac() |
7 | { |
8 | - file -b "$1" | grep 'Monkey' && echo $1 | grep -i '\.ape$' |
9 | + file -b "$1" | grep 'data' && echo $1 | grep -i '\.ape$' |
10 | } |
11 | |
12 | is_aac() |
13 | |
14 | === modified file 'debian/changelog' |
15 | --- debian/changelog 2012-09-24 07:43:22 +0000 |
16 | +++ debian/changelog 2016-05-31 23:18:55 +0000 |
17 | @@ -1,3 +1,14 @@ |
18 | +audio-convert (0.3.1.1-0ubuntu7) yakkety; urgency=low |
19 | + |
20 | + * Bumped Standards Version to 3.9.8. |
21 | + * Refreshed unicode patch to remove mojibake. |
22 | + * Fix MusePack conversion (Closes LP: #545544). |
23 | + * Fix transfer of ID3 tags (Closes LP: #180451). |
24 | + * Bump suggested packages to recommended (Closes LP: #460749). |
25 | + * Updated upstream URLs. |
26 | + |
27 | + -- Carlos Maddela <e7appew@gmail.com> Wed, 01 Jun 2016 07:37:43 +1000 |
28 | + |
29 | audio-convert (0.3.1.1-0ubuntu6) quantal; urgency=low |
30 | |
31 | * debian/control: Added ${misc:Depends} and Homepage field |
32 | |
33 | === modified file 'debian/compat' |
34 | --- debian/compat 2005-12-18 20:23:28 +0000 |
35 | +++ debian/compat 2016-05-31 23:18:55 +0000 |
36 | @@ -1,1 +1,1 @@ |
37 | -5 |
38 | +9 |
39 | |
40 | === modified file 'debian/control' |
41 | --- debian/control 2012-09-24 07:43:22 +0000 |
42 | +++ debian/control 2016-05-31 23:18:55 +0000 |
43 | @@ -2,16 +2,18 @@ |
44 | Section: sound |
45 | Priority: optional |
46 | Maintainer: Lukas Fittl <lfittl@ubuntu.com> |
47 | -Build-Depends: debhelper (>= 5), cdbs |
48 | -Standards-Version: 3.7.3 |
49 | -Homepage: http://freecode.com/projects/audio-convert |
50 | +Build-Depends: debhelper (>= 9), dh-exec |
51 | +Standards-Version: 3.9.8 |
52 | +Homepage: https://savannah.nongnu.org/projects/audio-convert |
53 | |
54 | Package: nautilus-script-audio-convert |
55 | Section: sound |
56 | Architecture: all |
57 | -Depends: ${misc:Depends}, nautilus-scripts-manager, file, zenity, gawk | mawk |
58 | -Suggests: lame, vorbis-tools, flac, faac, faad, mplayer | mplayer-nogui |
59 | -Description: A nautilus audio converter script |
60 | +Depends: ${misc:Depends}, nautilus-scripts-manager, file, zenity, gawk | mawk, |
61 | + id3v2 |
62 | +Recommends: lame, vorbis-tools, flac, faac, faad, mplayer | mplayer-nogui, |
63 | + musepack-tools |
64 | +Description: Nautilus audio converter script |
65 | audio convert is a script that converts between WAV, Ogg, MP3, MPC, FLAC, APE, |
66 | AAC, and WMA files. It has an easy-to-use interface that makes it possible to |
67 | fill in the tags for a few formats, copy the tags from input files into the |
68 | |
69 | === modified file 'debian/copyright' |
70 | --- debian/copyright 2007-12-17 12:48:54 +0000 |
71 | +++ debian/copyright 2016-05-31 23:18:55 +0000 |
72 | @@ -1,27 +1,33 @@ |
73 | -This package was debianized by Lukas Fittl <lfittl@ixios-software.com> on |
74 | -Sun, 18 Dec 2005 20:23:28 +0100 |
75 | - |
76 | -It was downloaded from http://freshmeat.net/projects/audio-convert |
77 | - |
78 | -Upstream Author: thetroublemaker <thetroublemaker@inventati.org> |
79 | - |
80 | -Copyright: Copyright (C) 2005 linfasoft |
81 | - |
82 | -License: |
83 | - |
84 | - This package is free software; you can redistribute it and/or modify |
85 | - it under the terms of the GNU General Public License as published by |
86 | - the Free Software Foundation; either version 2 of the License, or |
87 | - (at your option) any later version. |
88 | - |
89 | - This package is distributed in the hope that it will be useful, |
90 | - but WITHOUT ANY WARRANTY; without even the implied warranty of |
91 | - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
92 | - GNU General Public License for more details. |
93 | - |
94 | - You should have received a copy of the GNU General Public License |
95 | - along with this package; if not, write to the Free Software Foundation, |
96 | - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
97 | - |
98 | -On Debian systems, the complete text of the GNU General |
99 | -Public License can be found in `/usr/share/common-licenses/GPL'. |
100 | +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ |
101 | +Upstream-Name: audio-convert |
102 | +Source: https://savannah.nongnu.org/projects/audio-convert |
103 | + |
104 | +Files: * |
105 | +Copyright: 2005 thetroublemaker <thetroublemaker@inventati.org> |
106 | + 2005 linfasoft |
107 | +License: GPL-2+ |
108 | + |
109 | +Files: debian/* |
110 | +Copyright: 2005-2007 Lukas Fittl <lfittl@ubuntu.com> |
111 | + 2007 Emmet Hikory <persia@ubuntu.com> |
112 | + 2010 Brian Murray <brian@ubuntu.com> |
113 | + 2012 Benjamin Kerensa <bkerensa@ubuntu.com> |
114 | + 2016 Carlos Maddela <e7appew@gmail.com> |
115 | +License: GPL-2+ |
116 | + |
117 | +License: GPL-2+ |
118 | + This package is free software; you can redistribute it and/or modify |
119 | + it under the terms of the GNU General Public License as published by |
120 | + the Free Software Foundation; either version 2 of the License, or |
121 | + (at your option) any later version. |
122 | + . |
123 | + This package is distributed in the hope that it will be useful, |
124 | + but WITHOUT ANY WARRANTY; without even the implied warranty of |
125 | + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
126 | + GNU General Public License for more details. |
127 | + . |
128 | + You should have received a copy of the GNU General Public License |
129 | + along with this program. If not, see <https://www.gnu.org/licenses/> |
130 | + . |
131 | + On Debian systems, the complete text of the GNU General |
132 | + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". |
133 | |
134 | === added file 'debian/nautilus-script-audio-convert.install' |
135 | --- debian/nautilus-script-audio-convert.install 1970-01-01 00:00:00 +0000 |
136 | +++ debian/nautilus-script-audio-convert.install 2016-05-31 23:18:55 +0000 |
137 | @@ -0,0 +1,2 @@ |
138 | +#!/usr/bin/dh-exec |
139 | +audio-convert => /usr/share/nautilus-scripts/ConvertAudioFile |
140 | |
141 | === modified file 'debian/patches/01_fix_unicode.patch' |
142 | --- debian/patches/01_fix_unicode.patch 2006-05-10 01:33:25 +0000 |
143 | +++ debian/patches/01_fix_unicode.patch 2016-05-31 23:18:55 +0000 |
144 | @@ -1,16 +1,82 @@ |
145 | -diff -Naur audio-convert-0.3.1.1.orig/audio-convert audio-convert-0.3.1.1/audio-convert |
146 | ---- audio-convert-0.3.1.1.orig/audio-convert 2005-11-12 00:50:42.000000000 +0100 |
147 | -+++ audio-convert-0.3.1.1/audio-convert 2006-05-10 01:24:03.000000000 +0200 |
148 | -@@ -74,7 +74,7 @@ |
149 | - options="choose from the followin' options:" |
150 | - options_conflict="options one and two conflict. please unselect one of them" |
151 | - case $LANG in |
152 | -- ######## Français ######## |
153 | -+ ######## Français ######## |
154 | - fr* ) |
155 | - title="audio convert "$version"" |
156 | - pleasesel="Merci de selectionner au moins un fichier." |
157 | -@@ -102,13 +102,13 @@ |
158 | +From: Lukas Fittl <lfittl@ubuntu.com> |
159 | +Date: Sun, 21 Feb 2016 18:48:06 +1100 |
160 | +Subject: Fix unicode |
161 | + |
162 | +Description: Fix unicode |
163 | +Author: Lukas Fittl <lfittl@ubuntu.com> |
164 | +Origin: vendor, https://launchpadlibrarian.net/2549375/fix_42841.patch |
165 | +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/audio-convert/+bug/42841 |
166 | +Last-Update: 2016-02-21 |
167 | +--- |
168 | +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ |
169 | +--- |
170 | + ChangeLog | 4 +-- |
171 | + README.ES | 14 +++++------ |
172 | + audio-convert | 78 +++++++++++++++++++++++++++++------------------------------ |
173 | + 3 files changed, 48 insertions(+), 48 deletions(-) |
174 | + |
175 | +diff --git a/ChangeLog b/ChangeLog |
176 | +index 1c32341..b635e62 100644 |
177 | +--- a/ChangeLog |
178 | ++++ b/ChangeLog |
179 | +@@ -9,7 +9,7 @@ |
180 | + |
181 | + 2005-11-06 thetroublemaker <thetroublemaker@inventati.org> |
182 | + |
183 | +- * fixed the 'é' bug in 'ask_track' in french translation |
184 | ++ * fixed the 'é' bug in 'ask_track' in french translation |
185 | + and in 'recur' in portuguese translation |
186 | + * modified 'mp3_parse_fields' function for efficiency |
187 | + * added the program title to the completed message |
188 | +@@ -26,7 +26,7 @@ |
189 | + |
190 | + * fixed a bug in the french translation which prevented |
191 | + quality from bein' asked, which of course prevented |
192 | +- pretty much every other step. replaced 'é' with 'e' |
193 | ++ pretty much every other step. replaced 'é' with 'e' |
194 | + |
195 | + 2005-11-03 thetroublemaker <thetroublemaker@inventati.org> |
196 | + |
197 | +diff --git a/README.ES b/README.ES |
198 | +index 0e5307a..4bfbf30 100644 |
199 | +--- a/README.ES |
200 | ++++ b/README.ES |
201 | +@@ -1,7 +1,7 @@ |
202 | + 11/07/2005 (MM/DD/YY Spanish way :) ) |
203 | + |
204 | +-=== Introducción === |
205 | +-Documentación del "audio convert script" en castellano. |
206 | ++=== Introducción === |
207 | ++Documentación del "audio convert script" en castellano. |
208 | + |
209 | + === Como utilizar el "script" === |
210 | + |
211 | +@@ -10,14 +10,14 @@ Documentaci |
212 | + |
213 | + * Para instalarlo como un "script" de Rox, |
214 | + |
215 | +- * 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. |
216 | ++ * 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. |
217 | + |
218 | +-=== Explicación de algunos valores === |
219 | ++=== Explicación de algunos valores === |
220 | + |
221 | +- * 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. |
222 | ++ * 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. |
223 | + |
224 | +- * 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. |
225 | ++ * 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. |
226 | + |
227 | + === EOF === |
228 | + Sugerencias, bugs y comentarios a: http://savannah.nongnu.org/projects/audio-convert/ o por email: <thetroublemaker@inventati.org> |
229 | +-Nota: Debes mandarlos en ingles! :) |
230 | +\ No newline at end of file |
231 | ++Nota: Debes mandarlos en ingles! :) |
232 | +diff --git a/audio-convert b/audio-convert |
233 | +index e83cc0e..d86c4e6 100755 |
234 | +--- a/audio-convert |
235 | ++++ b/audio-convert |
236 | +@@ -102,13 +102,13 @@ case $LANG in |
237 | choix="formato di conversione:" |
238 | warning="attenzione" |
239 | proceed="esiste! sovrascrivo?" |
240 | @@ -26,7 +92,7 @@ |
241 | ask_compression="scegli il livello di compressione:" |
242 | confirmation="vuoi convertire" |
243 | decoding="sto decodificando il file:" |
244 | -@@ -125,17 +125,17 @@ |
245 | +@@ -125,17 +125,17 @@ case $LANG in |
246 | title="audio convert "$version"" |
247 | pleasesel="por favor, selecione pelo menos um arquivo." |
248 | noselec=""$title" converter arquivos de audio. "$pleasesel"" |
249 | @@ -51,7 +117,7 @@ |
250 | decoding="decodificando arquivo:";; |
251 | ######## dutch ######## |
252 | nl* ) |
253 | -@@ -163,47 +163,47 @@ |
254 | +@@ -163,47 +163,47 @@ case $LANG in |
255 | ######## german ######## |
256 | de* ) |
257 | title="Audio konvertier Skript "$version"" |
258 | @@ -115,126 +181,49 @@ |
259 | no_codec="No tenrs el codec correcto para descodificar el elijido archivo. Falta:" |
260 | not_supported="Format no es soportado";; |
261 | ######## polish ######## |
262 | -@@ -212,24 +212,24 @@ |
263 | - pleasesel="wybierz co najmniej jeden plik." |
264 | +@@ -213,23 +213,23 @@ case $LANG in |
265 | noselec="konwersja pliku "$title". "$pleasesel"" |
266 | choix="rozszerzenie pliku wynikowego:" |
267 | -- warning="ostrzeżenie" |
268 | + warning="ostrzeżenie" |
269 | - proceed="już istnieje. zastÄ~EpiÄ~G ?" |
270 | - recur=""$title" nie można konwertowaÄ~G katalogów. "$pleasesel"" |
271 | -+ warning="ostrzeÃ…Å’enie" |
272 | -+ proceed="juÅŒ istnieje. zastÄ~EpiÄ~G ?" |
273 | -+ recur=""$title" nie moÅŒna konwertowaÄ~G katalogów. "$pleasesel"" |
274 | ++ proceed="już istnieje. zastąpić ?" |
275 | ++ recur=""$title" nie można konwertować katalogów. "$pleasesel"" |
276 | conversion="konwersja pliku:" |
277 | - ask_artist="podaj nazwÄ~Y wykonawcy:" |
278 | - ask_album="podaj nazwÄ~Y albumu:" |
279 | - ask_song="podaj nazwÄ~Y utworu:" |
280 | - ask_track="podaj numer Å~[cieżki:" |
281 | - ask_quality="wybierz wymagany poziom jakoÅ~[ci:" |
282 | -+ ask_artist="podaj nazwÄ~Y wykonawcy:" |
283 | -+ ask_album="podaj nazwÄ~Y albumu:" |
284 | -+ ask_song="podaj nazwÄ~Y utworu:" |
285 | -+ ask_track="podaj numer Ã…~[cieÃ…Å’ki:" |
286 | -+ ask_quality="wybierz wymagany poziom jakoÃ…~[ci:" |
287 | ++ ask_artist="podaj nazwÄ™ wykonawcy:" |
288 | ++ ask_album="podaj nazwÄ™ albumu:" |
289 | ++ ask_song="podaj nazwÄ™ utworu:" |
290 | ++ ask_track="podaj numer ścieżki:" |
291 | ++ ask_quality="wybierz wymagany poziom jakości:" |
292 | ask_compression="wybierz wymagany poziom kompresji:" |
293 | - confirmation="chcesz użyÄ~G konwersji" |
294 | -+ confirmation="chcesz uÅŒyÄ~G konwersji" |
295 | ++ confirmation="chcesz użyć konwersji" |
296 | decoding="dekodowany plik:" |
297 | - ask_fields="chcesz umieÅ~[ciÄ~G tagi ?" |
298 | - ask_confirmation_question="chcesz używaÄ~G potwierdzenia przed każdÄ~E konwersjÄ~E ?" |
299 | -+ ask_fields="chcesz umieÅ~[ciÄ~G tagi ?" |
300 | -+ ask_confirmation_question="chcesz uÅŒywaÄ~G potwierdzenia przed kaÅŒdÄ~E konwersjÄ~E ?" |
301 | ++ ask_fields="chcesz umieścić tagi ?" |
302 | ++ ask_confirmation_question="chcesz używać potwierdzenia przed każdą konwersją ?" |
303 | no_codec="nie posiadasz odpowiedniego kodeka dla wykonania wymaganej operacji. missin' codec:" |
304 | - not_supported="brak obsÅ~Bugi wskazanego formatu" |
305 | - completed="konwersjÄ~Y zakoÅ~Dczono. Pa, pa!" |
306 | - ask_to_pass="chcesz eksportowaÄ~G metatagi do innych plików?" |
307 | -+ not_supported="brak obsÃ…~Bugi wskazanego formatu" |
308 | -+ completed="konwersjÄ~Y zakoÅ~Dczono. Pa, pa!" |
309 | -+ ask_to_pass="chcesz eksportowaÄ~G metatagi do innych plików?" |
310 | ++ not_supported="brak obsługi wskazanego formatu" |
311 | ++ completed="konwersję zakończono. Pa, pa!" |
312 | ++ ask_to_pass="chcesz eksportować metatagi do innych plików?" |
313 | esac |
314 | |
315 | ################################################# |
316 | -@@ -1172,7 +1172,7 @@ |
317 | - |
318 | - ################################################# |
319 | - # PROGRAMME |
320 | --#### Pas de fichiers sélectionné ### |
321 | -+#### Pas de fichiers sélectionné ### |
322 | - if [ $# -eq 0 ]; then |
323 | - zenity --error --title="$warning" --text="$noselec" |
324 | - exit 1 |
325 | -@@ -1279,8 +1279,8 @@ |
326 | - then # formats to convert to |
327 | - depformat="$depformat wav" |
328 | - fi |
329 | --######## Fenêtre principale ######## |
330 | --while [ ! "$formatout" ] # Réafficher la fenêtre tant que l'utilisateur n'a pas fait de choix |
331 | -+######## Fenêtre principale ######## |
332 | -+while [ ! "$formatout" ] # Réafficher la fenêtre tant que l'utilisateur n'a pas fait de choix |
333 | - do |
334 | - |
335 | - |
336 | -@@ -1309,7 +1309,7 @@ |
337 | +@@ -1309,7 +1309,7 @@ file_number=$# |
338 | #echo "# $conversion $in_file" |
339 | i=`echo $i | sed 's/"//g'` |
340 | while `true`; do |
341 | - ########## Le fichier de sortie existe déjÃ| , l'écraser ? ########## |
342 | -+ ########## Le fichier de sortie existe déjÃ| , l'écraser ? ########## |
343 | ++ ########## Le fichier de sortie existe déjà , l'écraser ? ########## |
344 | if ls "$out_file" | grep -v "^ls" |
345 | then |
346 | if !(`gdialog --title "$warning" --yesno "$out_file $proceed" 200 100`) |
347 | -diff -Naur audio-convert-0.3.1.1.orig/ChangeLog audio-convert-0.3.1.1/ChangeLog |
348 | ---- audio-convert-0.3.1.1.orig/ChangeLog 2005-11-12 00:50:42.000000000 +0100 |
349 | -+++ audio-convert-0.3.1.1/ChangeLog 2006-05-10 01:24:59.000000000 +0200 |
350 | -@@ -9,7 +9,7 @@ |
351 | - |
352 | - 2005-11-06 thetroublemaker <thetroublemaker@inventati.org> |
353 | - |
354 | -- * fixed the 'é' bug in 'ask_track' in french translation |
355 | -+ * fixed the 'é' bug in 'ask_track' in french translation |
356 | - and in 'recur' in portuguese translation |
357 | - * modified 'mp3_parse_fields' function for efficiency |
358 | - * added the program title to the completed message |
359 | -@@ -26,7 +26,7 @@ |
360 | - |
361 | - * fixed a bug in the french translation which prevented |
362 | - quality from bein' asked, which of course prevented |
363 | -- pretty much every other step. replaced 'é' with 'e' |
364 | -+ pretty much every other step. replaced 'é' with 'e' |
365 | - |
366 | - 2005-11-03 thetroublemaker <thetroublemaker@inventati.org> |
367 | - |
368 | -diff -Naur audio-convert-0.3.1.1.orig/README.ES audio-convert-0.3.1.1/README.ES |
369 | ---- audio-convert-0.3.1.1.orig/README.ES 2005-11-12 00:50:42.000000000 +0100 |
370 | -+++ audio-convert-0.3.1.1/README.ES 2006-05-10 01:24:46.000000000 +0200 |
371 | -@@ -1,7 +1,7 @@ |
372 | - 11/07/2005 (MM/DD/YY Spanish way :) ) |
373 | - |
374 | --=== Introducción === |
375 | --Documentación del "audio convert script" en castellano. |
376 | -+=== Introducción === |
377 | -+Documentación del "audio convert script" en castellano. |
378 | - |
379 | - === Como utilizar el "script" === |
380 | - |
381 | -@@ -10,14 +10,14 @@ |
382 | - |
383 | - * Para instalarlo como un "script" de Rox, |
384 | - |
385 | -- * 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. |
386 | -+ * 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. |
387 | - |
388 | --=== Explicación de algunos valores === |
389 | -+=== Explicación de algunos valores === |
390 | - |
391 | -- * 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. |
392 | -+ * 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. |
393 | - |
394 | -- * 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. |
395 | -+ * 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. |
396 | - |
397 | - === EOF === |
398 | - Sugerencias, bugs y comentarios a: http://savannah.nongnu.org/projects/audio-convert/ o por email: <thetroublemaker@inventati.org> |
399 | --Nota: Debes mandarlos en ingles! :) |
400 | -\ No newline at end of file |
401 | -+Nota: Debes mandarlos en ingles! :) |
402 | |
403 | === added file 'debian/patches/02_fix_monkey_audio_detection.patch' |
404 | --- debian/patches/02_fix_monkey_audio_detection.patch 1970-01-01 00:00:00 +0000 |
405 | +++ debian/patches/02_fix_monkey_audio_detection.patch 2016-05-31 23:18:55 +0000 |
406 | @@ -0,0 +1,28 @@ |
407 | +From: Carlos Maddela <e7appew@gmail.com> |
408 | +Date: Sun, 21 Feb 2016 18:24:23 +1100 |
409 | +Subject: Fix monkey audio file detection |
410 | + |
411 | +Description: Fix monkey audio file detection |
412 | +Author: Sebastian Stark (kybercran) |
413 | +Origin: vendor, https://launchpadlibrarian.net/7101413/ConvertAudioFile.diff |
414 | +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/audio-convert/+bug/99957 |
415 | +Last-Update: 2016-02-21 |
416 | +--- |
417 | +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ |
418 | +--- |
419 | + audio-convert | 2 +- |
420 | + 1 file changed, 1 insertion(+), 1 deletion(-) |
421 | + |
422 | +diff --git a/audio-convert b/audio-convert |
423 | +index db4b883..6f47e40 100755 |
424 | +--- a/audio-convert |
425 | ++++ b/audio-convert |
426 | +@@ -437,7 +437,7 @@ is_flac() |
427 | + |
428 | + is_mac() |
429 | + { |
430 | +- file -b "$1" | grep 'data' && echo $1 | grep -i '\.ape$' |
431 | ++ file -b "$1" | grep 'Monkey' && echo $1 | grep -i '\.ape$' |
432 | + } |
433 | + |
434 | + is_aac() |
435 | |
436 | === added file 'debian/patches/03_fix_musepack_conv.patch' |
437 | --- debian/patches/03_fix_musepack_conv.patch 1970-01-01 00:00:00 +0000 |
438 | +++ debian/patches/03_fix_musepack_conv.patch 2016-05-31 23:18:55 +0000 |
439 | @@ -0,0 +1,53 @@ |
440 | +From: Carlos Maddela <e7appew@gmail.com> |
441 | +Date: Sun, 21 Feb 2016 19:44:11 +1100 |
442 | +Subject: Fix MusePack conversion |
443 | + |
444 | +Description: Fix MusePack conversion |
445 | +Author: Carlos Maddela <e7appew@gmail.com> |
446 | +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/audio-convert/+bug/545544 |
447 | +Last-Update: 2016-02-21 |
448 | +--- |
449 | +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ |
450 | +--- |
451 | + audio-convert | 8 ++++---- |
452 | + 1 file changed, 4 insertions(+), 4 deletions(-) |
453 | + |
454 | +diff --git a/audio-convert b/audio-convert |
455 | +index 1cb11bc..c8c299a 100755 |
456 | +--- a/audio-convert |
457 | ++++ b/audio-convert |
458 | +@@ -473,7 +473,7 @@ ogg_encode () |
459 | + |
460 | + mpc_encode () |
461 | + { |
462 | +- mppenc --$quality "$2" "$3" 2>&1 | awk -vRS='\r' '!/^$/{if (NR>5) print $1; fflush();}' | zenity --progress --title="$title" --text="$conversion $1" --auto-close |
463 | ++ mpcenc --$quality "$2" "$3" 2>&1 | awk -vRS='\r' '!/^$/{if (NR>5) print $1; fflush();}' | zenity --progress --title="$title" --text="$conversion $1" --auto-close |
464 | + } |
465 | + |
466 | + flac_encode () |
467 | +@@ -512,7 +512,7 @@ ogg_decode () |
468 | + mpc_decode () |
469 | + { |
470 | + temp_file=`echo "$1" | sed 's/\.\w*$/'.wav'/'` |
471 | +- 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 |
472 | ++ 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 |
473 | + } |
474 | + |
475 | + flac_decode () |
476 | +@@ -1211,14 +1211,14 @@ else # if we don't have vorbis-tools, check if the file to convert is an ogg |
477 | + exit 1 |
478 | + fi |
479 | + fi |
480 | +-if which mppenc 2>/dev/null |
481 | ++if which mpcenc 2>/dev/null |
482 | + then |
483 | + if !(is_mpc "$1") # if we have musepack-tools, and the file to convert is not |
484 | + then # an mpc, add mpc to the list of formats to convert to |
485 | + depformat="$depformat mpc" |
486 | + fi |
487 | + fi |
488 | +-if !(which mppdec 2>/dev/null) |
489 | ++if !(which mpcdec 2>/dev/null) |
490 | + then # if we don't have musepack-tools, check if the file to convert is an mpc |
491 | + if (is_mpc "$1") |
492 | + then |
493 | |
494 | === added file 'debian/patches/04_fix_id3_transfer.patch' |
495 | --- debian/patches/04_fix_id3_transfer.patch 1970-01-01 00:00:00 +0000 |
496 | +++ debian/patches/04_fix_id3_transfer.patch 2016-05-31 23:18:55 +0000 |
497 | @@ -0,0 +1,122 @@ |
498 | +From: Carlos Maddela <e7appew@gmail.com> |
499 | +Date: Mon, 22 Feb 2016 04:38:52 +1100 |
500 | +Subject: Fix transfer of ID3 tags |
501 | + |
502 | +Description: Fix transfer of ID3 tags |
503 | + Use id3v2 instead of id3info/id3tag since it properly handles character |
504 | + encoding. |
505 | +Author: Carlos Maddela <e7appew@gmail.com> |
506 | +Origin: vendor |
507 | +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/audio-convert/+bug/180451 |
508 | +Last-Update: 2016-02-22 |
509 | +--- |
510 | +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ |
511 | +--- |
512 | + audio-convert | 28 ++++++++++++++-------------- |
513 | + 1 file changed, 14 insertions(+), 14 deletions(-) |
514 | + |
515 | +diff --git a/audio-convert b/audio-convert |
516 | +index c8c299a..dfa3b27 100755 |
517 | +--- a/audio-convert |
518 | ++++ b/audio-convert |
519 | +@@ -33,7 +33,7 @@ |
520 | + # mplayer -- if you want to decode wma files |
521 | + # lame |
522 | + # vorbis tools |
523 | +-# id3tag |
524 | ++# id3v2 |
525 | + # musepack-tools |
526 | + # flac |
527 | + # mac |
528 | +@@ -304,10 +304,10 @@ get_metatags () |
529 | + { |
530 | + if (is_mp3 "$1") |
531 | + then |
532 | +- artist_name=`id3info "$1" | awk '/TPE1/ { print substr($0, match($0, /:/) + 2 ) }'` |
533 | +- album_name=`id3info "$1" | awk '/TALB/ { print substr($0, match($0, /:/) + 2 ) }'` |
534 | +- song_name=`id3info "$1" | awk '/TIT2/ { print substr($0, match($0, /:/) + 2 ) }'` |
535 | +- track_number=`id3info "$1" | awk '/TRCK/ { print substr($0, match($0, /:/) + 2 ) }'` |
536 | ++ artist_name=`id3v2 -l "$1" | awk '/TPE1/ { print substr($0, match($0, /:/) + 2 ) }'` |
537 | ++ album_name=`id3v2 -l "$1" | awk '/TALB/ { print substr($0, match($0, /:/) + 2 ) }'` |
538 | ++ song_name=`id3v2 -l "$1" | awk '/TIT2/ { print substr($0, match($0, /:/) + 2 ) }'` |
539 | ++ track_number=`id3v2 -l "$1" | awk '/TRCK/ { print substr($0, match($0, /:/) + 2 ) }'` |
540 | + fi |
541 | + if (is_ogg "$1") |
542 | + then |
543 | +@@ -344,11 +344,11 @@ mp3_parse_fields () |
544 | + fi |
545 | + if [ "$song_name" ] |
546 | + then |
547 | +- mp3_fields=("${mp3_fields[@]}" -s"$song_name") |
548 | ++ mp3_fields=("${mp3_fields[@]}" -t"$song_name") |
549 | + fi |
550 | + if [ "$track_number" ] |
551 | + then |
552 | +- mp3_fields=("${mp3_fields[@]}" -t"$track_number") |
553 | ++ mp3_fields=("${mp3_fields[@]}" -T"$track_number") |
554 | + fi |
555 | + } |
556 | + |
557 | +@@ -716,7 +716,7 @@ caf () # fonction "convert audio file" |
558 | + if [ $pass_metatags -eq 0 ] || [ $fields -eq 0 ] |
559 | + then |
560 | + mp3_parse_fields |
561 | +- id3tag "${mp3_fields[@]}" "$2" |
562 | ++ id3v2 "${mp3_fields[@]}" "$2" |
563 | + fi |
564 | + rm -f "$temp_file" |
565 | + break |
566 | +@@ -781,7 +781,7 @@ caf () # fonction "convert audio file" |
567 | + then |
568 | + get_field_names "$1" |
569 | + mp3_parse_fields |
570 | +- id3tag "${mp3_fields[@]}" "$2" |
571 | ++ id3v2 "${mp3_fields[@]}" "$2" |
572 | + break |
573 | + fi |
574 | + mpc_decode "$1" "$decoding" |
575 | +@@ -853,7 +853,7 @@ caf () # fonction "convert audio file" |
576 | + if [ $pass_metatags -eq 0 ] || [ $fields -eq 0 ] |
577 | + then |
578 | + mp3_parse_fields |
579 | +- id3tag "${mp3_fields[@]}" "$2" |
580 | ++ id3v2 "${mp3_fields[@]}" "$2" |
581 | + fi |
582 | + rm -f "$temp_file" |
583 | + break |
584 | +@@ -917,7 +917,7 @@ caf () # fonction "convert audio file" |
585 | + then |
586 | + get_field_names "$1" |
587 | + mp3_parse_fields |
588 | +- id3tag "${mp3_fields[@]}" "$2" |
589 | ++ id3v2 "${mp3_fields[@]}" "$2" |
590 | + break |
591 | + fi |
592 | + mac_decode "$1" "$decoding" |
593 | +@@ -989,7 +989,7 @@ caf () # fonction "convert audio file" |
594 | + if [ $pass_metatags -eq 0 ] || [ $fields -eq 0 ] |
595 | + then |
596 | + mp3_parse_fields |
597 | +- id3tag "${mp3_fields[@]}" "$2" |
598 | ++ id3v2 "${mp3_fields[@]}" "$2" |
599 | + fi |
600 | + rm -f "$temp_file" |
601 | + break |
602 | +@@ -1053,7 +1053,7 @@ caf () # fonction "convert audio file" |
603 | + then |
604 | + get_field_names "$1" |
605 | + mp3_parse_fields |
606 | +- id3tag "${mp3_fields[@]}" "$2" |
607 | ++ id3v2 "${mp3_fields[@]}" "$2" |
608 | + break |
609 | + fi |
610 | + break |
611 | +@@ -1106,7 +1106,7 @@ caf () # fonction "convert audio file" |
612 | + then |
613 | + get_field_names "$1" |
614 | + mp3_parse_fields |
615 | +- id3tag "${mp3_fields[@]}" "$2" |
616 | ++ id3v2 "${mp3_fields[@]}" "$2" |
617 | + break |
618 | + fi |
619 | + rm -f "$temp_file" |
620 | |
621 | === added file 'debian/patches/series' |
622 | --- debian/patches/series 1970-01-01 00:00:00 +0000 |
623 | +++ debian/patches/series 2016-05-31 23:18:55 +0000 |
624 | @@ -0,0 +1,4 @@ |
625 | +01_fix_unicode.patch |
626 | +02_fix_monkey_audio_detection.patch |
627 | +03_fix_musepack_conv.patch |
628 | +04_fix_id3_transfer.patch |
629 | |
630 | === removed file 'debian/postinst' |
631 | --- debian/postinst 2010-04-07 14:45:33 +0000 |
632 | +++ debian/postinst 1970-01-01 00:00:00 +0000 |
633 | @@ -1,38 +0,0 @@ |
634 | -#!/bin/sh |
635 | -# postinst script for audio-convert |
636 | -# |
637 | -# see: dh_installdeb(1) |
638 | - |
639 | -set -e |
640 | - |
641 | -# summary of how this script can be called: |
642 | -# * <postinst> `configure' <most-recently-configured-version> |
643 | -# * <old-postinst> `abort-upgrade' <new version> |
644 | -# * <conflictor's-postinst> `abort-remove' `in-favour' <package> |
645 | -# <new-version> |
646 | -# * <postinst> `abort-remove' |
647 | -# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' |
648 | -# <failed-install-package> <version> `removing' |
649 | -# <conflicting-package> <version> |
650 | -# for details, see http://www.debian.org/doc/debian-policy/ or |
651 | -# the debian-policy package |
652 | - |
653 | - |
654 | -case "$1" in |
655 | - configure|abort-upgrade|abort-remove|abort-deconfigure) |
656 | - ;; |
657 | - |
658 | - *) |
659 | - echo "postinst called with unknown argument \`$1'" >&2 |
660 | - exit 1 |
661 | - ;; |
662 | -esac |
663 | - |
664 | -# dh_installdeb will replace this with shell code automatically |
665 | -# generated by other debhelper scripts. |
666 | - |
667 | -#DEBHELPER# |
668 | - |
669 | -exit 0 |
670 | - |
671 | - |
672 | |
673 | === removed file 'debian/prerm' |
674 | --- debian/prerm 2010-04-07 14:45:33 +0000 |
675 | +++ debian/prerm 1970-01-01 00:00:00 +0000 |
676 | @@ -1,37 +0,0 @@ |
677 | -#!/bin/sh |
678 | -# prerm script for #PACKAGE# |
679 | -# |
680 | -# see: dh_installdeb(1) |
681 | - |
682 | -set -e |
683 | - |
684 | -# summary of how this script can be called: |
685 | -# * <prerm> `remove' |
686 | -# * <old-prerm> `upgrade' <new-version> |
687 | -# * <new-prerm> `failed-upgrade' <old-version> |
688 | -# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version> |
689 | -# * <deconfigured's-prerm> `deconfigure' `in-favour' |
690 | -# <package-being-installed> <version> `removing' |
691 | -# <conflicting-package> <version> |
692 | -# for details, see http://www.debian.org/doc/debian-policy/ or |
693 | -# the debian-policy package |
694 | - |
695 | - |
696 | -case "$1" in |
697 | - remove|upgrade|deconfigure|failed-upgrade) |
698 | - ;; |
699 | - |
700 | - *) |
701 | - echo "prerm called with unknown argument \`$1'" >&2 |
702 | - exit 1 |
703 | - ;; |
704 | -esac |
705 | - |
706 | -# dh_installdeb will replace this with shell code automatically |
707 | -# generated by other debhelper scripts. |
708 | - |
709 | -#DEBHELPER# |
710 | - |
711 | -exit 0 |
712 | - |
713 | - |
714 | |
715 | === modified file 'debian/rules' |
716 | --- debian/rules 2007-12-17 12:48:54 +0000 |
717 | +++ debian/rules 2016-05-31 23:18:55 +0000 |
718 | @@ -1,9 +1,35 @@ |
719 | #!/usr/bin/make -f |
720 | - |
721 | -include /usr/share/cdbs/1/rules/debhelper.mk |
722 | -include /usr/share/cdbs/1/rules/simple-patchsys.mk |
723 | - |
724 | -DEB_INSTALL_CHANGELOGS_ALL := ChangeLog |
725 | - |
726 | -install/nautilus-script-audio-convert:: |
727 | - install -D -T audio-convert "debian/nautilus-script-audio-convert/usr/share/nautilus-scripts/ConvertAudioFile" |
728 | +# See debhelper(7) (uncomment to enable) |
729 | +# output every command that modifies files on the build system. |
730 | +#export DH_VERBOSE = 1 |
731 | + |
732 | +# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/* |
733 | +DPKG_EXPORT_BUILDFLAGS = 1 |
734 | +include /usr/share/dpkg/default.mk |
735 | + |
736 | +# see FEATURE AREAS in dpkg-buildflags(1) |
737 | +#export DEB_BUILD_MAINT_OPTIONS = hardening=+all |
738 | + |
739 | +# see ENVIRONMENT in dpkg-buildflags(1) |
740 | +# package maintainers to append CFLAGS |
741 | +#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic |
742 | +# package maintainers to append LDFLAGS |
743 | +#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed |
744 | + |
745 | + |
746 | +# main packaging script based on dh7 syntax |
747 | +%: |
748 | + dh $@ |
749 | + |
750 | +override_dh_installchangelogs: |
751 | + dh_installchangelogs ChangeLog |
752 | + |
753 | +# dh_make generated override targets |
754 | +# This is example for Cmake (See https://bugs.debian.org/641051 ) |
755 | +#override_dh_auto_configure: |
756 | +# dh_auto_configure -- \ |
757 | +# -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) |
758 | + |
759 | + |
760 | + |
761 | + |
762 | |
763 | === added directory 'debian/source' |
764 | === added file 'debian/source/format' |
765 | --- debian/source/format 1970-01-01 00:00:00 +0000 |
766 | +++ debian/source/format 2016-05-31 23:18:55 +0000 |
767 | @@ -0,0 +1,1 @@ |
768 | +3.0 (quilt) |
769 | |
770 | === modified file 'debian/watch' |
771 | --- debian/watch 2007-12-17 12:48:54 +0000 |
772 | +++ debian/watch 2016-05-31 23:18:55 +0000 |
773 | @@ -1,2 +1,2 @@ |
774 | version=3 |
775 | -http://freshmeat.net/projects/audio-convert (?:.*/)?audio-convert-?_?([\d+\.]+|\d+)\.tar.* debian uupdate |
776 | +http://download.savannah.gnu.org/releases/audio-convert (?:.*/)?audio-convert-?_?([\d+\.]+|\d+)\.tar.* debian uupdate |
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!