diff -Nru firebird2.5-2.5.6.27020.ds4/debian/changelog firebird2.5-2.5.6.27020.ds4/debian/changelog --- firebird2.5-2.5.6.27020.ds4/debian/changelog 2016-08-23 13:24:32.000000000 +0000 +++ firebird2.5-2.5.6.27020.ds4/debian/changelog 2016-10-03 10:43:49.000000000 +0000 @@ -1,9 +1,18 @@ -firebird2.5 (2.5.6.27020.ds4-1ubuntu1) yakkety; urgency=medium +firebird2.5 (2.5.6.27020.ds4-2) unstable; urgency=medium - * Merge with Debian; remaining changes: - - Fix linking with ld --as-needed. + * fix linking of fdb-r15y-prune with --as-needed. + Patch from Matthias Klose. Closes: #835198 + * -classic.postrm: fix spurions [ ] around inviocation of 'which' + * remove flexible array union member in fdb-r15y-prune (gcc-6) + * Move firebird.msg from libfbclient2 to -common, under arch-specific path. + * Fix three typographical errors in manual pages + * More spelling mistakes added to out/spelling.patch + * Restore usage of hardening compiler options broken with 2.5.5.26952.ds4-4 + * Use https protocol in Vcs-* headers + * Bump standards-version to 3.9.8 (no changes needed) + * libib-util: replace ldconfig calls in postinst/postrm with a trigger - -- Matthias Klose Tue, 23 Aug 2016 15:24:32 +0200 + -- Damyan Ivanov Mon, 03 Oct 2016 10:43:49 +0000 firebird2.5 (2.5.6.27020.ds4-1) unstable; urgency=medium @@ -22,12 +31,6 @@ -- Damyan Ivanov Tue, 26 Apr 2016 20:14:57 +0000 -firebird2.5 (2.5.5.26952.ds4-4ubuntu1) yakkety; urgency=medium - - * Fix linking with ld --as-needed. - - -- Matthias Klose Sun, 24 Apr 2016 20:21:54 +0200 - firebird2.5 (2.5.5.26952.ds4-4) unstable; urgency=medium * Migrate to automatic dbgsym debug packages maintained by debhelper diff -Nru firebird2.5-2.5.6.27020.ds4/debian/control firebird2.5-2.5.6.27020.ds4/debian/control --- firebird2.5-2.5.6.27020.ds4/debian/control 2016-04-26 20:14:44.000000000 +0000 +++ firebird2.5-2.5.6.27020.ds4/debian/control 2016-10-03 10:26:36.000000000 +0000 @@ -18,9 +18,9 @@ po-debconf, procmail, Build-Conflicts: autoconf2.13, automake1.4 -Standards-Version: 3.9.6 -Vcs-Git: git://anonscm.debian.org/pkg-firebird/2.5.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-firebird/2.5.git;a=summary +Standards-Version: 3.9.8 +Vcs-Git: https://anonscm.debian.org/pkg-firebird/2.5.git +Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-firebird/2.5.git;a=summary Homepage: http://firebirdsql.org/ Package: firebird2.5-super @@ -33,7 +33,7 @@ Depends: adduser, debconf (>= 1.4.69), - firebird2.5-common (= ${source:Version}), + firebird2.5-common (= ${binary:Version}), firebird2.5-common-doc (= ${source:Version}), firebird2.5-server-common (= ${binary:Version}), lsb-base, @@ -69,7 +69,7 @@ adduser, debconf (>= 1.4.69), firebird2.5-classic-common (= ${binary:Version}), - firebird2.5-common (= ${source:Version}), + firebird2.5-common (= ${binary:Version}), firebird2.5-common-doc (= ${source:Version}), firebird2.5-server-common (= ${binary:Version}), netbase, @@ -106,7 +106,7 @@ adduser, debconf (>= 1.4.69), firebird2.5-classic-common (= ${binary:Version}), - firebird2.5-common (= ${source:Version}), + firebird2.5-common (= ${binary:Version}), firebird2.5-common-doc (= ${source:Version}), firebird2.5-server-common (= ${binary:Version}), lsb-base, @@ -139,7 +139,7 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: - firebird2.5-common (= ${source:Version}), + firebird2.5-common (= ${binary:Version}), firebird2.5-common-doc (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}, @@ -163,10 +163,9 @@ Architecture: any Pre-Depends: ${misc:Pre-Depends} Depends: - firebird2.5-common (= ${source:Version}), + firebird2.5-common (= ${binary:Version}), firebird2.5-common-doc (= ${source:Version}), firebird2.5-server-common (= ${binary:Version}), - libfbclient2, ${misc:Depends}, ${shlibs:Depends}, Description: Firebird embedded client/server library @@ -208,9 +207,11 @@ memory management etc. Package: firebird2.5-common -Architecture: all +Architecture: any Multi-Arch: foreign Depends: firebird2.5-common-doc (= ${source:Version}), ${misc:Depends} +Breaks: libfbclient2 (<< 2.5.6.27020.ds4-2~) +Replaces: libfbclient2 (<< 2.5.6.27020.ds4-2~) Description: common files for firebird 2.5 servers and clients Firebird is a relational database offering many ANSI SQL-99 features that runs on Linux, Windows, and a variety of Unix platforms. Firebird offers @@ -221,8 +222,8 @@ This package contains files common to both servers and clients for both super and classic flavours. . - These include support scripts as well as configuration files in - /etc/firebird/2.5. + These include the message file (firebird.msg), support scripts as well as + configuration files in /etc/firebird/2.5. . Please refer to the firebird2.5-super or firebird2.5-classic packages for more information about Firebird in general. diff -Nru firebird2.5-2.5.6.27020.ds4/debian/fb_lock_print.pod firebird2.5-2.5.6.27020.ds4/debian/fb_lock_print.pod --- firebird2.5-2.5.6.27020.ds4/debian/fb_lock_print.pod 2013-07-22 22:21:41.000000000 +0000 +++ firebird2.5-2.5.6.27020.ds4/debian/fb_lock_print.pod 2016-10-03 10:09:05.000000000 +0000 @@ -75,7 +75,7 @@ =item B -lock operations: enqueues, convertions, downgrades, dequeues, reads, writes and +lock operations: enqueues, conversions, downgrades, dequeues, reads, writes and queries =item B diff -Nru firebird2.5-2.5.6.27020.ds4/debian/fbsvcmgr.pod firebird2.5-2.5.6.27020.ds4/debian/fbsvcmgr.pod --- firebird2.5-2.5.6.27020.ds4/debian/fbsvcmgr.pod 2013-07-22 22:21:41.000000000 +0000 +++ firebird2.5-2.5.6.27020.ds4/debian/fbsvcmgr.pod 2016-10-03 10:08:29.000000000 +0000 @@ -99,7 +99,7 @@ fbsvcmgr service_mgr -user sysdba -password masterke \ -info_server_version -info_implementation -will report both server version and it's implemenation: +will report both server version and it's implementation: Server version: LI-T2.1.0.15740 Firebird 2.1 Alpha 1 Server implementation: Firebird/linux AMD64 diff -Nru firebird2.5-2.5.6.27020.ds4/debian/fdb-r15y-prune.cpp firebird2.5-2.5.6.27020.ds4/debian/fdb-r15y-prune.cpp --- firebird2.5-2.5.6.27020.ds4/debian/fdb-r15y-prune.cpp 2016-04-26 19:00:52.000000000 +0000 +++ firebird2.5-2.5.6.27020.ds4/debian/fdb-r15y-prune.cpp 2016-08-24 14:52:01.000000000 +0000 @@ -71,7 +71,7 @@ { int page_no = 0; typedef union { - unsigned char bytes[1]; + unsigned char bytes[MAX(sizeof(Ods::pag), MAX(sizeof(Ods::data_page), sizeof(Ods::btree_page)))]; Ods::pag header; Ods::data_page data; Ods::btree_page btree; diff -Nru firebird2.5-2.5.6.27020.ds4/debian/firebird2.5-classic.postrm firebird2.5-2.5.6.27020.ds4/debian/firebird2.5-classic.postrm --- firebird2.5-2.5.6.27020.ds4/debian/firebird2.5-classic.postrm 2015-09-17 15:05:49.000000000 +0000 +++ firebird2.5-2.5.6.27020.ds4/debian/firebird2.5-classic.postrm 2016-08-24 14:51:55.000000000 +0000 @@ -53,7 +53,7 @@ remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - if [ which update-inetd 2>&1 > /dev/null ]; then + if which update-inetd 2>&1 > /dev/null; then update-inetd --remove '([^:]+:)?gds_db' fi ;; diff -Nru firebird2.5-2.5.6.27020.ds4/debian/gfix.pod firebird2.5-2.5.6.27020.ds4/debian/gfix.pod --- firebird2.5-2.5.6.27020.ds4/debian/gfix.pod 2015-09-15 17:02:42.000000000 +0000 +++ firebird2.5-2.5.6.27020.ds4/debian/gfix.pod 2016-10-03 10:09:27.000000000 +0000 @@ -8,7 +8,7 @@ =head1 DESCRIPTION -B is a tool whitch performs a number of maintenance +B is a tool which performs a number of maintenance activities on a database eg. database shutdown and making minor data repairs. diff -Nru firebird2.5-2.5.6.27020.ds4/debian/libib-util.postinst firebird2.5-2.5.6.27020.ds4/debian/libib-util.postinst --- firebird2.5-2.5.6.27020.ds4/debian/libib-util.postinst 2013-07-22 22:21:41.000000000 +0000 +++ firebird2.5-2.5.6.27020.ds4/debian/libib-util.postinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -#!/bin/sh -# postinst script for libib-util - -set -e - -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-remove' -# * `abort-deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - configure) - ldconfig - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff -Nru firebird2.5-2.5.6.27020.ds4/debian/libib-util.postrm firebird2.5-2.5.6.27020.ds4/debian/libib-util.postrm --- firebird2.5-2.5.6.27020.ds4/debian/libib-util.postrm 2013-07-22 22:21:41.000000000 +0000 +++ firebird2.5-2.5.6.27020.ds4/debian/libib-util.postrm 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -#!/bin/sh -# postrm script for libib-util - -set -e - -# summary of how this script can be called: -# * `remove' -# * `purge' -# * `upgrade' -# * `failed-upgrade' -# * `abort-install' -# * `abort-install' -# * `abort-upgrade' -# * `disappear' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - remove) - ldconfig - ;; - - purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff -Nru firebird2.5-2.5.6.27020.ds4/debian/libib-util.triggers firebird2.5-2.5.6.27020.ds4/debian/libib-util.triggers --- firebird2.5-2.5.6.27020.ds4/debian/libib-util.triggers 1970-01-01 00:00:00.000000000 +0000 +++ firebird2.5-2.5.6.27020.ds4/debian/libib-util.triggers 2016-10-03 10:39:04.000000000 +0000 @@ -0,0 +1 @@ +activate-noawait ldconfig diff -Nru firebird2.5-2.5.6.27020.ds4/debian/make_packages.sh firebird2.5-2.5.6.27020.ds4/debian/make_packages.sh --- firebird2.5-2.5.6.27020.ds4/debian/make_packages.sh 2015-04-26 19:42:37.000000000 +0000 +++ firebird2.5-2.5.6.27020.ds4/debian/make_packages.sh 2016-10-03 08:41:01.000000000 +0000 @@ -181,13 +181,6 @@ copy e $D/usr/lib/$DEB_HOST_MULTIARCH $S/usr/lib/$DEB_HOST_MULTIARCH/libfbclient.so.$FB_VERSION ln -s libfbclient.so.$FB_VERSION $D/usr/lib/$DEB_HOST_MULTIARCH/libfbclient.so.$CLIENT_SO_VER - mkdir -p $D/usr/lib/$DEB_HOST_MULTIARCH/$FB2DIR - - for m in $S/usr/lib/$DEB_HOST_MULTIARCH/$FB2DIR/*.msg; - do - copy f $D/usr/lib/$DEB_HOST_MULTIARCH/$FB2DIR $m - done - doc_symlink ls -lR $D @@ -307,6 +300,7 @@ mkdir -p \ $D/etc/$FB2DIR \ + $D/usr/lib/$DEB_HOST_MULTIARCH/$FB2DIR \ $D/usr/share/$P # config @@ -317,6 +311,11 @@ debian/functions.sh \ $D/usr/share/$P/ + for m in $S/usr/lib/$DEB_HOST_MULTIARCH/$FB2DIR/*.msg; + do + copy f $D/usr/lib/$DEB_HOST_MULTIARCH/$FB2DIR $m + done + doc_symlink ls -lR $D diff -Nru firebird2.5-2.5.6.27020.ds4/debian/patches/out/spelling.patch firebird2.5-2.5.6.27020.ds4/debian/patches/out/spelling.patch --- firebird2.5-2.5.6.27020.ds4/debian/patches/out/spelling.patch 2015-04-18 17:29:00.000000000 +0000 +++ firebird2.5-2.5.6.27020.ds4/debian/patches/out/spelling.patch 2016-10-03 10:23:28.000000000 +0000 @@ -16,23 +16,124 @@ }; --- a/src/include/gen/msgs.h +++ b/src/include/gen/msgs.h -@@ -483,7 +483,7 @@ static const struct { +@@ -483,8 +483,8 @@ static const struct { {335544779, "Integer overflow. The result of an integer operation caused the most significant bit of the result to carry."}, /* 459, exception_integer_overflow */ {335544780, "An exception occurred that does not have a description. Exception number @1."}, /* 460, exception_unknown */ {335544781, "Stack overflow. The resource requirements of the runtime stack have exceeded the memory available to it."}, /* 461, exception_stack_overflow */ - {335544782, "Segmentation Fault. The code attempted to access memory without priviledges."}, /* 462, exception_sigsegv */ +- {335544783, "Illegal Instruction. The Code attempted to perfrom an illegal operation."}, /* 463, exception_sigill */ + {335544782, "Segmentation Fault. The code attempted to access memory without privileges."}, /* 462, exception_sigsegv */ - {335544783, "Illegal Instruction. The Code attempted to perfrom an illegal operation."}, /* 463, exception_sigill */ ++ {335544783, "Illegal Instruction. The Code attempted to perform an illegal operation."}, /* 463, exception_sigill */ {335544784, "Bus Error. The Code caused a system bus error."}, /* 464, exception_sigbus */ {335544785, "Floating Point Error. The Code caused an Arithmetic Exception or a floating point exception."}, /* 465, exception_sigfpe */ + {335544786, "Cannot delete rows from external files."}, /* 466, ext_file_delete */ --- a/src/msgs/messages2.sql +++ b/src/msgs/messages2.sql -@@ -558,7 +558,7 @@ without specifying a character set.', NU +@@ -558,8 +558,8 @@ without specifying a character set.', NU ('exception_integer_overflow', 'POST_EXCEPTIONS and POST_EXTRENA', 'common.h', NULL, 0, 459, NULL, 'Integer overflow. The result of an integer operation caused the most significant bit of the result to carry.', NULL, NULL); ('exception_unknown', 'POST_EXCEPTIONS and POST_EXTRENA', 'common.h', 'obsolete', 0, 460, NULL, 'An exception occurred that does not have a description. Exception number @1.', NULL, NULL); ('exception_stack_overflow', 'POST_EXCEPTION', 'common.h', NULL, 0, 461, NULL, 'Stack overflow. The resource requirements of the runtime stack have exceeded the memory available to it.', NULL, NULL); -('exception_sigsegv', 'ISC_exception_post', 'isc_sync.c', NULL, 0, 462, NULL, 'Segmentation Fault. The code attempted to access memory without priviledges.', NULL, NULL); +-('exception_sigill', 'ISC_exception_post', 'isc_sync.c', NULL, 0, 463, NULL, 'Illegal Instruction. The Code attempted to perfrom an illegal operation.', NULL, NULL); +('exception_sigsegv', 'ISC_exception_post', 'isc_sync.c', NULL, 0, 462, NULL, 'Segmentation Fault. The code attempted to access memory without privileges.', NULL, NULL); - ('exception_sigill', 'ISC_exception_post', 'isc_sync.c', NULL, 0, 463, NULL, 'Illegal Instruction. The Code attempted to perfrom an illegal operation.', NULL, NULL); ++('exception_sigill', 'ISC_exception_post', 'isc_sync.c', NULL, 0, 463, NULL, 'Illegal Instruction. The Code attempted to perform an illegal operation.', NULL, NULL); ('exception_sigbus', 'ISC_exception_post', 'isc_sync.c', NULL, 0, 464, NULL, 'Bus Error. The Code caused a system bus error.', NULL, NULL); ('exception_sigfpe', 'ISC_exception_post', 'isc_sync.c', NULL, 0, 465, NULL, 'Floating Point Error. The Code caused an Arithmetic Exception or a floating point exception.', NULL, NULL); + ('ext_file_delete', 'EXT_erase', 'ext.c', NULL, 0, 466, NULL, 'Cannot delete rows from external files.', NULL, NULL); +--- a/src/jrd/isc_sync.cpp ++++ b/src/jrd/isc_sync.cpp +@@ -2080,7 +2080,7 @@ void ISC_exception_post(ULONG sig_num, c + case SIGILL: + + sprintf(log_msg, "%s Illegal Instruction.\n" +- "\t\tThe code attempted to perfrom an\n" ++ "\t\tThe code attempted to perform an\n" + "\t\tillegal operation." + "\tThis exception will cause the Firebird server\n" + "\tto terminate abnormally.", err_msg); +--- a/src/msgs/history2.sql ++++ b/src/msgs/history2.sql +@@ -666,7 +666,7 @@ without specifying a character set.', NU + (667, 'daves', '1994-07-18 10:39:14', 12, 104, ' %sZ print version number', NULL, NULL, 'c_pg'); + (668, 'daves', '1994-07-18 10:39:30', 12, 109, ' %sY redirect/supress status message output', NULL, NULL, 'c_pg'); + (669, 'daves', '1994-07-18 11:00:17', 13, 382, 'Cannot delete object referencec by another object', NULL, NULL, 'c_pg'); +-(670, 'daves', '1994-07-18 11:02:30', 2, 177, 'Unsuccesful attempt to modify trigger relation', NULL, NULL, 'c_pg'); ++(670, 'daves', '1994-07-18 11:02:30', 2, 177, 'Unsuccessful attempt to modify trigger relation', NULL, NULL, 'c_pg'); + (671, 'daves', '1994-07-18 11:04:54', 12, 170, 'commiting metadata for table %s', NULL, NULL, 'c_pg'); + (672, 'daves', '1994-07-18 11:05:46', 12, 171, 'error commiting metadata for relation %s', NULL, NULL, 'c_pg'); + (673, 'daves', '1994-07-18 11:07:03', 16, 104, ' Number of archives running concurrently excceds limit.', NULL, NULL, 'c_pg'); +@@ -895,7 +895,7 @@ message to appear.', 'Your program encou + (909, 'SYSDBA', '1998-09-29 12:47:50', 0, 453, 'Floating-point inexact result. The result of a floating-point operation cannot be represented exactly as a decimal fr', NULL, NULL, 'c_pg'); + (910, 'SYSDBA', '1998-09-29 12:48:33', 0, 459, 'Interger overflow. The result of an integer operation caused the most significant bit of the result to carry.', NULL, NULL, 'c_pg'); + (911, 'SYSDBA', '1998-09-29 12:49:25', 0, 462, 'Segmentation Fault: code attempted to access memory without priviledges.', NULL, NULL, 'c_pg'); +-(912, 'SYSDBA', '1998-09-29 12:50:13', 0, 463, 'Illegal Instruction: code attempted to perfrom an illegal operation', NULL, NULL, 'c_pg'); ++(912, 'SYSDBA', '1998-09-29 12:50:13', 0, 463, 'Illegal Instruction: code attempted to perform an illegal operation', NULL, NULL, 'c_pg'); + (913, 'SYSDBA', '1998-09-29 12:50:32', 0, 464, 'Bus Error: code caused a system bus error', NULL, NULL, 'c_pg'); + (914, 'SYSDBA', '1998-09-29 12:51:01', 0, 465, 'Floating Point Error: Code caused an Arithmetic Exception or a floating point exception', NULL, NULL, 'c_pg'); + (915, 'duquette', '1998-10-15 17:17:38', 18, 15, 'gsec - unable to open database', NULL, NULL, 'c_pg'); +--- a/src/dudley/parse.cpp ++++ b/src/dudley/parse.cpp +@@ -2695,7 +2695,7 @@ static void modify_trigger() + relation = PARSE_relation(); + if (relation != trigger->trg_relation) + PARSE_error(177, 0, 0); +- /* msg 177: Unsuccesful attempt to modify trigger relation */ ++ /* msg 177: Unsuccessful attempt to modify trigger relation */ + } + else + relation = trigger->trg_relation; +--- a/src/msgs/transmsgs.de_DE.sql ++++ b/src/msgs/transmsgs.de_DE.sql +@@ -1244,7 +1244,7 @@ INSERT INTO TRANSMSGS (ENG_TEXT, ENG_ACT + INSERT INTO TRANSMSGS (ENG_TEXT, ENG_ACTION, ENG_EXPLANATION, FAC_CODE, NUMBER, LOCALE, TEXT, "ACTION", EXPLANATION, TRANSLATOR, TRANS_DATE) VALUES ('expected field action, encountered "%s"', NULL, NULL, 2, 174, 'de_DE', 'Erwartet: Feld-Aktion, gefunden: "%s"', NULL, NULL, 'daves', '1993-07-16 12:16:18'); + INSERT INTO TRANSMSGS (ENG_TEXT, ENG_ACTION, ENG_EXPLANATION, FAC_CODE, NUMBER, LOCALE, TEXT, "ACTION", EXPLANATION, TRANSLATOR, TRANS_DATE) VALUES ('database version is too old for the new trigger syntax', NULL, NULL, 2, 175, 'de_DE', 'Diese Datenbankversion ist für die neue Trigger-Syntax zu alt', NULL, NULL, 'daves', '1993-07-16 12:16:18'); + INSERT INTO TRANSMSGS (ENG_TEXT, ENG_ACTION, ENG_EXPLANATION, FAC_CODE, NUMBER, LOCALE, TEXT, "ACTION", EXPLANATION, TRANSLATOR, TRANS_DATE) VALUES ('expected trigger name, encountered "%s"', NULL, NULL, 2, 176, 'de_DE', 'Erwartet: Trigger-Name, gefunden: "%s"', NULL, NULL, 'daves', '1993-07-16 12:16:18'); +-INSERT INTO TRANSMSGS (ENG_TEXT, ENG_ACTION, ENG_EXPLANATION, FAC_CODE, NUMBER, LOCALE, TEXT, "ACTION", EXPLANATION, TRANSLATOR, TRANS_DATE) VALUES ('Unsuccesful attempt to modify trigger relation', NULL, NULL, 2, 177, 'de_DE', 'Fehler beim Versuch die Trigger-Relation zu ändern', NULL, NULL, 'daves', '1993-07-16 12:16:18'); ++INSERT INTO TRANSMSGS (ENG_TEXT, ENG_ACTION, ENG_EXPLANATION, FAC_CODE, NUMBER, LOCALE, TEXT, "ACTION", EXPLANATION, TRANSLATOR, TRANS_DATE) VALUES ('Unsuccessful attempt to modify trigger relation', NULL, NULL, 2, 177, 'de_DE', 'Fehler beim Versuch die Trigger-Relation zu ändern', NULL, NULL, 'daves', '1993-07-16 12:16:18'); + INSERT INTO TRANSMSGS (ENG_TEXT, ENG_ACTION, ENG_EXPLANATION, FAC_CODE, NUMBER, LOCALE, TEXT, "ACTION", EXPLANATION, TRANSLATOR, TRANS_DATE) VALUES ('message number %d exceeds 255', NULL, NULL, 2, 178, 'de_DE', 'Mitteilungsnummer %d zu groß! (Maximum 255)', NULL, NULL, 'daves', '1993-07-16 12:16:18'); + INSERT INTO TRANSMSGS (ENG_TEXT, ENG_ACTION, ENG_EXPLANATION, FAC_CODE, NUMBER, LOCALE, TEXT, "ACTION", EXPLANATION, TRANSLATOR, TRANS_DATE) VALUES ('expected message modification keyword, encountered "%s"', NULL, NULL, 2, 179, 'de_DE', 'Erwartet: Schlüsselwort zur Mitteilungsänderung, gefunden: "%s"', NULL, NULL, 'daves', '1993-07-16 12:16:18'); + INSERT INTO TRANSMSGS (ENG_TEXT, ENG_ACTION, ENG_EXPLANATION, FAC_CODE, NUMBER, LOCALE, TEXT, "ACTION", EXPLANATION, TRANSLATOR, TRANS_DATE) VALUES ('database version is too old for the new syntax: types', NULL, NULL, 2, 180, 'de_DE', 'Diese Datenbankversion ist für die neue Syntax zu alt: Typen', NULL, NULL, 'daves', '1993-07-16 12:16:18'); +--- a/src/msgs/transmsgs.de_DE2.sql ++++ b/src/msgs/transmsgs.de_DE2.sql +@@ -608,7 +608,7 @@ segmented) blob.', 'daves', '1993-07-16 + ('An exception occurred that does not have a description. Exception number @1.', NULL, NULL, 0, 460, '#', NULL, NULL, 'truser', '1000-01-01 00:00:00') + ('Stack overflow. The resource requirements of the runtime stack have exceeded the memory available to it.', NULL, NULL, 0, 461, '#', NULL, NULL, 'truser', '1000-01-01 00:00:00') + ('Segmentation Fault. The code attempted to access memory without priviledges.', NULL, NULL, 0, 462, '#', NULL, NULL, 'truser', '1000-01-01 00:00:00') +-('Illegal Instruction. The Code attempted to perfrom an illegal operation.', NULL, NULL, 0, 463, '#', NULL, NULL, 'truser', '1000-01-01 00:00:00') ++('Illegal Instruction. The Code attempted to perform an illegal operation.', NULL, NULL, 0, 463, '#', NULL, NULL, 'truser', '1000-01-01 00:00:00') + ('Bus Error. The Code caused a system bus error.', NULL, NULL, 0, 464, '#', NULL, NULL, 'truser', '1000-01-01 00:00:00') + ('Floating Point Error. The Code caused an Arithmetic Exception or a floating point exception.', NULL, NULL, 0, 465, '#', NULL, NULL, 'truser', '1000-01-01 00:00:00') + ('Cannot delete rows from external files.', NULL, NULL, 0, 466, '#', NULL, NULL, 'truser', '1000-01-01 00:00:00') +--- a/src/msgs/transmsgs.fr_FR.sql ++++ b/src/msgs/transmsgs.fr_FR.sql +@@ -1219,7 +1219,7 @@ INSERT INTO TRANSMSGS (ENG_TEXT, ENG_ACT + INSERT INTO TRANSMSGS (ENG_TEXT, ENG_ACTION, ENG_EXPLANATION, FAC_CODE, NUMBER, LOCALE, TEXT, "ACTION", EXPLANATION, TRANSLATOR, TRANS_DATE) VALUES ('expected field action, encountered "%s"', NULL, NULL, 2, 174, 'fr_FR', 'Prévu : opération de zone. Obtenu : "%s"', NULL, NULL, 'daves', '1993-07-16 12:11:53'); + INSERT INTO TRANSMSGS (ENG_TEXT, ENG_ACTION, ENG_EXPLANATION, FAC_CODE, NUMBER, LOCALE, TEXT, "ACTION", EXPLANATION, TRANSLATOR, TRANS_DATE) VALUES ('database version is too old for the new trigger syntax', NULL, NULL, 2, 175, 'fr_FR', 'La version de la base de données est périmée pour la nouvelle syntaxe du déclencheur', NULL, NULL, 'daves', '1993-07-16 12:11:53'); + INSERT INTO TRANSMSGS (ENG_TEXT, ENG_ACTION, ENG_EXPLANATION, FAC_CODE, NUMBER, LOCALE, TEXT, "ACTION", EXPLANATION, TRANSLATOR, TRANS_DATE) VALUES ('expected trigger name, encountered "%s"', NULL, NULL, 2, 176, 'fr_FR', 'Prévu : nom de déclencheur. Obtenu : "%s"', NULL, NULL, 'daves', '1993-07-16 12:11:53'); +-INSERT INTO TRANSMSGS (ENG_TEXT, ENG_ACTION, ENG_EXPLANATION, FAC_CODE, NUMBER, LOCALE, TEXT, "ACTION", EXPLANATION, TRANSLATOR, TRANS_DATE) VALUES ('Unsuccesful attempt to modify trigger relation', NULL, NULL, 2, 177, 'fr_FR', 'Échec de modification de la relation du déclencheur', NULL, NULL, 'daves', '1993-07-16 12:11:53'); ++INSERT INTO TRANSMSGS (ENG_TEXT, ENG_ACTION, ENG_EXPLANATION, FAC_CODE, NUMBER, LOCALE, TEXT, "ACTION", EXPLANATION, TRANSLATOR, TRANS_DATE) VALUES ('Unsuccessful attempt to modify trigger relation', NULL, NULL, 2, 177, 'fr_FR', 'Échec de modification de la relation du déclencheur', NULL, NULL, 'daves', '1993-07-16 12:11:53'); + INSERT INTO TRANSMSGS (ENG_TEXT, ENG_ACTION, ENG_EXPLANATION, FAC_CODE, NUMBER, LOCALE, TEXT, "ACTION", EXPLANATION, TRANSLATOR, TRANS_DATE) VALUES ('message number %d exceeds 255', NULL, NULL, 2, 178, 'fr_FR', 'Le numéro du message %d dépasse 255', NULL, NULL, 'daves', '1993-07-16 12:11:53'); + INSERT INTO TRANSMSGS (ENG_TEXT, ENG_ACTION, ENG_EXPLANATION, FAC_CODE, NUMBER, LOCALE, TEXT, "ACTION", EXPLANATION, TRANSLATOR, TRANS_DATE) VALUES ('expected message modification keyword, encountered "%s"', NULL, NULL, 2, 179, 'fr_FR', 'Prévu : mot clé pour modification de message. Obtenu : "%s"', NULL, NULL, 'daves', '1993-07-16 12:11:53'); + INSERT INTO TRANSMSGS (ENG_TEXT, ENG_ACTION, ENG_EXPLANATION, FAC_CODE, NUMBER, LOCALE, TEXT, "ACTION", EXPLANATION, TRANSLATOR, TRANS_DATE) VALUES ('database version is too old for the new syntax: types', NULL, NULL, 2, 180, 'fr_FR', 'La version de la base de données est périmée pour la nouvelle syntaxe: types', NULL, NULL, 'daves', '1993-07-16 12:11:53'); +--- a/src/msgs/transmsgs.fr_FR2.sql ++++ b/src/msgs/transmsgs.fr_FR2.sql +@@ -608,7 +608,7 @@ segmented) blob.', 'daves', '1993-07-16 + ('An exception occurred that does not have a description. Exception number @1.', NULL, NULL, 0, 460, '#', NULL, NULL, 'truser', '1000-01-01 00:00:00') + ('Stack overflow. The resource requirements of the runtime stack have exceeded the memory available to it.', NULL, NULL, 0, 461, '#', NULL, NULL, 'truser', '1000-01-01 00:00:00') + ('Segmentation Fault. The code attempted to access memory without priviledges.', NULL, NULL, 0, 462, '#', NULL, NULL, 'truser', '1000-01-01 00:00:00') +-('Illegal Instruction. The Code attempted to perfrom an illegal operation.', NULL, NULL, 0, 463, '#', NULL, NULL, 'truser', '1000-01-01 00:00:00') ++('Illegal Instruction. The Code attempted to perform an illegal operation.', NULL, NULL, 0, 463, '#', NULL, NULL, 'truser', '1000-01-01 00:00:00') + ('Bus Error. The Code caused a system bus error.', NULL, NULL, 0, 464, '#', NULL, NULL, 'truser', '1000-01-01 00:00:00') + ('Floating Point Error. The Code caused an Arithmetic Exception or a floating point exception.', NULL, NULL, 0, 465, '#', NULL, NULL, 'truser', '1000-01-01 00:00:00') + ('Cannot delete rows from external files.', NULL, NULL, 0, 466, '#', NULL, NULL, 'truser', '1000-01-01 00:00:00') +--- a/src/remote/interface.cpp ++++ b/src/remote/interface.cpp +@@ -1039,7 +1039,7 @@ ISC_STATUS GDS_DETACH(ISC_STATUS* user_s + + if (user_status[1]) + { +- gds__log("REMOTE INTERFACE/gds__detach: Unsuccesful detach from " ++ gds__log("REMOTE INTERFACE/gds__detach: Unsuccessful detach from " + "database. \n\tUncommitted work may have been lost"); + } + diff -Nru firebird2.5-2.5.6.27020.ds4/debian/rules firebird2.5-2.5.6.27020.ds4/debian/rules --- firebird2.5-2.5.6.27020.ds4/debian/rules 2016-08-23 13:24:32.000000000 +0000 +++ firebird2.5-2.5.6.27020.ds4/debian/rules 2016-10-03 10:23:28.000000000 +0000 @@ -115,7 +115,7 @@ -sh debian/clean-after-build.sh chmod u+x ./configure - CFLAGS= CXXFLAGS="-std=gnu++98 -fno-lifetime-dse" ./configure $(confflags) --enable-superserver + export $(shell dpkg-buildflags --export=cmdline); CFLAGS= CXXFLAGS="$$CXXFLAGS -std=gnu++98 -fno-lifetime-dse" ./configure $(confflags) --enable-superserver awk '/^# stored/, /^fb_version/ { print }' gen/firebird/bin/fb_config @@ -132,7 +132,7 @@ -sh debian/clean-after-build.sh chmod u+x ./configure - CFLAGS= CXXFLAGS="-std=gnu++98 -fno-lifetime-dse" ./configure $(confflags) + export $(shell dpkg-buildflags --export=cmdline); CFLAGS= CXXFLAGS="$$CXXFLAGS -std=gnu++98 -fno-lifetime-dse" ./configure $(confflags) touch $@ @@ -171,7 +171,7 @@ echo Starting build-super-server dh_testdir [ -d $(FIREBIRD_TMP) ] || mkdir $(FIREBIRD_TMP) - $(shell dpkg-buildflags --export=sh); export CXXFLAGS="$$(CXXFLAGS) -std=gnu++98 -fno-lifetime-dse"; $(MAKE) $(NJOBS) + export $(shell dpkg-buildflags --export=cmdline); export CXXFLAGS="$$CXXFLAGS -std=gnu++98 -fno-lifetime-dse"; $(MAKE) $(NJOBS) # moving to SuperServer target rm -rf ./debian/firebird-super @@ -196,7 +196,7 @@ echo Starting build-classic-server dh_testdir [ -d $(FIREBIRD_TMP) ] || mkdir $(FIREBIRD_TMP) - $(shell dpkg-buildflags --export=sh); export CXXFLAGS="$$(CXXFLAGS) -std=gnu++98 -fno-lifetime-dse"; $(MAKE) $(NJOBS) + export $(shell dpkg-buildflags --export=cmdline); export CXXFLAGS="$$CXXFLAGS -std=gnu++98 -fno-lifetime-dse"; $(MAKE) $(NJOBS) # moving to ClassicServer target rm -rf ./debian/firebird-classic