[Demudi-commits] r1321 - in audacity/trunk/debian: . patches

[Joost Damad]

Author: andete-guest
Date: 2007-05-12 07:41:18 +0000 (Sat, 12 May 2007)
New Revision: 1321

Added:
   audacity/trunk/debian/patches/libmp3lame.patch
Modified:
   audacity/trunk/debian/changelog
   audacity/trunk/debian/patches/desktop_file.patch
Log:
fix desktop_file.patch (tested); add libmp3lame.patch (tested)


Modified: audacity/trunk/debian/changelog
===================================================================
--- audacity/trunk/debian/changelog	2007-05-12 06:18:00 UTC (rev 1320)
+++ audacity/trunk/debian/changelog	2007-05-12 07:41:18 UTC (rev 1321)
@@ -9,8 +9,9 @@
   * Apply changes from #423477 (Closes: #423477)
       - transparent background for icons
       - /usr/share/audacity => /usr/share/pixmaps
+  * Look for libmp3lame.so.0 iso libmp3lame.so (Closes: #410516)
 
- -- Joost Yervante Damad <andete at debian.org>  Sat, 31 Mar 2007 09:22:17 +0200
+ -- Joost Yervante Damad <andete at debian.org>  Sat, 12 May 2007 08:58:22 +0200
 
 audacity (1.3.2-2) unstable; urgency=high
 

Modified: audacity/trunk/debian/patches/desktop_file.patch
===================================================================
--- audacity/trunk/debian/patches/desktop_file.patch	2007-05-12 06:18:00 UTC (rev 1320)
+++ audacity/trunk/debian/patches/desktop_file.patch	2007-05-12 07:41:18 UTC (rev 1321)
@@ -1,16 +1,15 @@
---- src/audacity.desktop.orig	2006-11-11 01:19:26.000000000 +0100
-+++ src/audacity.desktop	2006-11-11 01:19:47.000000000 +0100
-@@ -1,4 +1,4 @@
--[Desktop Entry]
-+[Desktop Entry]
- Encoding=UTF-8
- 
- Name=Audacity Sound Editor
-@@ -11,10 +11,10 @@
- Comment[de]=Audio-Dateien aufnehmen und bearbeiten
+--- old/src/audacity.desktop	2006-10-29 01:05:29.000000000 +0200
++++ new/src/audacity.desktop	2007-05-12 09:06:08.000000000 +0200
+@@ -8,13 +8,13 @@
+ GenericName[de]=Audio-Editor
+ GenericName[ru]=Редактор звуковых файлов
+ Comment=Record and edit audio files
+-Comment[de]=Audio-Dateien aufnehmen und bearbeiten
++Comment[de]=Audio-Dateien aufnehmen und bearbeiten
  Comment[ru]=Запись и редактирование звуковых файлов
- 
+-
 -Icon=/usr/share/audacity/audacity.xpm
++
 +Icon=audacity
  
  Type=Application
@@ -19,4 +18,3 @@
  
  Exec=audacity
  StartupNotify=false
-

Added: audacity/trunk/debian/patches/libmp3lame.patch
===================================================================
--- audacity/trunk/debian/patches/libmp3lame.patch	2007-05-12 06:18:00 UTC (rev 1320)
+++ audacity/trunk/debian/patches/libmp3lame.patch	2007-05-12 07:41:18 UTC (rev 1321)
@@ -0,0 +1,17 @@
+--- old/src/export/ExportMP3.cpp	2006-10-29 01:05:27.000000000 +0200
++++ new/src/export/ExportMP3.cpp	2007-05-12 09:32:18.000000000 +0200
+@@ -263,12 +263,12 @@
+ 
+          wxString GetLibraryName()
+          {
+-            return wxT("libmp3lame.so");
++            return wxT("libmp3lame.so.0");
+          }
+          
+          wxString GetLibraryTypeString()
+          {
+-            return wxString(_("Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"));
++            return wxString(_("Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"));
+          }
+          
+          wxString GetLibraryMessage()