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

[Joost Damad]

Author: andete-guest
Date: 2007-05-12 06:18:00 +0000 (Sat, 12 May 2007)
New Revision: 1320

Added:
   audacity/trunk/debian/audacity.dirs
Modified:
   audacity/trunk/debian/audacity.install
   audacity/trunk/debian/audacity.menu
   audacity/trunk/debian/audacity.xpm
   audacity/trunk/debian/audacity16.xpm
   audacity/trunk/debian/changelog
   audacity/trunk/debian/patches/desktop_file.patch
Log:
add changes from #423477 (please test before release!)


Added: audacity/trunk/debian/audacity.dirs
===================================================================
--- audacity/trunk/debian/audacity.dirs	2007-05-11 18:34:20 UTC (rev 1319)
+++ audacity/trunk/debian/audacity.dirs	2007-05-12 06:18:00 UTC (rev 1320)
@@ -0,0 +1 @@
+usr/share/pixmaps

Modified: audacity/trunk/debian/audacity.install
===================================================================
--- audacity/trunk/debian/audacity.install	2007-05-11 18:34:20 UTC (rev 1319)
+++ audacity/trunk/debian/audacity.install	2007-05-12 06:18:00 UTC (rev 1320)
@@ -1,2 +1,2 @@
-debian/audacity.xpm usr/share/audacity
-debian/audacity16.xpm usr/share/audacity
+debian/audacity.xpm usr/share/pixmaps
+debian/audacity16.xpm usr/share/pixmaps

Modified: audacity/trunk/debian/audacity.menu
===================================================================
--- audacity/trunk/debian/audacity.menu	2007-05-11 18:34:20 UTC (rev 1319)
+++ audacity/trunk/debian/audacity.menu	2007-05-12 06:18:00 UTC (rev 1320)
@@ -1,5 +1,5 @@
 ?package(audacity):needs="X11" section="Apps/Sound" \
   title="Audacity" command="/usr/bin/audacity" \
-  icon="/usr/share/audacity/audacity.xpm" \
-  icon32x32="/usr/share/audacity/audacity.xpm" \
-  icon16x16="/usr/share/audacity/audacity16.xpm"
+  icon="/usr/share/pixmaps/audacity.xpm" \
+  icon32x32="/usr/share/pixmaps/audacity.xpm" \
+  icon16x16="/usr/share/pixmaps/audacity16.xpm"

Modified: audacity/trunk/debian/audacity.xpm
===================================================================
--- audacity/trunk/debian/audacity.xpm	2007-05-11 18:34:20 UTC (rev 1319)
+++ audacity/trunk/debian/audacity.xpm	2007-05-12 06:18:00 UTC (rev 1320)
@@ -1,7 +1,7 @@
 /* XPM */
 static char * audacity_xpm[] = {
 "32 32 534 2",
-"  	c #FFFFFF",
+"  	c None",
 ". 	c #FDFDFF",
 "+ 	c #F1F1FB",
 "@ 	c #D6D5F4",

Modified: audacity/trunk/debian/audacity16.xpm
===================================================================
--- audacity/trunk/debian/audacity16.xpm	2007-05-11 18:34:20 UTC (rev 1319)
+++ audacity/trunk/debian/audacity16.xpm	2007-05-12 06:18:00 UTC (rev 1320)
@@ -1,7 +1,7 @@
 /* XPM */
 static char * audacity16_xpm[] = {
 "16 16 161 2",
-"  	c #FFFFFF",
+"  	c None",
 ". 	c #E8E8F9",
 "+ 	c #9F9FE4",
 "@ 	c #7574C9",

Modified: audacity/trunk/debian/changelog
===================================================================
--- audacity/trunk/debian/changelog	2007-05-11 18:34:20 UTC (rev 1319)
+++ audacity/trunk/debian/changelog	2007-05-12 06:18:00 UTC (rev 1320)
@@ -6,6 +6,9 @@
     that enables usage of the portaudio library on the system, however it
     doesn't work, because portmixer doesn't compile against it, soo we're
     not using it yet.
+  * Apply changes from #423477 (Closes: #423477)
+      - transparent background for icons
+      - /usr/share/audacity => /usr/share/pixmaps
 
  -- Joost Yervante Damad <andete at debian.org>  Sat, 31 Mar 2007 09:22:17 +0200
 

Modified: audacity/trunk/debian/patches/desktop_file.patch
===================================================================
--- audacity/trunk/debian/patches/desktop_file.patch	2007-05-11 18:34:20 UTC (rev 1319)
+++ audacity/trunk/debian/patches/desktop_file.patch	2007-05-12 06:18:00 UTC (rev 1320)
@@ -6,3 +6,17 @@
  Encoding=UTF-8
  
  Name=Audacity Sound Editor
+@@ -11,10 +11,10 @@
+ Comment[de]=Audio-Dateien aufnehmen und bearbeiten
+ Comment[ru]=Запись и редактирование звуковых файлов
+ 
+-Icon=/usr/share/audacity/audacity.xpm
++Icon=audacity
+ 
+ Type=Application
+-Categories=Application;AudioVideo;Audio;Multimedia;
++Categories=AudioVideo;Audio;Recorder;
+ 
+ Exec=audacity
+ StartupNotify=false
+