[SCM] mhWaveEdit packaging branch, master, updated. debian/1.4.18-2-4-gb94cebf

Thu Jul 1 20:17:55 UTC 2010

The following commit has been merged in the master branch:
commit b94cebfba5d284941e19302c11ea2da10e2e4eb3
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Jul 1 22:17:48 2010 +0200

    Drop all my previous changes.

diff --git a/debian/changelog b/debian/changelog
index b8fdf8c..6d5c2ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,18 +1,3 @@
-mhwaveedit (1.4.18-2) unstable; urgency=low
-
-  * Drop the wrapper, it seems unnecessary since 1.4.14 (LP: #187552).
-  * Remove /usr/lib/mhwaveedit path since the wrapper was the only file
-    under that.
-  * Add .gitignore file.
-  * Add patch to fix FTBFS on kfreebsd architectures.
-  * Update debian/copyright.
-  * Split mhwaveedit in two packages:
-    - mhwaveedit-pulse, which provides PulseAudio support.
-    - mhwaveedit-jack, which provides JACK support.
-    - mhwaveedit is now a dummy transitional package.
-
- -- Alessio Treglia <alessio at debian.org>  Mon, 28 Jun 2010 14:00:06 +0200
-
 mhwaveedit (1.4.18-1) unstable; urgency=low
 
   [ Adrian Knoth ]
diff --git a/debian/control b/debian/control
index ce1c044..a6cb61d 100644
--- a/debian/control
+++ b/debian/control
@@ -14,63 +14,19 @@ Build-Depends: debhelper (>= 7.0.50~),
  libsamplerate0-dev,
  libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  ladspa-sdk
-Standards-Version: 3.9.0
+Standards-Version: 3.8.4
 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},
- mhwaveedit-data,
- ${misc:Depends}
-Replaces: mhwaveedit (<= 1.4.18-1)
-Conflicts: mhwaveedit-jack
-Provides: mhwaveedit
-Description: Simple and fast GTK2 sound editor (with PulseAudio support)
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Simple and fast GTK2 sound editor
  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 PulseAudio.
+ Supports JACK, ALSA, OSS and PulseAudio.
 
-Package: mhwaveedit-jack
-Architecture: any
-Depends: ${shlibs:Depends},
- mhwaveedit-data,
- ${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.
-
-Package: mhwaveedit-data
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: mhwaveedit (<= 1.4.18-1),
- mhwaveedit-pulse (= 1.4.18-1),
- mhwaveedit-jack (= 1.4.18-1)
-Description: Simple and fast GTK2 sound editor (data files)
- 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 package provides architectures independent files of mhWaveEdit.
diff --git a/debian/copyright b/debian/copyright
index 5cbf95c..03c9424 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,7 +8,6 @@ License: GPL-2+
 
 Files: ./debian/*
 Copyright:
- 2010, Alessio Treglia <alessio at debian.org>
  2005-2009, Free Ekanayaka <free at agnula.org>
  2009, Adrian Knoth <adi at drcomp.erfurt.thur.de>
 License: GPL-2+
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 0000000..0c89f44
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1,3 @@
+usr/bin
+usr/share/pixmaps
+usr/lib/mhwaveedit
diff --git a/debian/mhwaveedit-data.docs b/debian/docs
similarity index 100%
rename from debian/mhwaveedit-data.docs
rename to debian/docs
diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..07676ea
--- /dev/null
+++ b/debian/install
@@ -0,0 +1 @@
+debian/mhwaveedit.wrapper usr/bin
diff --git a/debian/menu b/debian/menu
new file mode 100644
index 0000000..ca24944
--- /dev/null
+++ b/debian/menu
@@ -0,0 +1,3 @@
+?package(mhwaveedit):needs="X11" section="Applications/Sound" \
+  icon="/usr/share/pixmaps/mhwaveedit.xpm" \
+  title="mhWaveEdit" command="/usr/bin/mhwaveedit"
diff --git a/debian/mhwaveedit-data.install b/debian/mhwaveedit-data.install
deleted file mode 100644
index 944abb4..0000000
--- a/debian/mhwaveedit-data.install
+++ /dev/null
@@ -1 +0,0 @@
-share/pixmaps/mhwaveedit.xpm usr/share/pixmaps
diff --git a/debian/mhwaveedit-jack.desktop b/debian/mhwaveedit-jack.desktop
deleted file mode 100644
index ef623a3..0000000
--- a/debian/mhwaveedit-jack.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=mhWaveEdit (JACK)
-GenericName=Sound file editor
-Comment=Record, play, edit and convert sound files
-Icon=mhwaveedit.xpm
-Exec=mhwaveedit-jack
-Terminal=false
-Categories=AudioVideo;Audio;AudioVideoEditing;Recorder;
diff --git a/debian/mhwaveedit-jack.install b/debian/mhwaveedit-jack.install
deleted file mode 100644
index 6ab2d1e..0000000
--- a/debian/mhwaveedit-jack.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/mhwaveedit-jack.desktop usr/share/applications
diff --git a/debian/mhwaveedit-jack.menu b/debian/mhwaveedit-jack.menu
deleted file mode 100644
index b6dc0cc..0000000
--- a/debian/mhwaveedit-jack.menu
+++ /dev/null
@@ -1,6 +0,0 @@
-?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/mhwaveedit-pulse.desktop b/debian/mhwaveedit-pulse.desktop
deleted file mode 100644
index 6b6b565..0000000
--- a/debian/mhwaveedit-pulse.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=mhWaveEdit (PulseAudio)
-GenericName=Sound file editor
-Comment=Record, play, edit and convert sound files
-Icon=mhwaveedit.xpm
-Exec=mhwaveedit-pulse
-Terminal=false
-Categories=AudioVideo;Audio;AudioVideoEditing;Recorder;
diff --git a/debian/mhwaveedit-pulse.install b/debian/mhwaveedit-pulse.install
deleted file mode 100644
index f9b3634..0000000
--- a/debian/mhwaveedit-pulse.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/mhwaveedit-pulse.desktop usr/share/applications
diff --git a/debian/mhwaveedit-pulse.menu b/debian/mhwaveedit-pulse.menu
deleted file mode 100644
index 51d0965..0000000
--- a/debian/mhwaveedit-pulse.menu
+++ /dev/null
@@ -1,6 +0,0 @@
-?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/share/applications/mhwaveedit.desktop b/debian/mhwaveedit.desktop
similarity index 59%
copy from share/applications/mhwaveedit.desktop
copy to debian/mhwaveedit.desktop
index 3126f47..1ee8b85 100644
--- a/share/applications/mhwaveedit.desktop
+++ b/debian/mhwaveedit.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Type=Application
 Name=mhWaveEdit
-GenericName=Sound file editor
-Comment=Record, play, edit and convert sound files
+GenericName=
+Comment=
 Icon=mhwaveedit.xpm
-Exec=mhwaveedit
+Exec=/usr/bin/mhwaveedit
 Terminal=false
 Categories=AudioVideo;Audio;AudioVideoEditing;Recorder;
diff --git a/debian/rules b/debian/rules
index e69bb60..b0b3343 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,28 +2,17 @@
 
 LDFLAGS+=-Wl,--as-needed
 
-CONFIGURE_FLAGS=--without-portaudio --without-sdl --without-arts --prefix=/usr
-
 %:
 	dh --with autotools_dev $@
 
 override_dh_auto_configure:
-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
-	for i in pulse jack; do \
-		cd $(CURDIR)/debian/mhwaveedit-$(i)/ && \
-		rm \
-			usr/share/applications/mhwaveedit.desktop \
-			usr/share/pixmaps/mhwaveedit.xpm && \
-		mv usr/bin/mhwaveedit usr/bin/mhwaveedit-$(i)
-	done
+	dh_auto_configure -- \
+		--without-portaudio \
+		--without-sdl \
+		--without-arts
+
+override_dh_install:
+	dh_install
+	cd $(CURDIR)/debian/mhwaveedit/usr/ && \
+		mv bin/mhwaveedit lib/mhwaveedit/mhwaveedit.real && \
+		mv bin/mhwaveedit.wrapper bin/mhwaveedit

-- 
mhWaveEdit packaging

