configure.ac, debian/: Set up correct dependencies for GStreamer.

This involves an unpleasant back-channel from the configure script to
the Debian packaging machinery to explain which GStreamer version it
chose, so that we can set the proper package names.

diff --git a/configure.ac b/configure.ac
index 306b33867ec741f1569de1bf70ca092a909c0832..1ba714483331094a0f2eebc2e15c01fcec160133 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -455,6 +455,7 @@ AH_TEMPLATE([HAVE_GSTREAMER_0_10],
 AH_TEMPLATE([HAVE_GSTREAMER_1_0],
     [Define if building against GStreamer 1.0])
 
+mdw_gstreamer_version=nil
 for i in $want_gstreamer; do
   case $i in
     0.10) v=0.10 V=0_10 ;;
@@ -466,6 +467,7 @@ for i in $want_gstreamer; do
       [have_gstreamer=$v], [have_gstreamer=no])
   case $have_gstreamer in no) continue ;; esac
   AC_DEFINE_UNQUOTED([HAVE_GSTREAMER_$V], [1])
+  mdw_gstreamer_version=$v
   break
 done
 
@@ -952,6 +954,16 @@ AC_CONFIG_FILES([Makefile
                 tests/Makefile])
 AC_OUTPUT
 
+# A hack: communicate our selection of GStreamer version back to the
+# Debian packaging machinery so that it can build the right dependencies.
+echo '### extra control substitutions for Debian' >debian/substvars.auto.new
+case $mdw_gstreamer_version in
+  nil) ;;
+  *) echo >>debian/substvars.auto.new \
+        "disorder:GstVersion=gstreamer$mdw_gstreamer_version" ;;
+esac
+mv debian/substvars.auto.new debian/substvars.auto
+
 if test $GCC = yes && test "$gcc_werror" = ''; then
   AC_MSG_WARN([building without -Werror])
 fi

diff --git a/debian/Makefile.am b/debian/Makefile.am
index 3a3bb6af64f50f4c9be3a4318683b3eccd9e0a42..7c1ccf81247bfbda6c2d694ab2aca24690adaa22 100644 (file)
--- a/debian/Makefile.am
+++ b/debian/Makefile.am
@@ -43,3 +43,5 @@ EXTRA_DIST += \
 
 EXTRA_DIST += \
        disobedience.doc-base disobedience.install disobedience.menu
+
+DISTCLEANFILES = substvars.auto substvars.auto.new

diff --git a/debian/control b/debian/control
index cc37cac940d05642adda461a2e6e8e8d7df7c695..fd78ad0637af9b935bf747f8b6183ec37a32ee69 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -57,7 +57,8 @@ Package: disorder-gstreamer
 Architecture: any
 Section: sound
 Priority: extra
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${disorder:GstVersion}-plugins-base, ${disorder:GstVersion}-plugins-good
+Recommends: ${disorder:GstVersion}-plugins-ugly
 Enhances: disorder-server
 Description: GStreamer-based audio decoder for DisOrder
  DisOrder is a software jukebox.  It can play OGG, MP3, WAV and FLAC files,

diff --git a/debian/rules b/debian/rules
index cdb6991ee5dc025fb13b5b7af98727961cd2c7b0..435f6e28b3702764e58ebd17f79e18751ce05e46 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -40,6 +40,12 @@ override_dh_installdocs:
        dh_installdocs $(addprefix -p, $(DOCLINK_PKGS)) --link-doc=disorder
        dh_installdocs $(addprefix -N, $(DOCLINK_PKGS))
 
+###--------------------------------------------------------------------------
+### Set up the proper dependencies for `disorder-gstreamer'.
+
+override_dh_gencontrol:
+       dh_gencontrol -- -Tdebian/build/debian/substvars.auto
+
 ###--------------------------------------------------------------------------
 ### And just let Debhelper do the rest of the work.