head 1.3; access; symbols OPENPKG_E1_MP_HEAD:1.1 OPENPKG_E1_MP:1.1 OPENPKG_E1_MP_2_STABLE:1.1.2.2 OPENPKG_E1_FP:1.1.2.2 OPENPKG_2_STABLE_MP:1.1 OPENPKG_2_STABLE_20061018:1.1.2.2 OPENPKG_2_STABLE:1.1.0.2; locks; strict; comment @# @; 1.3 date 2008.06.07.21.54.21; author rse; state Exp; branches; next 1.2; commitid U1huSIhaoD9z446t; 1.2 date 2007.02.23.07.51.02; author rse; state Exp; branches; next 1.1; commitid UnzCMI94d9lVvA7s; 1.1 date 2005.10.11.06.50.23; author rse; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2005.10.11.06.50.23; author rse; state dead; branches; next 1.1.2.2; commitid iZxwRSmmWscPXUQr; 1.1.2.2 date 2006.10.16.14.51.49; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; desc @@ 1.3 log @upgrading package: libdbi 0.8.2 -> 0.8.3 @ text @Index: libdbi-0.8.3/Makefile.in --- libdbi-0.8.3/Makefile.in.orig 2008-02-06 20:40:10 +0100 +++ libdbi-0.8.3/Makefile.in 2008-02-07 19:55:51 +0100 @@@@ -180,7 +180,7 @@@@ sysconfdir = @@sysconfdir@@ target_alias = @@target_alias@@ AUTOMAKE_OPTIONS = foreign dist-zip -SUBDIRS = src include @@docs_subdirs@@ +SUBDIRS = src include EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README README.win32 README.osx TODO NEWS libdbi.spec.in config.h.in Makefile.w32 autogen.sh drivers/example/AUTHORS drivers/example/Makefile.am drivers/example/README drivers/example/TODO drivers/example/.cvsignore drivers/example/dbd_example.c drivers/example/dbd_example.h drivers/example/dbd_example.sgml all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive Index: libdbi-0.8.3/configure --- libdbi-0.8.3/configure.orig 2008-02-06 20:40:11 +0100 +++ libdbi-0.8.3/configure 2008-02-07 19:29:13 +0100 @@@@ -19234,41 +19234,6 @@@@ -if test -z "$GCC"; then - case $host in - *-*-irix*) - if test -z "$CC"; then - CC=cc - fi - DEBUG="-g -signed" - CFLAGS="-O2 -w -signed" - PROFILE="-p -g3 -O2 -signed" ;; - sparc-sun-solaris*) - DEBUG="-v -g" - CFLAGS="-xO4 -fast -w -fsimple -native -xcg92" - PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;; - *) - DEBUG="-g" - CFLAGS="-O" - PROFILE="-g -p" ;; - esac -else - - case $host in - *-*-linux*) - DEBUG="-g -Wall -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char -std=gnu99" - CFLAGS="-O20 -ffast-math -D_REENTRANT -fsigned-char -std=gnu99" - PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char -std=gnu99";; - sparc-sun-*) - DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -mv8 -std=gnu99" - CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8 -std=gnu99" - PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8 -std=gnu99" ;; - *) - DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -std=gnu99" - CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char -std=gnu99" - PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char -std=gnu99" ;; - esac -fi Index: libdbi-drivers-0.8.3-1/configure --- libdbi-drivers-0.8.3-1/configure.orig 2008-02-06 20:41:47 +0100 +++ libdbi-drivers-0.8.3-1/configure 2008-02-07 19:29:13 +0100 @@@@ -19509,42 +19509,6 @@@@ -if test -z "$GCC"; then - case $host in - *-*-irix*) - if test -z "$CC"; then - CC=cc - fi - DEBUG="-g -signed" - CFLAGS="-O2 -w -signed" - PROFILE="-p -g3 -O2 -signed" ;; - sparc-sun-solaris*) - DEBUG="-v -g" - CFLAGS="-xO4 -fast -w -fsimple -native -xcg92" - PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;; - *) - DEBUG="-g" - CFLAGS="-O" - PROFILE="-g -p" ;; - esac -else - - case $host in - *-*-linux*) - DEBUG="-g -Wall -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char" - CFLAGS="-O20 -ffast-math -D_REENTRANT -fsigned-char" - PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";; - sparc-sun-*) - DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -mv8" - CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8" - PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;; - *) - DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char" - CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char" - PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;; - esac -fi - @ 1.2 log @upgrading package: libdbi 0.8.1 -> 0.8.2 @ text @d1 16 a16 4 Index: libdbi-0.8.2/configure --- libdbi-0.8.2/configure.orig 2005-09-28 21:01:35 +0200 +++ libdbi-0.8.2/configure 2005-10-11 08:43:10 +0200 @@@@ -19221,41 +19221,6 @@@@ d58 4 a61 4 Index: libdbi-drivers-0.8.2-1/configure --- libdbi-drivers-0.8.2-1/configure.orig 2005-09-20 20:45:26 +0200 +++ libdbi-drivers-0.8.2-1/configure 2005-10-11 08:42:04 +0200 @@@@ -19247,42 +19247,6 @@@@ @ 1.1 log @remove CFLAGS fiddling to allow it building @ text @d1 3 a3 3 Index: libdbi-0.8.1/configure --- libdbi-0.8.1/configure.orig 2005-09-28 21:01:35 +0200 +++ libdbi-0.8.1/configure 2005-10-11 08:43:10 +0200 d46 3 a48 3 Index: libdbi-drivers-0.8.1/configure --- libdbi-drivers-0.8.1/configure.orig 2005-09-20 20:45:26 +0200 +++ libdbi-drivers-0.8.1/configure 2005-10-11 08:42:04 +0200 @ 1.1.2.1 log @file libdbi.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:51:49 +0000 @ text @d1 91 @ 1.1.2.2 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 91 Index: libdbi-0.8.1/configure --- libdbi-0.8.1/configure.orig 2005-09-28 21:01:35 +0200 +++ libdbi-0.8.1/configure 2005-10-11 08:43:10 +0200 @@@@ -19221,41 +19221,6 @@@@ -if test -z "$GCC"; then - case $host in - *-*-irix*) - if test -z "$CC"; then - CC=cc - fi - DEBUG="-g -signed" - CFLAGS="-O2 -w -signed" - PROFILE="-p -g3 -O2 -signed" ;; - sparc-sun-solaris*) - DEBUG="-v -g" - CFLAGS="-xO4 -fast -w -fsimple -native -xcg92" - PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;; - *) - DEBUG="-g" - CFLAGS="-O" - PROFILE="-g -p" ;; - esac -else - - case $host in - *-*-linux*) - DEBUG="-g -Wall -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char -std=gnu99" - CFLAGS="-O20 -ffast-math -D_REENTRANT -fsigned-char -std=gnu99" - PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char -std=gnu99";; - sparc-sun-*) - DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -mv8 -std=gnu99" - CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8 -std=gnu99" - PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8 -std=gnu99" ;; - *) - DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -std=gnu99" - CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char -std=gnu99" - PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char -std=gnu99" ;; - esac -fi Index: libdbi-drivers-0.8.1/configure --- libdbi-drivers-0.8.1/configure.orig 2005-09-20 20:45:26 +0200 +++ libdbi-drivers-0.8.1/configure 2005-10-11 08:42:04 +0200 @@@@ -19247,42 +19247,6 @@@@ -if test -z "$GCC"; then - case $host in - *-*-irix*) - if test -z "$CC"; then - CC=cc - fi - DEBUG="-g -signed" - CFLAGS="-O2 -w -signed" - PROFILE="-p -g3 -O2 -signed" ;; - sparc-sun-solaris*) - DEBUG="-v -g" - CFLAGS="-xO4 -fast -w -fsimple -native -xcg92" - PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;; - *) - DEBUG="-g" - CFLAGS="-O" - PROFILE="-g -p" ;; - esac -else - - case $host in - *-*-linux*) - DEBUG="-g -Wall -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char" - CFLAGS="-O20 -ffast-math -D_REENTRANT -fsigned-char" - PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";; - sparc-sun-*) - DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -mv8" - CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8" - PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;; - *) - DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char" - CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char" - PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;; - esac -fi - @