[SCM] ardour Debian packaging branch, master, updated. debian/2.8.11-1-7-gc3c7138

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6fb663ba8bb35b2de4e5de6d251e8d06d9ff0fc8
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Aug 6 22:02:35 2010 -0400

    Maintain package relations in rules file.

diff --git a/debian/control.in b/debian/control.in
index 76a5bd4..02df414 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -5,36 +5,7 @@ Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alio
 Uploaders: Adrian Knoth <adi at drcomp.erfurt.thur.de>,
  Free Ekanayaka <freee at debian.org>,
  Jonas Smedegaard <dr at jones.dk>
-Build-Depends: @cdbs@,
- scons,
- libsigc++-2.0-dev,
- libxml2-dev (>= 2.5.7),
- libasound2-dev (>= 0.9.4),
- libsndfile1-dev,
- libsamplerate0-dev,
- liblrdf0-dev (>= 0.3.1-4),
- ladspa-sdk (>= 1.1-2),
- libjack-dev,
- libgtkmm-2.4-dev,
- libglade2-dev,
- libpango1.0-dev,
- libgnomecanvasmm-2.6-dev,
- libgnomecanvas2-dev,
- libglib2.0-dev,
- libglademm-2.4-dev,
- gettext,
- intltool,
- libboost-dev,
- libsoundtouch1-dev,
- liblo-dev,
- libcairomm-1.0-dev (>= 1.2.4),
- libfftw3-dev,
- libaubio-dev,
- libslv2-dev,
- lv2core,
- libcurl4-gnutls-dev,
- vamp-plugin-sdk (>=2.1),
- libusb-dev
+Build-Depends: @cdbs@
 Standards-Version: 3.9.1
 DM-Upload-Allowed: yes
 Homepage: http://www.ardour.org/
@@ -47,14 +18,11 @@ Section: sound
 Depends: ${shlibs:Depends},
  ${python:Depends},
  ${misc:Depends},
- python,
- python-twisted,
- python-gtk2,
- jackd
-Conflicts: ardour-gtk
-Replaces: ardour-gtk
-Recommends: iceweasel | www-browser
-Suggests: jamin, qjackctl
+ ${cdbs:Depends}
+Recommends: ${cdbs:Recommends}
+Suggests: ${shlibs:Suggests}
+Conflicts: ${cdbs:Conflicts}
+Replaces: ${cdbs:Replaces}
 Description: digital audio workstation (graphical gtk2 interface)
  Ardour is a multichannel hard disk recorder (HDR) and digital audio
  workstation (DAW).  It can be used to control, record, edit and run
@@ -116,15 +84,12 @@ Section: sound
 Depends: ${shlibs:Depends},
  ${python:Depends},
  ${misc:Depends},
- python,
- python-twisted,
- python-gtk2,
- jackd
-Conflicts: ardour, ardour-gtk-altivec
-Replaces: ardour, ardour-gtk-altivec
-Provides: ardour
-Recommends: iceweasel | www-browser
-Suggests: jamin, qjackctl
+ ${cdbs:Depends}
+Recommends: ${cdbs:Recommends}
+Suggests: ${shlibs:Suggests}
+Provides: ${cdbs:Provides}
+Conflicts: ${cdbs:Conflicts}
+Replaces: ${cdbs:Replaces}
 Description: digital audio workstation (graphical gtk2 interface) [altivec]
  Ardour is a multichannel hard disk recorder (HDR) and digital audio
  workstation (DAW).  It can be used to control, record, edit and run
@@ -143,15 +108,12 @@ Section: sound
 Depends: ${shlibs:Depends},
  ${python:Depends},
  ${misc:Depends},
- python,
- python-twisted,
- python-gtk2,
- jackd
-Conflicts: ardour, ardour-gtk-i686
-Replaces: ardour, ardour-gtk-i686
-Provides: ardour
-Recommends: iceweasel | www-browser
-Suggests: jamin, qjackctl
+ ${cdbs:Depends}
+Recommends: ${cdbs:Recommends}
+Suggests: ${shlibs:Suggests}
+Provides: ${cdbs:Provides}
+Conflicts: ${cdbs:Conflicts}
+Replaces: ${cdbs:Replaces}
 Description: digital audio workstation (graphical gtk2 interface) [i686]
  Ardour is a multichannel hard disk recorder (HDR) and digital audio
  workstation (DAW).  It can be used to control, record, edit and run
diff --git a/debian/rules b/debian/rules
index 499c85d..2123aec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -117,3 +117,38 @@ scons-clean::
 
 	rm -rf debian/ardour-dbg
 	rm -f gtk2_ardour/*.mo
+
+# Needed at build time
+# (separated in build tools, core, Glib/GTK and audio dependencies)
+CDBS_BUILD_DEPENDS += , gettext, intltool, scons
+CDBS_BUILD_DEPENDS += , libboost-dev, libcurl4-gnutls-dev, libfftw3-dev, liblrdf0-dev (>= 0.3.1-4), libsigc++-2.0-dev, libusb-dev libxml2-dev (>= 2.5.7)
+CDBS_BUILD_DEPENDS += , libcairomm-1.0-dev (>= 1.2.4), libglade2-dev, libglademm-2.4-dev, libglib2.0-dev, libgnomecanvas2-dev, libgnomecanvasmm-2.6-dev, libgtkmm-2.4-dev, libpango1.0-dev
+CDBS_BUILD_DEPENDS += , ladspa-sdk (>= 1.1-2), libasound2-dev (>= 0.9.4), libaubio-dev, libjack-dev, liblo-dev, libsamplerate0-dev, libslv2-dev, libsndfile1-dev, libsoundtouch1-dev, lv2core, vamp-plugin-sdk (>=2.1)
+
+# Needed always/often/sometimes at runtime
+CDBS_DEPENDS_ALL = python, python-twisted, python-gtk2, jackd
+CDBS_RECOMMENDS_ALL = iceweasel | www-browser
+CDBS_SUGGESTS_ALL = jamin, qjackctl
+
+# Ensure only one variant is installed at a time
+CDBS_PROVIDES_ardour-altivec = ardour
+CDBS_PROVIDES_ardour-i686 = ardour
+CDBS_CONFLICTS_ardour-altivec = ardour
+CDBS_CONFLICTS_ardour-i686 = ardour
+CDBS_REPLACES_ardour-altivec = ardour
+CDBS_REPLACES_ardour-i686 = ardour
+
+# Transitional quirk: ardour-gtk renamed to ardour
+# TODO: drop after Squeeze (was introduced before Lenny)
+CDBS_CONFLICTS_ardour += , ardour-gtk
+CDBS_REPLACES_ardour += , ardour-gtk
+
+# Transitional quirk: ardour-gtk-altivec renamed to ardour-altivec
+# TODO: drop after Squeeze (was introduced before Lenny)
+CDBS_CONFLICTS_ardour-altivec += , ardour-gtk-altivec
+CDBS_REPLACES_ardour-altivec += , ardour-gtk-altivec
+
+# Transitional quirk: ardour-gtk-i686 renamed to ardour-i686
+# TODO: drop after Squeeze (was introduced before Lenny)
+CDBS_CONFLICTS_ardour-i686 += , ardour-gtk-i686
+CDBS_REPLACES_ardour-i686 += , ardour-gtk-i686

-- 
ardour Debian packaging