relaxed library dependancies

CVS patchset: 709
CVS date: 2001/09/30 19:00:20

3 files changed, 40 insertions, 14 deletions

diff --git a/debian/control b/debian/control
index 16a651512..8ac95d288 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,13 @@ Source: xine-lib
 Section: libs
 Priority: optional
 Maintainer: Siggi Langauf <siggi@debian.org>
-Build-Depends: debhelper (>> 2.0.0), aalib1-dev (>= 1.4p5-2), libasound1-dev (0.5.10-1), xlibs-dev (>> 4.1), libesd0-dev, zlib1g-dev (>= 1:1.1.3), libarts-dev (>=4:2.2.0-final-3)
+Build-Depends: debhelper (>> 2.0.0), aalib1-dev (>= 1.4p5-2), libasound1-dev (0.5.10-1), xlibs-dev (>> 4.1), libesd0-dev, libz-dev, libarts-dev (>=4:2.2.0-final-3)
 Standards-Version: 3.2.1
 
 Package: libxine-dev
 Architecture: any
 Section: devel
-Depends: libxine0 (= ${Source-Version}), libc6-dev
+Depends: libxine0 (= ${Source-Version}), libc6-dev, xlibs-dev
 Conflicts: xine-ui (<< 0.9.1)
 Description: the xine video player library, development packages
  This contains development files (headers, documentation and the like)
@@ -24,6 +24,8 @@ Description: the xine video player library, development packages
 Package: libxine0
 Architecture: any
 Depends: ${shlibs:Depends}
+Recommends: ${shlibs:Recommends}
+Suggests: ${shlibs:Suggests}
 Conflicts: xine (<< 0.5.0), xine-dvd (<< 0.5.0), xine-dvd-css (<< 0.5.0)
 Replaces: xine-dvd
 Description: the xine video player library, binary files
diff --git a/debian/rules b/debian/rules
index 3edf34d4f..848787aa5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,16 +21,13 @@ major=`ls src/xine-engine/.libs/libxine*.so.* | \
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	# Add here commands to configure the package.
 	./configure --prefix=/usr --mandir=\$${prefix}/share/man
-
 	touch configure-stamp
 
 build: configure-stamp build-stamp
 build-stamp:
 	dh_testdir
 
-	# Add here commands to compile the package.
 	$(MAKE)
 
 	touch build-stamp
@@ -39,10 +36,7 @@ clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
-
+	test -f Makefile && $(MAKE) distclean
 	dh_clean
 
 install: build
@@ -51,17 +45,15 @@ install: build
 	dh_clean -k
 	dh_installdirs
 
-	# Add here commands to install the package into debian/xine-lib.
 	$(MAKE) install prefix=$(CURDIR)/debian/libxine-dev/usr
 	mkdir -p $(CURDIR)/debian/libxine$(major)/usr/share/lintian/overrides
 	cp $(CURDIR)/debian/overrides.libxine \
            $(CURDIR)/debian/libxine$(major)/usr/share/lintian/overrides/libxine$(major)
 
-# Build architecture-independent files here.
 binary-indep: build install
-# We have nothing to do by default.
+# We have nothing architecture-independant to do.
+
 
-# Build architecture-dependent files here.
 binary-arch: build install
 	dh_testversion 2
 	dh_testdir
@@ -86,7 +78,8 @@ binary-arch: build install
 	dh_fixperms
 	dh_makeshlibs
 	dh_installdeb
-	dh_shlibdeps
+#	dh_shlibdeps
+	debian/shlibdeps.sh libxine${major}
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
diff --git a/debian/shlibdeps.sh b/debian/shlibdeps.sh
new file mode 100755
index 000000000..ddc8c1012
--- /dev/null
+++ b/debian/shlibdeps.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+# shlibdeps.sh - script to calculate depends/recommends/suggests for shlibs
+#
+# usage: debian/shlibdeps.sh <packagename>
+#
+# (C) 2001 Siggi Langauf <siggi@debian.org>
+
+installdir=debian/$1
+
+OPTIONAL="$installdir/usr/lib/xine/plugins/xineplug_ao_out_alsa05.so
+	  $installdir/usr/lib/xine/plugins/xineplug_ao_out_arts.so
+	  $installdir/usr/lib/xine/plugins/xineplug_ao_out_esd.so
+	  $installdir/usr/lib/xine/plugins/xineplug_ao_out_oss.so
+	  $installdir/usr/lib/xine/plugins/xineplug_vo_out_aa.so
+	  $installdir/usr/lib/xine/plugins/xineplug_vo_out_syncfb.so
+	  $installdir/usr/lib/xine/plugins/xineplug_vo_out_xv.so"
+
+RECOMMENDED="$installdir/usr/lib/xine/plugins/xineplug_vo_out_aa.so"
+
+#start with all executables and shared objects
+REQUIRED=`find $installdir -type f \( -name \*.so -o -perm +111 \)`
+
+
+#remove all OPTIONAL or RECOMMENDED stuff
+for file in `echo $OPTIONAL $RECOMMENDED`; do
+    REQUIRED=`echo "$REQUIRED" | grep -v $file`
+done
+
+dpkg-shlibdeps -Tdebian/$1.substvars \
+               $REQUIRED -dRecommends $RECOMMENDED -dSuggests $OPTIONAL