move backends into their own packages

diff --git a/debian/changelog b/debian/changelog
index 8062b0549434d00812544474e909488d01c34ccf..ad252c6f359f45d392cd303f52fda0a9b79244c7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+osspd (1.3.2-4) UNRELEASED; urgency=low
+
+  * Move backends into their own packages.
+  * No longer symlink docs from dbg package (this simplifies
+    packaging)
+
+ -- Ralf Jung <post@ralfj.de>  Mon, 09 Sep 2013 18:29:12 +0200
+

 osspd (1.3.2-3) unstable; urgency=low
 
   * Provide oss-compat, as we provide OSS, and conflict with it
 osspd (1.3.2-3) unstable; urgency=low
 
   * Provide oss-compat, as we provide OSS, and conflict with it

diff --git a/debian/control b/debian/control
index e600f43e931548bd4c10542190caa13d4b68c6ae..3bfc32685c3fdb415d7f1436fa389e6d2b6453a9 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,10 @@ Vcs-Git: git://ralfj.de/osspd.git
 Package: osspd
 Architecture: linux-any
 Provides: oss-compat
 Package: osspd
 Architecture: linux-any
 Provides: oss-compat

-Depends: ${misc:Depends}, ${shlibs:Depends}, lsb-base (>= 3.2-14)
+Depends: lsb-base (>= 3.2-14),
+         osspd-pulseaudio | osspd-backend,
+         ${misc:Depends},
+         ${shlibs:Depends}

 Conflicts: oss-compat
 Recommends: pulseaudio
 Description: OSS Proxy Daemon: Userland OSS emulation
 Conflicts: oss-compat
 Recommends: pulseaudio
 Description: OSS Proxy Daemon: Userland OSS emulation


@@ -24,9 +27,37 @@ Description: OSS Proxy Daemon: Userland OSS emulation
  when running foreign-architecture applications or using old libc versions for
  compatibility reasons.
 
  when running foreign-architecture applications or using old libc versions for
  compatibility reasons.
 

+Package: osspd-pulseaudio
+Architecture: linux-any
+Provides: osspd-backend
+Depends: pulseaudio, ${misc:Depends}, ${shlibs:Depends}
+Recommends: osspd
+Replaces: osspd (<< 1.3.2-4)
+Breaks: osspd (<< 1.3.2-4)
+Description: OSS Proxy Daemon: PulseAudio backend
+ OSS Proxy Daemon is a Linux userland OSS sound device (/dev/[a]dsp and
+ /dev/mixer) implementation using CUSE. Currently it supports
+ forwarding OSS sound streams to PulseAudio and ALSA.
+ .
+ This package contains the PulseAudio backend for osspd.
+
+Package: osspd-alsa
+Architecture: linux-any
+Provides: osspd-backend
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Recommends: osspd
+Replaces: osspd (<< 1.3.2-4)
+Breaks: osspd (<< 1.3.2-4)
+Description: OSS Proxy Daemon: ALSA backend (experimental)
+ OSS Proxy Daemon is a Linux userland OSS sound device (/dev/[a]dsp and
+ /dev/mixer) implementation using CUSE. Currently it supports
+ forwarding OSS sound streams to PulseAudio and ALSA.
+ .
+ This package contains the experimental ALSA backend for osspd.
+

 Package: osspd-dbg
 Architecture: linux-any
 Package: osspd-dbg
 Architecture: linux-any

-Depends: ${misc:Depends}, osspd (= ${binary:Version})
+Depends: osspd (= ${binary:Version}), ${misc:Depends}

 Section: debug
 Priority: extra
 Description: OSS Proxy Daemon: Debugging symbols
 Section: debug
 Priority: extra
 Description: OSS Proxy Daemon: Debugging symbols


@@ -34,4 +65,5 @@ Description: OSS Proxy Daemon: Debugging symbols
  /dev/mixer) implementation using CUSE. Currently it supports
  forwarding OSS sound streams to PulseAudio and ALSA.
  .
  /dev/mixer) implementation using CUSE. Currently it supports
  forwarding OSS sound streams to PulseAudio and ALSA.
  .

- This package contains the debugging symbols for the OSS Proxy Daemon.
+ This package contains the debugging symbols for the OSS Proxy Daemon and its
+ backends.

diff --git a/debian/osspd-alsa.install b/debian/osspd-alsa.install
new file mode 100644 (file)
index 0000000..8b70aa6
--- /dev/null
+++ b/debian/osspd-alsa.install
@@ -0,0 +1 @@
+usr/lib/osspd/ossp-alsap

diff --git a/debian/osspd-pulseaudio.install b/debian/osspd-pulseaudio.install
new file mode 100644 (file)
index 0000000..ccb91fa
--- /dev/null
+++ b/debian/osspd-pulseaudio.install
@@ -0,0 +1 @@
+usr/lib/osspd/ossp-padsp

diff --git a/debian/docs b/debian/osspd.docs
similarity index 100%
rename from debian/docs
rename to debian/osspd.docs

diff --git a/debian/osspd.install b/debian/osspd.install
new file mode 100644 (file)
index 0000000..788b876
--- /dev/null
+++ b/debian/osspd.install
@@ -0,0 +1,2 @@
+usr/sbin/osspd 
+lib/udev/rules.d/98-osscuse.rules

diff --git a/debian/rules b/debian/rules
index 2f99a91892cac5d406d80242eb3a747ab72ee0f9..5bb1cf5097c36402c46f1dbb3591aeaa3c5f33e7 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -10,13 +10,13 @@ override_dh_auto_build:
        dh_auto_build -- SLAVESDIR=$(SLAVESDIR) UDEVDIR=$(UDEVDIR)
 
 override_dh_auto_install:
        dh_auto_build -- SLAVESDIR=$(SLAVESDIR) UDEVDIR=$(UDEVDIR)
 
 override_dh_auto_install:

-       dh_auto_install --destdir=debian/osspd -- prefix=/usr SLAVESDIR=$(SLAVESDIR) UDEVDIR=$(UDEVDIR)
+       dh_auto_install -- prefix=/usr SLAVESDIR=$(SLAVESDIR) UDEVDIR=$(UDEVDIR)

 
 override_dh_strip:
        dh_strip --dbg-package=osspd-dbg
 
 
 override_dh_strip:
        dh_strip --dbg-package=osspd-dbg
 

-override_dh_installdocs:
-       dh_installdocs --link-doc=osspd
+override_dh_install:
+       dh_install --fail-missing

 
 # Disable tests, they require running the osspd
 override_dh_auto_test:
 
 # Disable tests, they require running the osspd
 override_dh_auto_test: