[SCM] Qt 4 packaging branch, experimental-snapshots, updated. debian/4.7.3-1-7-g0470728

[Fathi Boudra]

The following commit has been merged in the experimental-snapshots branch:
commit e472c99e3dbf919cf678c6753eacbeb8d53187ec
Author: Fathi Boudra <fabo at debian.org>
Date:   Fri Mar 4 18:05:16 2011 +0200

    Remove 17_add_postgresql_8.3_support.diff - fixed upstream.
---
 debian/changelog                                  |    1 +
 debian/patches/17_add_postgresql_8.3_support.diff |   52 ---------------------
 debian/patches/series                             |    1 -
 3 files changed, 1 insertions(+), 53 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3498dde..3f81680 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ qt4-x11 (4:4.7.2-1) UNRELEASED; urgency=low
     - 0001_backport_e3f1268_alsa_buffer_overrun.diff - stolen upstream.
     - 0002_backport_6ae84f1_fix_QTextEdit_selectAll_crash.diff - stolen
       upstream.
+    - 17_add_postgresql_8.3_support.diff - fixed upstream.
     - 22_use___GLIBC__.diff - merged upstream.
   * Update symbols files.
 
diff --git a/debian/patches/17_add_postgresql_8.3_support.diff b/debian/patches/17_add_postgresql_8.3_support.diff
deleted file mode 100644
index 5f7496b..0000000
--- a/debian/patches/17_add_postgresql_8.3_support.diff
+++ /dev/null
@@ -1,52 +0,0 @@
-Description: Enable PostgreSQL 8.3 and 8.4 support.
-
---- a/src/sql/drivers/psql/qsql_psql.cpp
-+++ b/src/sql/drivers/psql/qsql_psql.cpp
-@@ -656,9 +656,15 @@ static QPSQLDriver::Protocol getPSQLVers
-                     serverVersion = QPSQLDriver::Version81;
-                     break;
-                 case 2:
--                default:
-                     serverVersion = QPSQLDriver::Version82;
-                     break;
-+                case 3:
-+                    serverVersion = QPSQLDriver::Version83;
-+                    break;
-+                case 4:
-+                default:
-+                    serverVersion = QPSQLDriver::Version84;
-+                    break;
-                 }
-                 break;
-             default:
-@@ -963,6 +969,8 @@ QSqlIndex QPSQLDriver::primaryIndex(cons
-     case QPSQLDriver::Version8:
-     case QPSQLDriver::Version81:
-     case QPSQLDriver::Version82:
-+    case QPSQLDriver::Version83:
-+    case QPSQLDriver::Version84:
-         stmt = QLatin1String("SELECT pg_attribute.attname, pg_attribute.atttypid::int, "
-                 "pg_class.relname "
-                 "FROM pg_attribute, pg_class "
-@@ -1046,6 +1054,8 @@ QSqlRecord QPSQLDriver::record(const QSt
-     case QPSQLDriver::Version8:
-     case QPSQLDriver::Version81:
-     case QPSQLDriver::Version82:
-+    case QPSQLDriver::Version83:
-+    case QPSQLDriver::Version84:
-         stmt = QLatin1String("select pg_attribute.attname, pg_attribute.atttypid::int, "
-                 "pg_attribute.attnotnull, pg_attribute.attlen, pg_attribute.atttypmod, "
-                 "pg_attrdef.adsrc "
---- a/src/sql/drivers/psql/qsql_psql.h
-+++ b/src/sql/drivers/psql/qsql_psql.h
-@@ -104,7 +104,9 @@ public:
-         Version74 = 10,
-         Version8 = 11,
-         Version81 = 12,
--        Version82 = 13
-+        Version82 = 13,
-+        Version83 = 14,
-+        Version84 = 15
-     };
- 
-     explicit QPSQLDriver(QObject *parent=0);
diff --git a/debian/patches/series b/debian/patches/series
index 66060e4..63aff5f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,7 +14,6 @@
 12_add_nostrip_for_debug_packages.diff
 15_fix_qmake_makefile_generation.diff
 16_hide_std_symbols_on_qtwebkit.diff
-17_add_postgresql_8.3_support.diff
 18_enable_qt3support_qtwebkit_debug_info.diff
 20_install_qvfb.diff
 21_qt_ia32_library_path.diff

-- 
Qt 4 packaging