[SCM] mhWaveEdit packaging branch, master, updated. debian/1.4.18-1-6-gfe606ee

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit fe606ee223f5afc4e16a8b3d545196a311ae7689
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jun 28 13:30:50 2010 +0200

    Split mhwaveedit in two packages.

diff --git a/debian/control b/debian/control
index a6cb61d..1a93144 100644
--- a/debian/control
+++ b/debian/control
@@ -14,19 +14,48 @@ Build-Depends: debhelper (>= 7.0.50~),
  libsamplerate0-dev,
  libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  ladspa-sdk
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 DM-Upload-Allowed: yes
 Homepage: http://gna.org/projects/mhwaveedit/
 Vcs-Git: git://git.debian.org/git/pkg-multimedia/mhwaveedit.git
 Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/mhwaveedit.git
 
 Package: mhwaveedit
+Architecture: all
+Depends: mhwaveedit-pulse | mhwaveedit-jack,
+ ${misc:Depends}
+Description: Simple and fast GTK2 sound editor (dummy package)
+ mhWaveEdit is a graphical program for editing sound files. It is
+ intended to be user-friendly and robust. It does not require
+ a fast computer.
+ .
+ This dummy package is provided for a smooth transition.
+ It may be safely removed after installation.
+
+Package: mhwaveedit-pulse
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Simple and fast GTK2 sound editor
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Replaces: mhwaveedit (<= 1.4.18-1)
+Conflicts: mhwaveedit-jack
+Provides: mhwaveedit
+Description: Simple and fast GTK2 sound editor (with PulseAudio support)
  mhWaveEdit is a graphical program for editing sound files. It is
  intended to be user-friendly and robust. It does not require
  a fast computer.
  .
- Supports JACK, ALSA, OSS and PulseAudio.
+ This version supports ALSA, OSS and PulseAudio.
 
+Package: mhwaveedit-jack
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Replaces: mhwaveedit (<= 1.4.18-1)
+Conflicts: mhwaveedit-pulse
+Provides: mhwaveedit
+Description: Simple and fast GTK2 sound editor (with JACK support)
+ mhWaveEdit is a graphical program for editing sound files. It is
+ intended to be user-friendly and robust. It does not require
+ a fast computer.
+ .
+ This version supports ALSA, OSS and JACK.
diff --git a/debian/menu b/debian/menu
deleted file mode 100644
index ca24944..0000000
--- a/debian/menu
+++ /dev/null
@@ -1,3 +0,0 @@
-?package(mhwaveedit):needs="X11" section="Applications/Sound" \
-  icon="/usr/share/pixmaps/mhwaveedit.xpm" \
-  title="mhWaveEdit" command="/usr/bin/mhwaveedit"
diff --git a/debian/mhwaveedit-jack.dirs b/debian/mhwaveedit-jack.dirs
new file mode 100644
index 0000000..e69de29
diff --git a/debian/mhwaveedit-jack.menu b/debian/mhwaveedit-jack.menu
new file mode 100644
index 0000000..b6dc0cc
--- /dev/null
+++ b/debian/mhwaveedit-jack.menu
@@ -0,0 +1,6 @@
+?package(mhwaveedit-jack):needs="X11"\
+ section="Applications/Sound"\
+ description="Sound editor (JACK)"\
+ icon="/usr/share/pixmaps/mhwaveedit.xpm"\
+ title="mhWaveEdit"\
+ command="/usr/bin/mhwaveedit"
diff --git a/debian/dirs b/debian/mhwaveedit-pulse.dirs
similarity index 100%
rename from debian/dirs
rename to debian/mhwaveedit-pulse.dirs
diff --git a/debian/mhwaveedit-pulse.menu b/debian/mhwaveedit-pulse.menu
new file mode 100644
index 0000000..51d0965
--- /dev/null
+++ b/debian/mhwaveedit-pulse.menu
@@ -0,0 +1,6 @@
+?package(mhwaveedit-pulse):needs="X11"\
+ section="Applications/Sound"\
+ description="Sound editor (PulseAudio)"\
+ icon="/usr/share/pixmaps/mhwaveedit.xpm"\
+ title="mhWaveEdit"\
+ command="/usr/bin/mhwaveedit"
diff --git a/debian/patches/01-kfreebsd_ftbfs.patch b/debian/patches/01-kfreebsd_ftbfs.patch
index a404568..9c8234e 100644
--- a/debian/patches/01-kfreebsd_ftbfs.patch
+++ b/debian/patches/01-kfreebsd_ftbfs.patch
@@ -1,3 +1,6 @@
+Author: Alessio Treglia <alessio at debian.org>
+Description: Fix FTBFS on kfreebsd architectures.
+Forwarded: no
 ---
  src/sound-pulse.c |    4 ++++
  1 file changed, 4 insertions(+)
diff --git a/debian/rules b/debian/rules
index 8254e8e..3f972bf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,11 +2,21 @@
 
 LDFLAGS+=-Wl,--as-needed
 
+CONFIGURE_FLAGS=--without-portaudio --without-sdl --without-arts --prefix=/usr
+
 %:
 	dh --with autotools_dev $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- \
-		--without-portaudio \
-		--without-sdl \
-		--without-arts
+override_dh_auto_build:
+override_dh_auto_install:
+	# Build with PulseAudio support only
+	./configure $(CONFIGURE_FLAGS) --without-jack
+	$(MAKE)
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/mhwaveedit-pulse
+	$(MAKE) distclean
+	# Build with JACK support only
+	./configure $(CONFIGURE_FLAGS) --without-pulse
+	$(MAKE)
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/mhwaveedit-jack
+	$(MAKE) distclean

-- 
mhWaveEdit packaging