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

[Fathi Boudra]

The following commit has been merged in the experimental-snapshots branch:
commit 15b43d4b712d83f496c77555821096ef35fe0f3a
Author: Fathi Boudra <fabo at debian.org>
Date:   Sun Jan 17 11:56:25 2010 +0100

    Add Qt Virtual Framebuffer (qvfb) tool to qt4-dev-tools package.
---
 debian/changelog                    |    4 ++++
 debian/control                      |    5 +++--
 debian/not-installed                |    4 ----
 debian/patches/20_install_qvfb.diff |   13 +++++++++++++
 debian/patches/series               |    1 +
 debian/qt4-dev-tools.install        |    5 +++++
 debian/rules                        |    1 +
 7 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1d2c0bc..bd0d1d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,10 +21,14 @@ qt4-x11 (4:4.6.0-2) UNRELEASED; urgency=low
     segfault. Thanks to Steve Langasek.
   * Add cherry-picked patch 97_prevent_crash_on_inputcontext_creation.diff:
     Prevent a crash when creating an inputContext from the QApplication dtor.
+  * Add 20_install_qvfb.diff: build Qt Virtual Framebuffer (qvfb) tool.
   * Update debian/control:
     - build-depend on firebird2.1-dev instead of firebird2.0-dev.
       (Closes: #564683)
     - extend architecture list for firebird2.1-dev.
+    - build-depend on libxtst-dev to build qvfb.
+  * Update debian/qt4-dev-tools.install: add qvfb binary and the translations.
+  * Update debian/rules: add -qvfb configure option.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 13 Dec 2009 18:43:29 +0200
 
diff --git a/debian/control b/debian/control
index 3ed8118..c41afee 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, freetds-dev
+ libxtst-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
@@ -508,7 +508,8 @@ Description: Qt 4 development tools
  is its rich set of widgets that provide standard GUI functionality.
  .
  This package contains tools used to assist in Qt 4 development, including
- the Qt Assistant, Linguist, D-Bus Viewer and Pixel Tool applications.
+ the Qt Assistant, Linguist, D-Bus Viewer, Pixel Tool and Qt Virtual
+ Framebuffer applications.
 
 Package: qt4-qmake
 Architecture: any
diff --git a/debian/not-installed b/debian/not-installed
index ffa6de4..a9172ed 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -16,7 +16,3 @@
 ./usr/lib/libQtXml.la
 ./usr/lib/libQtXmlPatterns.la
 ./usr/lib/libphonon.la
-./usr/share/qt4/translations/qvfb_pl.qm
-./usr/share/qt4/translations/qvfb_ru.qm
-./usr/share/qt4/translations/qvfb_zh_CN.qm
-./usr/share/qt4/translations/qvfb_zh_TW.qm
diff --git a/debian/patches/20_install_qvfb.diff b/debian/patches/20_install_qvfb.diff
new file mode 100644
index 0000000..57d02af
--- /dev/null
+++ b/debian/patches/20_install_qvfb.diff
@@ -0,0 +1,13 @@
+Description: build qvfb tool
+Author: Fathi Boudra <fabo at debian.org>
+
+--- a/tools/tools.pro
++++ b/tools/tools.pro
+@@ -15,6 +15,7 @@ no-png {
+      }
+      SUBDIRS     += linguist
+      SUBDIRS     += qdoc3
++     SUBDIRS     += qvfb
+      symbian: SUBDIRS = designer
+      wince*: SUBDIRS = qtestlib designer
+      unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
diff --git a/debian/patches/series b/debian/patches/series
index fd3d4c5..cb40558 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,6 +23,7 @@
 17_add_postgresql_8.3_support.diff
 18_enable_qt3support_qtwebkit_debug_info.diff
 19_install_qdoc3.diff
+20_install_qvfb.diff
 30_webkit_unaligned_access.diff
 40_alpha_ice.diff
 41_disable_opengl_visibility.diff
diff --git a/debian/qt4-dev-tools.install b/debian/qt4-dev-tools.install
index 11795af..71a6493 100644
--- a/debian/qt4-dev-tools.install
+++ b/debian/qt4-dev-tools.install
@@ -9,6 +9,7 @@ usr/bin/qdoc3
 usr/bin/qhelpconverter
 usr/bin/qhelpgenerator
 usr/bin/qttracereplay
+usr/bin/qvfb
 usr/bin/xmlpatterns
 usr/bin/xmlpatternsvalidator
 usr/share/qt4/phrasebooks/*
@@ -33,3 +34,7 @@ usr/share/qt4/translations/linguist_pl.qm
 usr/share/qt4/translations/linguist_ru.qm
 usr/share/qt4/translations/linguist_zh_CN.qm
 usr/share/qt4/translations/linguist_zh_TW.qm
+usr/share/qt4/translations/qvfb_pl.qm
+usr/share/qt4/translations/qvfb_ru.qm
+usr/share/qt4/translations/qvfb_zh_CN.qm
+usr/share/qt4/translations/qvfb_zh_TW.qm
diff --git a/debian/rules b/debian/rules
index fd2d9da..c423865 100755
--- a/debian/rules
+++ b/debian/rules
@@ -112,6 +112,7 @@ endif
 	            -system-nas-sound \
 	            -lfontconfig \
 	            -I/usr/include/freetype2 \
+	            -qvfb \
 	            $(extra_configure_opts)
 
 override_dh_auto_build:

-- 
Qt 4 Debian packaging