[xiph-commits] r3431 - in libfishsound/branches/1.0-stable: debian src/tests

[johnf at svn.annodex.net]

Author: johnf
Date: 2008-02-09 03:59:13 -0800 (Sat, 09 Feb 2008)
New Revision: 3431

Modified:
   libfishsound/branches/1.0-stable/debian/control
   libfishsound/branches/1.0-stable/debian/rules
   libfishsound/branches/1.0-stable/src/tests/encdec-comments.c
Log:
disable libflac as there are too many API changes across distro versions

Modified: libfishsound/branches/1.0-stable/debian/control
===================================================================
--- libfishsound/branches/1.0-stable/debian/control	2008-02-09 11:38:53 UTC (rev 3430)
+++ libfishsound/branches/1.0-stable/debian/control	2008-02-09 11:59:13 UTC (rev 3431)
@@ -2,7 +2,7 @@
 Section: unknown
 Priority: optional
 Maintainer: John Ferlito <johnf at inodes.org>
-Build-Depends: debhelper (>> 4.0.0), libspeex-dev, libvorbis-dev, libflac-dev
+Build-Depends: debhelper (>> 4.0.0), libspeex-dev, libvorbis-dev
 Standards-Version: 3.7.3
 
 Package: libfishsound1
@@ -20,7 +20,7 @@
 Package: libfishsound1-dev
 Section: libdevel
 Architecture: any
-Depends: libfishsound1 (= ${binary:Version}), libc6-dev | libc-dev, libspeex-dev, libvorbis-dev, libflac-dev
+Depends: libfishsound1 (= ${binary:Version}), libc6-dev | libc-dev, libspeex-dev, libvorbis-dev
 Provides: libfishsound-dev
 Conflicts: libfishsound-dev
 Description: simple API that wraps Xiph.Org audio codecs (development files)

Modified: libfishsound/branches/1.0-stable/debian/rules
===================================================================
--- libfishsound/branches/1.0-stable/debian/rules	2008-02-09 11:38:53 UTC (rev 3430)
+++ libfishsound/branches/1.0-stable/debian/rules	2008-02-09 11:59:13 UTC (rev 3431)
@@ -26,6 +26,7 @@
 		--prefix=/usr \
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
+		--disable-flac \
 		|| cat config.log
 
 build: build-stamp

Modified: libfishsound/branches/1.0-stable/src/tests/encdec-comments.c
===================================================================
--- libfishsound/branches/1.0-stable/src/tests/encdec-comments.c	2008-02-09 11:38:53 UTC (rev 3430)
+++ libfishsound/branches/1.0-stable/src/tests/encdec-comments.c	2008-02-09 11:59:13 UTC (rev 3431)
@@ -58,6 +58,9 @@
 {
   const FishSoundComment * comment;
 
+  if (fsound == NULL)
+    FAIL ("No Fish Found");
+
   INFO ("+ Retrieving first (expect ARTIST1)");
   comment = fish_sound_comment_first (fsound);