[Pkg-voip-commits] r5831 - in /spandsp/trunk/debian: changelog libspandsp3.install patches/00list patches/lib64.dpatch

[paravoid at alioth.debian.org]

Author: paravoid
Date: Thu Jun  5 02:32:28 2008
New Revision: 5831

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5831
Log:
Revert spandsp to 0.0.4-era, r5525

Added:
    spandsp/trunk/debian/patches/lib64.dpatch
Modified:
    spandsp/trunk/debian/changelog
    spandsp/trunk/debian/libspandsp3.install
    spandsp/trunk/debian/patches/00list

Modified: spandsp/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/spandsp/trunk/debian/changelog?rev=5831&op=diff
==============================================================================
--- spandsp/trunk/debian/changelog (original)
+++ spandsp/trunk/debian/changelog Thu Jun  5 02:32:28 2008
@@ -1,9 +1,8 @@
-spandsp (0.0.5~pre2-1) UNRELEASED; urgency=low
+spandsp (0.0.4pre18-2) UNRELEASED; urgency=low
 
-  * (NOT RELEASED YET) New upstream release
-  * libspandsp3.install spandsp/* usr/share/spandsp
+  * NOT RELEASED YET
 
- -- Mark Purcell <msp at debian.org>  Thu, 15 May 2008 21:15:04 +1000
+ -- Mark Purcell <msp at debian.org>  Thu, 10 Apr 2008 08:03:43 +1000
 
 spandsp (0.0.4pre18-1) unstable; urgency=low
 

Modified: spandsp/trunk/debian/libspandsp3.install
URL: http://svn.debian.org/wsvn/pkg-voip/spandsp/trunk/debian/libspandsp3.install?rev=5831&op=diff
==============================================================================
--- spandsp/trunk/debian/libspandsp3.install (original)
+++ spandsp/trunk/debian/libspandsp3.install Thu Jun  5 02:32:28 2008
@@ -1,3 +1,4 @@
 debian/tmp/usr/lib/libspandsp.so.0.*
 debian/tmp/usr/lib/libspandsp.so.0
-spandsp/* usr/share/spandsp
+debian/tmp/usr/share/spandsp/global-tones.xml
+debian/tmp/usr/share/spandsp/tones.dtd

Modified: spandsp/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-voip/spandsp/trunk/debian/patches/00list?rev=5831&op=diff
==============================================================================
--- spandsp/trunk/debian/patches/00list (original)
+++ spandsp/trunk/debian/patches/00list Thu Jun  5 02:32:28 2008
@@ -1,0 +1,1 @@
+lib64

Added: spandsp/trunk/debian/patches/lib64.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/spandsp/trunk/debian/patches/lib64.dpatch?rev=5831&op=file
==============================================================================
--- spandsp/trunk/debian/patches/lib64.dpatch (added)
+++ spandsp/trunk/debian/patches/lib64.dpatch Thu Jun  5 02:32:28 2008
@@ -1,0 +1,78 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## lib64.dpatch by Kilian Krause <kilian at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad spandsp-0.0.4~pre3~/configure spandsp-0.0.4~pre3/configure
+--- spandsp-0.0.4~pre3~/configure	2007-06-08 17:27:31.000000000 +0200
++++ spandsp-0.0.4~pre3/configure	2007-07-21 15:23:29.000000000 +0200
+@@ -27254,36 +27254,6 @@
+ done
+ 
+ 
+-if test "${build}" == "${host}"
+-then
+-    case "${host}" in
+-    x86_64-*)
+-        as_ac_File=`echo "ac_cv_file_${prefix}/lib64" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for ${prefix}/lib64" >&5
+-echo $ECHO_N "checking for ${prefix}/lib64... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_File+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  test "$cross_compiling" = yes &&
+-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+-   { (exit 1); exit 1; }; }
+-if test -r "${prefix}/lib64"; then
+-  eval "$as_ac_File=yes"
+-else
+-  eval "$as_ac_File=no"
+-fi
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+-if test `eval echo '${'$as_ac_File'}'` = yes; then
+-  libdir='$(exec_prefix)/lib64'
+-fi
+-
+-        ;;
+-    esac
+-fi
+-
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+diff -urNad spandsp-0.0.4~pre3~/configure.ac spandsp-0.0.4~pre3/configure.ac
+--- spandsp-0.0.4~pre3~/configure.ac	2007-05-12 14:25:37.000000000 +0200
++++ spandsp-0.0.4~pre3/configure.ac	2007-07-21 15:23:57.000000000 +0200
+@@ -219,27 +219,8 @@
+ AC_CHECK_HEADERS([FL/Fl_Audio_Meter.H], [], [], [],[[#include <FL/Fl.H>
+ ]])
+ 
+-if test "${build}" == "${host}"
+-then
+-    case "${host}" in
+-    x86_64-*)
+-        AC_CHECK_FILE([${prefix}/lib64], libdir='$(exec_prefix)/lib64')
+-        ;;
+-    esac
+-fi
+-
+ AC_LANG([C])
+ 
+-if test "${build}" == "${host}"
+-then
+-    case "${host}" in
+-    x86_64-*)
+-        # X86_64 Linux machines may have both 64 bit and 32 bit libraries. We need to choose the right set
+-        AC_CHECK_FILE([/usr/X11R6/lib64], [TESTLIBS="$TESTLIBS -L/usr/X11R6/lib64"], AC_CHECK_FILE([/usr/X11R6/lib], [TESTLIBS="$TESTLIBS -L/usr/X11R6/lib"]))
+-        ;;
+-    esac
+-fi
+-
+ # Checks for libraries.
+ AC_CHECK_LIB([Xft], [XftFontOpen], TESTLIBS="$TESTLIBS -lXft",, $TESTLIBS)
+ AC_CHECK_LIB([Xext], [XextCreateExtension], TESTLIBS="$TESTLIBS -lXext",, $TESTLIBS)