tags 473935 + patch pending
thanks

Hi,

The following is the diff for my sqlrelay 1:0.39.4-1.1 NMU.
I'll upload on the weekend or so.
Note that it just changes the files directly because I could not
seem to get the patch target in debian/rules to work properly.

Kind regards

T.

diff -u sqlrelay-0.39.4/configure sqlrelay-0.39.4/configure
--- sqlrelay-0.39.4/configure
+++ sqlrelay-0.39.4/configure
@@ -20268,78 +20268,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 <stdio.h>
-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 -u sqlrelay-0.39.4/debian/changelog sqlrelay-0.39.4/debian/changelog
--- sqlrelay-0.39.4/debian/changelog
+++ sqlrelay-0.39.4/debian/changelog
@@ -1,3 +1,11 @@
+sqlrelay (1:0.39.4-1.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Remove -Wno-long-double. Uses an old patch by Albert Damen for
+    Ubuntu, thanks. Closes: #473935.
+
+ -- Thomas Viehmann <[EMAIL PROTECTED]>  Wed, 16 Apr 2008 21:59:03 +0200
+
 sqlrelay (1:0.39.4-1) unstable; urgency=low
 
   * New upstream version.
only in patch2:
unchanged:
--- sqlrelay-0.39.4.orig/configure.in
+++ sqlrelay-0.39.4/configure.in
@@ -459,7 +459,6 @@
 FW_CHECK_PS
 
 FW_CHECK_PIPE
-FW_CHECK_WNOLONGDOUBLE
 FW_CHECK_WALL
 FW_CHECK_PTHREAD_COMPILE
 echo "******************************"
only in patch2:
unchanged:
--- sqlrelay-0.39.4.orig/config.mk.in
+++ sqlrelay-0.39.4/config.mk.in
@@ -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@



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to