[SCM] Audacity debian packaging branch, master, updated. debian/1.3.11-2-5-g8d35a1e

[bdrung-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4796d5fcfc61b558c3ad0e1324cf58c866a86f47
Author: Benjamin Drung <bdrung at gmail.com>
Date:   Thu Apr 1 03:06:57 2010 +0200

    Update debian/*.install files.

diff --git a/debian/audacity-data.install b/debian/audacity-data.install
index fd7d9ad..906b2d3 100644
--- a/debian/audacity-data.install
+++ b/debian/audacity-data.install
@@ -1,4 +1,6 @@
-debian/tmp/usr/share/audacity
-debian/tmp/usr/share/locale
-debian/tmp/usr/share/mime
-debian/gnome-mime-application-x-audacity-project.xpm usr/share/pixmaps
+usr/share/audacity
+usr/share/icons
+usr/share/locale
+usr/share/mime
+usr/share/pixmaps/audacity.xpm
+usr/share/pixmaps/gnome-mime-application-x-audacity-project.xpm
diff --git a/debian/audacity.install b/debian/audacity.install
index 491e3ea..0664974 100644
--- a/debian/audacity.install
+++ b/debian/audacity.install
@@ -1,9 +1,7 @@
-debian/tmp/usr/bin
-debian/tmp/usr/share/applications
-debian/tmp/usr/share/doc
-debian/tmp/usr/share/man
-debian/audacity.svg usr/share/pixmaps
-debian/audacity.xpm usr/share/pixmaps
-debian/audacity16.xpm usr/share/pixmaps
+usr/bin
+usr/share/applications
+usr/share/doc
+usr/share/man
+usr/share/pixmaps/audacity16.xpm
+usr/share/pixmaps/audacity32.xpm
 debian/source_audacity.py usr/share/apport/package-hooks
-
diff --git a/debian/audacity.menu b/debian/audacity.menu
index e12d0d2..a176180 100644
--- a/debian/audacity.menu
+++ b/debian/audacity.menu
@@ -1,5 +1,5 @@
 ?package(audacity):needs="X11" section="Applications/Sound" \
   title="Audacity" command="/usr/bin/audacity" \
-  icon="/usr/share/pixmaps/audacity.xpm" \
-  icon32x32="/usr/share/pixmaps/audacity.xpm" \
+  icon="/usr/share/pixmaps/audacity32.xpm" \
+  icon32x32="/usr/share/pixmaps/audacity32.xpm" \
   icon16x16="/usr/share/pixmaps/audacity16.xpm"

-- 
Audacity debian packaging