diff -u sqlrelay-0.38/debian/control sqlrelay-0.38/debian/control --- sqlrelay-0.38/debian/control +++ sqlrelay-0.38/debian/control @@ -1,8 +1,9 @@ Source: sqlrelay Section: misc Priority: optional -Maintainer: Matthias Klose -Build-Depends: debhelper (>= 5.0.37.2), libmysqlclient15-dev, freetds-dev, libiodbc2-dev, libpq-dev, libsqlite0-dev, mdbtools-dev (>= 0.5.99.0.6pre1.0.20051109-2.1), python-all-dev (>= 2.3.5-11), python-central (>= 0.5), libpcre3-dev, libssl-dev, libxml2-dev, librudiments-dev (>= 0.30), libreadline5-dev, libgtk1.2-dev, ruby, ruby1.8-dev, tcl8.4-dev, php5-dev, autotools-dev, chrpath, java-gcj-compat-dev [!arm !mips !mipsel], zope-debhelper +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Matthias Klose +Build-Depends: debhelper (>= 5.0.37.2), libmysqlclient15-dev, freetds-dev, libiodbc2-dev, libpq-dev, libsqlite0-dev, mdbtools-dev (>= 0.5.99.0.6pre1.0.20051109-2.1), python-all-dev (>= 2.3.5-11), python-central (>= 0.5), libpcre3-dev, libssl-dev, libxml2-dev, librudiments-dev (>= 0.30), libreadline5-dev, libgtk1.2-dev, ruby, ruby1.8-dev, tcl8.4-dev, php5-dev, autotools-dev, chrpath, java-gcj-compat-dev [!arm !mips !mipsel], zope-debhelper, dpatch XS-Python-Version: current Standards-Version: 3.7.2 diff -u sqlrelay-0.38/debian/changelog sqlrelay-0.38/debian/changelog --- sqlrelay-0.38/debian/changelog +++ sqlrelay-0.38/debian/changelog @@ -1,3 +1,17 @@ +sqlrelay (1:0.38-3ubuntu1) hardy; urgency=low + + * patches/fix-wnolongdouble.dpatch: Remove test for -Wno-long-double + from configure and don't use this flag. The test succeeded but compiling + failed. Fixes FTBFS (LP: #204895). + * Create patches/00list and add fix-wnolongdouble to it. + * debian/rules: Add fix-wnolongdouble to debian_patches. + * debian/control: + - Add dpatch to Build-Depends + - Modify Maintainer value to match the DebianMaintainerField + specification. + + -- Albert Damen Sat, 29 Mar 2008 20:12:11 +0100 + sqlrelay (1:0.38-3) unstable; urgency=low * Don't install files in /usr/lib64. Closes: #417045. diff -u sqlrelay-0.38/debian/rules sqlrelay-0.38/debian/rules --- sqlrelay-0.38/debian/rules +++ sqlrelay-0.38/debian/rules @@ -354,7 +354,7 @@ patchdir = debian/patches # which patches should be applied? -#debian_patches = \ +debian_patches = fix-wnolongdouble \ # amd64-configure \ patch: patch-stamp only in patch2: unchanged: --- sqlrelay-0.38.orig/debian/patches/fix-wnolongdouble.dpatch +++ sqlrelay-0.38/debian/patches/fix-wnolongdouble.dpatch @@ -0,0 +1,115 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## fix-wlongnodouble.dpatch by Albert Damen +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Do not use -Wno-long-double and remove the test for usability +## DP: of this flag. The test succeeds but the build still fails. + +@DPATCH@ +diff -urNad sqlrelay-0.38~/config.mk.in sqlrelay-0.38/config.mk.in +--- sqlrelay-0.38~/config.mk.in 2006-10-04 02:53:01.000000000 +0200 ++++ sqlrelay-0.38/config.mk.in 2008-03-29 15:00:50.000000000 +0100 +@@ -45,8 +45,8 @@ + STATICLINK = @STATICLINK@ + + # debug and optimization flags (-g, -O2, etc.) +-CXXFLAGS = @CXXFLAGS@ @WALL@ @PIPE@ @WNOLONGDOUBLE@ +-CFLAGS = @CFLAGS@ @WALL@ @PIPE@ @WNOLONGDOUBLE@ ++CXXFLAGS = @CXXFLAGS@ @WALL@ @PIPE@ ++CFLAGS = @CFLAGS@ @WALL@ @PIPE@ + + # libtool command + LIBTOOL = @LIBTOOL@ +diff -urNad sqlrelay-0.38~/configure sqlrelay-0.38/configure +--- sqlrelay-0.38~/configure 2008-03-29 11:38:21.000000000 +0100 ++++ sqlrelay-0.38/configure 2008-03-29 15:00:30.000000000 +0100 +@@ -20260,78 +20260,6 @@ + + + +-echo "$as_me:$LINENO: checking for -Wno-long-double option" >&5 +-echo $ECHO_N "checking for -Wno-long-double option... $ECHO_C" >&6 +- +-SAVECPPFLAGS="$CPPFLAGS" +-SAVELIBS="$LIBS" +-SAVE_LD_LIBRARY_PATH="$LD_LIBRARY_PATH" +-CPPFLAGS="-Wno-long-double" +-LIBS="" +-LD_LIBRARY_PATH="" +-export LD_LIBRARY_PATH +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +-int +-main () +-{ +-printf("hello"); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- WNOLONGDOUBLE="-Wno-long-double" +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-WNOLONGDOUBLE="" +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-CPPFLAGS="$SAVECPPFLAGS" +-LIBS="$SAVELIBS" +-LD_LIBRARY_PATH="$SAVE_LD_LIBRARY_PATH" +-export LD_LIBRARY_PATH +- +-if ( test -n "$WNOLONGDOUBLE" ) +-then +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- +- + echo "$as_me:$LINENO: checking for -Wall" >&5 + echo $ECHO_N "checking for -Wall... $ECHO_C" >&6 + +diff -urNad sqlrelay-0.38~/configure.in sqlrelay-0.38/configure.in +--- sqlrelay-0.38~/configure.in 2006-10-04 02:49:25.000000000 +0200 ++++ sqlrelay-0.38/configure.in 2008-03-29 15:00:30.000000000 +0100 +@@ -455,7 +455,6 @@ + FW_CHECK_UNAME + + FW_CHECK_PIPE +-FW_CHECK_WNOLONGDOUBLE + FW_CHECK_WALL + FW_CHECK_PTHREAD_COMPILE + echo "******************************" only in patch2: unchanged: --- sqlrelay-0.38.orig/debian/patches/00list +++ sqlrelay-0.38/debian/patches/00list @@ -0,0 +1 @@ +fix-wnolongdouble