diff -u firebird2.0-2.0.3.12981.ds1/debian/changelog firebird2.0-2.0.3.12981.ds1/debian/changelog --- firebird2.0-2.0.3.12981.ds1/debian/changelog +++ firebird2.0-2.0.3.12981.ds1/debian/changelog @@ -1,3 +1,13 @@ +firebird2.0 (2.0.3.12981.ds1-5ubuntu1) hardy; urgency=low + + * Merge from debian unstable (LP #194100), remaining changes: + - Replace libicu36-dev with libicu-dev. + * debian/patches/series + - removed ubuntu-port-hppa.patch FTBFS and disable. + - removed ubuntu-port-ia64.patch FTBFS and disable. + + -- Emanuele Gentili Sat, 23 Feb 2008 03:14:56 +0100 + firebird2.0 (2.0.3.12981.ds1-5) unstable; urgency=low * Resync port-mipsel.patch from upstream and enable it. Closes: @@ -72,6 +82,30 @@ -- Damyan Ivanov Mon, 03 Dec 2007 20:43:08 +0200 +firebird2.0 (2.0.3.12981.ds1-1ubuntu3) hardy; urgency=low + + * Replace libicu36-dev with libicu-dev. + + -- Steve Kowalik Sun, 16 Dec 2007 11:29:44 +1100 + +firebird2.0 (2.0.3.12981.ds1-1ubuntu2) gutsy; urgency=low + + * Provide and enable ubuntu-port-hppa.patch and ubuntu-port-ia64.patch + to fix hppa and ia64 FTBFS and disable port-ia64.patch. This way it + is easier to process new merges from Debian. + * Do not build on sparc for now because it currently FTBFS. A porting + work is required to safely re-enable it. + + -- Luca Falavigna Sun, 16 Sep 2007 10:57:13 +0200 + +firebird2.0 (2.0.3.12981.ds1-1ubuntu1) gutsy; urgency=low + + * Resync with Debian unstable after UVFe approval in LP: #139007 + * Enable port-ia64.patch to avoid FTBFS on ia64 + * Update Maintainer field in debian/control + + -- Luca Falavigna Wed, 12 Sep 2007 21:33:14 +0200 + firebird2.0 (2.0.3.12981.ds1-1) unstable; urgency=medium * New upstream relese-candidate @@ -1080,7 +1114,6 @@ -- Daniel Urban Mon, 16 Jul 2004 09:50:00 +0200 - firebird2 (1.5.0-1) unstable; urgency=low * Initial Release. Closes: #151052 diff -u firebird2.0-2.0.3.12981.ds1/debian/control firebird2.0-2.0.3.12981.ds1/debian/control --- firebird2.0-2.0.3.12981.ds1/debian/control +++ firebird2.0-2.0.3.12981.ds1/debian/control @@ -1,7 +1,8 @@ Source: firebird2.0 Section: misc Priority: optional -Maintainer: Debian Firebird Group +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian Firebird Group Uploaders: Daniel Urban , Damyan Ivanov , Francesco Paolo Lovergine @@ -14,7 +15,7 @@ Homepage: http://firebirdsql.org/ Package: firebird2.0-super -Architecture: any +Architecture: i386 amd64 powerpc lpia Conflicts: firebird2.0-classic, firebird1.5-super, firebird1.5-classic, firebird-utils (<<2.0.3.12981.ds1-2) Replaces: firebird-utils (<<2.0.3.12981.ds1-2) @@ -42,7 +43,8 @@ License v.1.0 on 25 July, 2000. Package: firebird2.0-classic -Architecture: any +Priority: extra +Architecture: i386 amd64 powerpc lpia Conflicts: firebird2.0-super, firebird1.5-super, firebird1.5-classic, firebird-utils (<<2.0.3.12981.ds1-2) Replaces: firebrid-utils (<<2.0.3.12981.ds1-2) @@ -72,7 +74,7 @@ Package: libfbclient2 Section: libs -Architecture: any +Architecture: i386 amd64 powerpc ia64 lpia hppa Depends: ${shlibs:Depends}, firebird2.0-common (= ${binary:Version}) Description: Firebird client library Firebird is a relational database offering many ANSI SQL-99 features that @@ -91,7 +93,7 @@ Package: libfbembed2 Section: libs -Architecture: any +Architecture: i386 amd64 powerpc ia64 lpia hppa Depends: ${shlibs:Depends}, firebird2.0-common (= ${binary:Version}) Description: Firebird embedded client/server library Firebird is a relational database offering many ANSI SQL-99 features that @@ -116,7 +118,7 @@ package. Package: firebird2.0-common -Architecture: any +Architecture: i386 amd64 powerpc ia64 lpia hppa Depends: ${shlibs:Depends}, adduser Conflicts: firebird-utils (<<2.0.3.12981.ds1-2) Replaces: firebird-utils (<<2.0.3.12981.ds1-2) only in patch2: unchanged: --- firebird2.0-2.0.3.12981.ds1.orig/debian/patches/ubuntu-port-ia64.patch +++ firebird2.0-2.0.3.12981.ds1/debian/patches/ubuntu-port-ia64.patch @@ -0,0 +1,127 @@ +Index: firebird2.0-2.0.3.12981.ds1/builds/posix/prefix.linux_ia64 +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ firebird2.0-2.0.3.12981.ds1/builds/posix/prefix.linux_ia64 2007-09-16 12:58:12.000000000 +0200 +@@ -0,0 +1,9 @@ ++PROD_FLAGS=-ggdb -O3 -fno-omit-frame-pointer -DNDEBUG -pipe -MMD -fPIC -fmessage-length=0 ++DEV_FLAGS=-ggdb -pipe -MMD -p -fPIC -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0 ++ ++OS_ServerFiles=inet_server.cpp ++ ++EMBED_UTIL_TARGETS=gstat gds_drop gds_relay gsec nbackup fb_lock_print ++CLIENT_UTIL_TARGETS=gds_drop gds_relay gstat gsec fbguard fbmgr_bin nbackup fb_lock_print ++ ++Physical_IO_Module=os/posix/unix.cpp +Index: firebird2.0-2.0.3.12981.ds1/configure.in +=================================================================== +--- firebird2.0-2.0.3.12981.ds1.orig/configure.in 2007-09-16 12:58:04.000000000 +0200 ++++ firebird2.0-2.0.3.12981.ds1/configure.in 2007-09-16 12:58:12.000000000 +0200 +@@ -91,6 +91,19 @@ + CPU_TYPE=amd64 + ;; + ++ ia64*-*-linux* | ia64*-*-gnu* | ia64*-*-k*bsd*-gnu) ++ MAKEFILE_PREFIX=linux_ia64 ++ INSTALL_PREFIX=linux ++ PLATFORM=LINUX ++ AC_DEFINE(LINUX, 1, [Define this if OS is Linux]) ++ AC_DEFINE(IA64, 1, [Define this if CPU is IA64]) ++ LOCK_MANAGER_FLG=Y ++ EDITLINE_FLG=Y ++ SHRLIB_EXT=so ++ libdir=/usr/lib64 ++ CPU_TYPE=amd64 ++ ;; ++ + sparc*-*-linux* | sparc*-*-gnu* | sparc*-*-k*bsd*-gnu) + MAKEFILE_PREFIX=linux_sparc32 + INSTALL_PREFIX=linux +Index: firebird2.0-2.0.3.12981.ds1/src/jrd/common.h +=================================================================== +--- firebird2.0-2.0.3.12981.ds1.orig/src/jrd/common.h 2007-09-16 12:58:04.000000000 +0200 ++++ firebird2.0-2.0.3.12981.ds1/src/jrd/common.h 2007-09-16 13:00:52.000000000 +0200 +@@ -125,6 +125,10 @@ + #define IMPLEMENTATION isc_info_db_impl_linux_amd64 /* 66 next higher unique number, See you later */ + #endif + ++#ifdef IA64 ++#define IMPLEMENTATION isc_info_db_impl_linux_ia64 /* 72 */ ++#endif ++ + #ifdef PPC + #define IMPLEMENTATION isc_info_db_impl_linux_ppc /* 69 next higher unique number, See you later */ + #endif +Index: firebird2.0-2.0.3.12981.ds1/src/jrd/inf_pub.h +=================================================================== +--- firebird2.0-2.0.3.12981.ds1.orig/src/jrd/inf_pub.h 2007-09-16 12:58:04.000000000 +0200 ++++ firebird2.0-2.0.3.12981.ds1/src/jrd/inf_pub.h 2007-09-16 13:01:14.000000000 +0200 +@@ -196,6 +196,7 @@ + isc_info_db_impl_linux_ppc = 69, + isc_info_db_impl_darwin_x86 = 70, + isc_info_db_impl_linux_hppa = 71, ++ isc_info_db_impl_linux_ia64 = 72, + + isc_info_db_impl_last_value /* Leave this LAST! */ + }; +Index: firebird2.0-2.0.3.12981.ds1/src/jrd/pag.cpp +=================================================================== +--- firebird2.0-2.0.3.12981.ds1.orig/src/jrd/pag.cpp 2007-09-16 12:58:05.000000000 +0200 ++++ firebird2.0-2.0.3.12981.ds1/src/jrd/pag.cpp 2007-09-16 13:03:01.000000000 +0200 +@@ -141,8 +141,9 @@ + static const int CLASS_LINUX_PPC = 27; // LINUX/PowerPC + static const int CLASS_DARWIN_I386 = 28; //Darwin/Intel + static const int CLASS_LINUX_HPPA = 29; // LINUX/HPPA ++static const int CLASS_LINUX_IA64 = 30; // LINUX on IA64 systems + static const int CLASS_MAX10 = CLASS_LINUX_AMD64; // This should not be changed, no new ports with ODS10 +-static const int CLASS_MAX = CLASS_LINUX_HPPA; ++static const int CLASS_MAX = CLASS_LINUX_IA64; + + // ARCHITECTURE COMPATIBILITY CLASSES + +@@ -227,7 +228,8 @@ + archLittleEndian, // CLASS_WINDOWS_AMD64 + archBigEndian, // CLASS_LINUX_PPC + archLittleEndian, // CLASS_DARWIN_I386 +- archBigEndian // CLASS_LINUX_HPPA ++ archBigEndian, // CLASS_LINUX_HPPA ++ archLittleEndian // CLASS_LINUX_IA64 + }; + + #ifdef sun +@@ -298,6 +300,9 @@ + #ifdef __ppc__ + const SSHORT CLASS = CLASS_DARWIN_PPC; + #endif ++#ifdef IA64 ++const SSHORT CLASS = CLASS_LINUX_IA64; ++#endif + #endif + + #if defined LINUX && defined AMD64 +Index: firebird2.0-2.0.3.12981.ds1/src/jrd/utl.cpp +=================================================================== +--- firebird2.0-2.0.3.12981.ds1.orig/src/jrd/utl.cpp 2007-09-16 12:58:05.000000000 +0200 ++++ firebird2.0-2.0.3.12981.ds1/src/jrd/utl.cpp 2007-09-16 13:05:58.000000000 +0200 +@@ -237,7 +237,8 @@ + NULL, // "Firebird/x86-64/Windows NT", /* 68 */ //Windows/amd64 - not ported yet + "Firebird/linux PowerPC", /* 69 */ + "Firebird/Darwin/Intel", /* 70 */ +- "Firebird/linux HPPA" /* 71 */ ++ "Firebird/linux HPPA", /* 71 */ ++ "Firebird/linux IA64" /* 72 */ + }; + + +Index: firebird2.0-2.0.3.12981.ds1/src/remote/xdr.cpp +=================================================================== +--- firebird2.0-2.0.3.12981.ds1.orig/src/remote/xdr.cpp 2007-09-16 12:58:05.000000000 +0200 ++++ firebird2.0-2.0.3.12981.ds1/src/remote/xdr.cpp 2007-09-16 13:07:01.000000000 +0200 +@@ -39,7 +39,7 @@ + // The simpliest way to check it is to issue + // "select abs(2.0/3.0) from rdb$database" from correct client + // It will return big strange value in case of invalid define +-#if defined(i386) || defined(I386) || defined(_M_IX86) || defined(AMD64) ++#if defined(i386) || defined(I386) || defined(_M_IX86) || defined(AMD64) || defined(IA64) + #define SWAP_DOUBLE + #elif defined(sparc) || defined(PowerPC) || defined(PPC) || defined(__ppc__) || defined(HPPA) + #undef SWAP_DOUBLE only in patch2: unchanged: --- firebird2.0-2.0.3.12981.ds1.orig/debian/patches/ubuntu-port-hppa.patch +++ firebird2.0-2.0.3.12981.ds1/debian/patches/ubuntu-port-hppa.patch @@ -0,0 +1,128 @@ +Index: firebird2.0-2.0.3.12981.ds1/builds/posix/prefix.linux_hppa +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ firebird2.0-2.0.3.12981.ds1/builds/posix/prefix.linux_hppa 2007-09-16 10:43:48.000000000 +0200 +@@ -0,0 +1,11 @@ ++LD=@CXX@ ++ ++PROD_FLAGS=-O3 -DNDEBUG -ggdb -DLINUX -pipe -MMD -fPIC -fsigned-char ++DEV_FLAGS=-ggdb -DLINUX -pipe -MMD -p -fPIC -Wall -Wno-switch -fsigned-char ++ ++OS_ServerFiles=inet_server.cpp ++ ++EMBED_UTIL_TARGETS=gstat gds_drop gsec nbackup fb_lock_print ++CLIENT_UTIL_TARGETS=gstat gds_drop gsec nbackup fb_lock_print fbguard fbmgr_bin ++ ++Physical_IO_Module=os/posix/unix.cpp +Index: firebird2.0-2.0.3.12981.ds1/configure.in +=================================================================== +--- firebird2.0-2.0.3.12981.ds1.orig/configure.in 2007-09-16 10:44:02.000000000 +0200 ++++ firebird2.0-2.0.3.12981.ds1/configure.in 2007-09-16 10:44:51.000000000 +0200 +@@ -120,6 +120,17 @@ + SHRLIB_EXT=so + ;; + ++ hppa*-*-linux*) ++ MAKEFILE_PREFIX=linux_hppa ++ INSTALL_PREFIX=linux ++ PLATFORM=LINUX ++ AC_DEFINE(LINUX, 1, [Define this if OS is Linux]) ++ AC_DEFINE(HPPA, 1, [Define this if CPU is HPPA]) ++ LOCK_MANAGER_FLG=Y ++ EDITLINE_FLG=Y ++ SHRLIB_EXT=so ++ ;; ++ + *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu) + MAKEFILE_PREFIX=linux_generic + INSTALL_PREFIX=linux +Index: firebird2.0-2.0.3.12981.ds1/src/jrd/common.h +=================================================================== +--- firebird2.0-2.0.3.12981.ds1.orig/src/jrd/common.h 2007-09-16 10:45:04.000000000 +0200 ++++ firebird2.0-2.0.3.12981.ds1/src/jrd/common.h 2007-09-16 10:46:03.000000000 +0200 +@@ -138,6 +138,10 @@ + #define IMPLEMENTATION isc_info_db_impl_linux_sparc /* 65 */ + #endif /* sparc */ + ++#ifdef HPPA ++#define IMPLEMENTATION isc_info_db_impl_linux_hppa /* 71 */ ++#endif /* HPPA */ ++ + #define MEMMOVE(from, to, length) memmove ((void *)to, (void *)from, (size_t) length) + #define MOVE_FAST(from, to, length) memcpy (to, from, (int) (length)) + #define MOVE_FASTER(from, to, length) memcpy (to, from, (int) (length)) +Index: firebird2.0-2.0.3.12981.ds1/src/jrd/inf_pub.h +=================================================================== +--- firebird2.0-2.0.3.12981.ds1.orig/src/jrd/inf_pub.h 2007-09-16 10:46:22.000000000 +0200 ++++ firebird2.0-2.0.3.12981.ds1/src/jrd/inf_pub.h 2007-09-16 10:47:03.000000000 +0200 +@@ -195,6 +195,7 @@ + isc_info_db_impl_winnt_amd64 = 68, + isc_info_db_impl_linux_ppc = 69, + isc_info_db_impl_darwin_x86 = 70, ++ isc_info_db_impl_linux_hppa = 71, + + isc_info_db_impl_last_value /* Leave this LAST! */ + }; +Index: firebird2.0-2.0.3.12981.ds1/src/jrd/pag.cpp +=================================================================== +--- firebird2.0-2.0.3.12981.ds1.orig/src/jrd/pag.cpp 2007-09-16 10:47:19.000000000 +0200 ++++ firebird2.0-2.0.3.12981.ds1/src/jrd/pag.cpp 2007-09-16 10:49:49.000000000 +0200 +@@ -140,8 +140,9 @@ + //static const int CLASS_WINDOWS_AMD64 = 26;// Windows/amd64 - not ported yet + static const int CLASS_LINUX_PPC = 27; // LINUX/PowerPC + static const int CLASS_DARWIN_I386 = 28; //Darwin/Intel ++static const int CLASS_LINUX_HPPA = 29; // LINUX/HPPA + static const int CLASS_MAX10 = CLASS_LINUX_AMD64; // This should not be changed, no new ports with ODS10 +-static const int CLASS_MAX = CLASS_DARWIN_I386; ++static const int CLASS_MAX = CLASS_LINUX_HPPA; + + // ARCHITECTURE COMPATIBILITY CLASSES + +@@ -225,7 +226,8 @@ + archLittleEndian, // CLASS_FREEBSD_AMD64 + archLittleEndian, // CLASS_WINDOWS_AMD64 + archBigEndian, // CLASS_LINUX_PPC +- archLittleEndian // CLASS_DARWIN_I386 ++ archLittleEndian, // CLASS_DARWIN_I386 ++ archBigEndian // CLASS_LINUX_HPPA + }; + + #ifdef sun +@@ -302,6 +304,10 @@ + const SSHORT CLASS = CLASS_LINUX_AMD64; + #endif + ++#ifdef HPPA ++const SSHORT CLASS = CLASS_LINUX_HPPA; ++#endif ++ + + // CVC: Since nobody checks the result from this function (strange!), I changed + // bool to void as the return type but left the result returned as comment. +Index: firebird2.0-2.0.3.12981.ds1/src/jrd/utl.cpp +=================================================================== +--- firebird2.0-2.0.3.12981.ds1.orig/src/jrd/utl.cpp 2007-09-16 10:51:14.000000000 +0200 ++++ firebird2.0-2.0.3.12981.ds1/src/jrd/utl.cpp 2007-09-16 10:51:55.000000000 +0200 +@@ -236,7 +236,8 @@ + "Firebird/FreeBSD/amd64", /* 67 */ + NULL, // "Firebird/x86-64/Windows NT", /* 68 */ //Windows/amd64 - not ported yet + "Firebird/linux PowerPC", /* 69 */ +- "Firebird/Darwin/Intel" /* 70 */ ++ "Firebird/Darwin/Intel", /* 70 */ ++ "Firebird/linux HPPA" /* 71 */ + }; + + +Index: firebird2.0-2.0.3.12981.ds1/src/remote/xdr.cpp +=================================================================== +--- firebird2.0-2.0.3.12981.ds1.orig/src/remote/xdr.cpp 2007-09-16 10:52:11.000000000 +0200 ++++ firebird2.0-2.0.3.12981.ds1/src/remote/xdr.cpp 2007-09-16 10:53:14.000000000 +0200 +@@ -41,7 +41,7 @@ + // It will return big strange value in case of invalid define + #if defined(i386) || defined(I386) || defined(_M_IX86) || defined(AMD64) + #define SWAP_DOUBLE +-#elif defined(sparc) || defined(PowerPC) || defined(PPC) || defined(__ppc__) ++#elif defined(sparc) || defined(PowerPC) || defined(PPC) || defined(__ppc__) || defined(HPPA) + #undef SWAP_DOUBLE + #else + #error "Define SWAP_DOUBLE for your platform correctly !"