[SCM] Qt 4 Debian packaging branch, experimental-snapshots, updated. debian/4.6.0-rc1-1-4-g6274906

[Fathi Boudra]

The following commit has been merged in the experimental-snapshots branch:
commit 62749063c2df184698a32396eefd53500a18b197
Author: Fathi Boudra <fabo at debian.org>
Date:   Tue Dec 1 20:27:30 2009 +0100

    Add libqt4-sql-tds package
---
 debian/changelog              |    7 ++++++-
 debian/control                |   13 ++++++++++++-
 debian/libqt4-help.install    |    1 +
 debian/libqt4-sql-tds.install |    1 +
 debian/qt4-designer.install   |    1 +
 debian/qt4-dev-tools.install  |    1 +
 debian/rules                  |    1 +
 7 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 842e225..f70b54d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
-qt4-x11 (4:4.6.0-1) UNRELEASED; urgency=low
+qt4-x11 (4:4.6.0-1) experimental; urgency=low
 
   * New upstream release.
 
+  +++ Changes by Fathi Boudra:
+
+  * Add french translations.
+  * Merge with Kubuntu: add libqt4-sql-tds plugin.
+
   +++ Changes by Frederik Schwarzer:
 
   * Fix typos in package descriptions.
diff --git a/debian/control b/debian/control
index efdca01..3334550 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 7.2), quilt, pkg-kde-tools (>= 0.4), flex, sharutil
  libsm-dev, libsqlite0-dev, libsqlite3-dev, libtiff4-dev, libx11-dev,
  libxcursor-dev, libxext-dev, libxft-dev, libxi-dev, libxinerama-dev,
  libxmu-dev, libxrandr-dev, libxrender-dev, libxslt1-dev, libxt-dev,
- x11proto-core-dev, zlib1g-dev
+ x11proto-core-dev, zlib1g-dev, freetds-dev
 Standards-Version: 3.8.3
 Homepage: http://www.qtsoftware.com
 Vcs-Git: git://git.debian.org/pkg-kde/qt4-x11.git
@@ -205,6 +205,17 @@ Description: Qt 4 SQLite 2 database driver
  Install it if you intend to use or write Qt programs that are to access an
  SQLite 2 DB.
 
+Package: libqt4-sql-tds
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: libqt4-dev
+Description: Qt 4 FreeTDS database driver
+ This package contains the FreeTDS plugin for Qt 4.
+ .
+ Install it if you intend to use or write Qt programs that are to access a
+ MS SQL or Sybase SQL server.
+
 Package: libqt4-svg
 Architecture: any
 Section: libs
diff --git a/debian/libqt4-help.install b/debian/libqt4-help.install
index aef0b4c..6bcdc79 100644
--- a/debian/libqt4-help.install
+++ b/debian/libqt4-help.install
@@ -1,6 +1,7 @@
 usr/lib/libQtHelp.so.*
 usr/share/qt4/translations/qt_help_da.qm
 usr/share/qt4/translations/qt_help_de.qm
+usr/share/qt4/translations/qt_help_fr.qm
 usr/share/qt4/translations/qt_help_ja.qm
 usr/share/qt4/translations/qt_help_pl.qm
 usr/share/qt4/translations/qt_help_ru.qm
diff --git a/debian/libqt4-sql-tds.install b/debian/libqt4-sql-tds.install
new file mode 100644
index 0000000..6f70205
--- /dev/null
+++ b/debian/libqt4-sql-tds.install
@@ -0,0 +1 @@
+usr/lib/qt4/plugins/sqldrivers/libqsqltds.so
diff --git a/debian/qt4-designer.install b/debian/qt4-designer.install
index df4f8f0..1c9cde8 100644
--- a/debian/qt4-designer.install
+++ b/debian/qt4-designer.install
@@ -1,5 +1,6 @@
 usr/bin/designer-qt4
 usr/share/qt4/translations/designer_de.qm
+usr/share/qt4/translations/designer_fr.qm
 usr/share/qt4/translations/designer_ja.qm
 usr/share/qt4/translations/designer_pl.qm
 usr/share/qt4/translations/designer_ru.qm
diff --git a/debian/qt4-dev-tools.install b/debian/qt4-dev-tools.install
index f60c2c7..11795af 100644
--- a/debian/qt4-dev-tools.install
+++ b/debian/qt4-dev-tools.install
@@ -20,6 +20,7 @@ usr/share/qt4/translations/assistant_adp_zh_CN.qm
 usr/share/qt4/translations/assistant_adp_zh_TW.qm
 usr/share/qt4/translations/assistant_da.qm
 usr/share/qt4/translations/assistant_de.qm
+usr/share/qt4/translations/assistant_fr.qm
 usr/share/qt4/translations/assistant_ja.qm
 usr/share/qt4/translations/assistant_pl.qm
 usr/share/qt4/translations/assistant_ru.qm
diff --git a/debian/rules b/debian/rules
index 45d0d3b..2e7adf0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -82,6 +82,7 @@ endif
 	            -plugin-sql-psql \
 	            -plugin-sql-sqlite \
 	            -plugin-sql-sqlite2 \
+	            -plugin-sql-tds \
 	            -system-sqlite \
 	            -xmlpatterns \
 	            -multimedia \

-- 
Qt 4 Debian packaging