[SCM] Audacity debian packaging branch, master, updated. upstream/1.3.6-39-g07382e6

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

The following commit has been merged in the master branch:
commit 07382e6f6b97c02c9845cf60ec497957f14624b8
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Tue Jan 20 14:05:04 2009 +0100

    Added an arch:all audacity-data package that contains the architecture-independent content of '/usr/share'.

diff --git a/debian/audacity.install b/debian/audacity-data.install
similarity index 87%
copy from debian/audacity.install
copy to debian/audacity-data.install
index e4ae81c..3c72677 100644
--- a/debian/audacity.install
+++ b/debian/audacity-data.install
@@ -1,3 +1,4 @@
+debian/tmp/usr/share
 debian/audacity.xpm usr/share/pixmaps
 debian/audacity16.xpm usr/share/pixmaps
 debian/gnome-mime-application-x-audacity-project.xpm usr/share/pixmaps
diff --git a/debian/audacity.install b/debian/audacity.install
index e4ae81c..451ddc0 100644
--- a/debian/audacity.install
+++ b/debian/audacity.install
@@ -1,3 +1 @@
-debian/audacity.xpm usr/share/pixmaps
-debian/audacity16.xpm usr/share/pixmaps
-debian/gnome-mime-application-x-audacity-project.xpm usr/share/pixmaps
+debian/tmp/usr/bin
diff --git a/debian/changelog b/debian/changelog
index f007968..5e2ecc9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,8 +28,10 @@ audacity (1.3.6-3) UNRELEASED; urgency=low
   * Reordered configure flags in debian/rules and renamed
     T1_DEB_CONFIGURE_EXTRA_FLAGS to the more descriptive WITH_JACK_CONFFLAG.
   * Audacity suggests libmp3lame0.
+  * Added an arch:all audacity-data package that contains the architecture-
+    independent content of '/usr/share'.
 
- -- Fabian Greffrath <fabian at debian-unofficial.org>  Tue, 20 Jan 2009 09:15:11 +0100
+ -- Fabian Greffrath <fabian at debian-unofficial.org>  Tue, 20 Jan 2009 14:00:00 +0100
 
 audacity (1.3.6-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index fbfb144..a316422 100644
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/audacity.git;a=summary
 
 Package: audacity
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: audacity-data (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
 Suggests: ladspa-plugin, libmp3lame0
 Description: A fast, cross-platform audio editor
  Audacity is a multi-track audio editor for Linux/Unix, MacOS and
@@ -44,6 +44,21 @@ Description: A fast, cross-platform audio editor
  .
  Supported file formats include Ogg Vorbis, MP2, MP3, WAV, AIFF, and AU.
 
+Package: audacity-data
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: audacity
+Conflicts: audacity (<= 1.3.6-2)
+Replaces: audacity (<= 1.3.6-2)
+Description: A fast, cross-platform audio editor (data)
+ Audacity is a multi-track audio editor for Linux/Unix, MacOS and
+ Windows.  It is designed for easy recording, playing and editing of
+ digital audio.  Audacity features digital effects and spectrum
+ analysis tools.  Editing is very fast and provides unlimited
+ undo/redo.
+ .
+ This package contains the architecture-independent data files.
+
 Package: audacity-dbg
 Section: devel
 Priority: extra
diff --git a/debian/rules b/debian/rules
index 53915da..78e7ec0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,9 +36,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := $(WITH_JACK_CONFFLAG) \
 
 DEB_COMPRESS_EXCLUDE := *.htb
 
-binary-post-install/audacity::
+binary-post-install/audacity-data::
 	# Don't package unnecessary copy of GPL
-	rm -f debian/audacity/usr/share/doc/audacity/LICENSE.txt
+	rm -f debian/audacity-data/usr/share/doc/audacity-data/LICENSE.txt
 
 clean::
 	rm -f lib-src/libpormixer.a

-- 
Audacity debian packaging