[SCM] jackd-defaults packaging branch, master, updated. debian/2-1-g7f721ea

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7f721ea4df9114b09983334a551faee35503ee01
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jun 19 07:21:46 2010 +0200

    also depend on jackd1 to avoid installability problems

diff --git a/debian/changelog b/debian/changelog
index 5aa81e4..aab779c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+jackd-defaults (3) unstable; urgency=low
+
+  * also depend on jackd1 to avoid installability problems
+
+ -- Reinhard Tartler <siretart at tauware.de>  Sat, 19 Jun 2010 07:21:27 +0200
+
 jackd-defaults (2) unstable; urgency=low
 
   * reupload with higher version number
diff --git a/debian/control b/debian/control
index 2050780..f020d87 100644
--- a/debian/control
+++ b/debian/control
@@ -12,9 +12,9 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/jackd-defaults.git;a=summar
 
 Package: jackd
 Architecture: all
-Depends: jackd2,
+Depends: jackd2 | jackd1
  ${misc:Depends}
-Description: JACK Audio Connection Kit (virtual server package)
+Description: JACK Audio Connection Kit (default server package)
  JACK is a low-latency sound server, allowing multiple applications to
  connect to one audio device, and to share audio between themselves.
  .
@@ -22,9 +22,9 @@ Description: JACK Audio Connection Kit (virtual server package)
 
 Package: jackd-firewire
 Architecture: all
-Depends: jackd2-firewire,
+Depends: jackd2-firewire | jackd1-firewire
  ${misc:Depends}
-Description: JACK Audio Connection Kit (virtual server package)
+Description: JACK Audio Connection Kit (default server package)
  JACK is a low-latency sound server, allowing multiple applications to
  connect to one audio device, and to share audio between themselves.
  .

-- 
jackd-defaults packaging