[SCM] Qt 4 packaging branch, master, updated. debian/4.7.1-2-21-ge9b94c8

[Fathi Boudra]

The following commit has been merged in the master branch:
commit 7eecb8b60f5735177afd8405845809cbc519be3a
Author: Fathi Boudra <fabo at debian.org>
Date:   Sun Mar 6 09:15:45 2011 +0200

    Add buildable_appchooser_states_demos.patch - images files aren't shipped
    (Closes: #616500)
---
 debian/changelog                                   |    3 ++
 .../buildable_appchooser_states_demos.patch        |   29 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 33 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 40e9448..c08d887 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,9 @@ qt4-x11 (4:4.7.2-1) UNRELEASED; urgency=low
       upstream.
     - 17_add_postgresql_8.3_support.diff - fixed upstream.
     - 22_use___GLIBC__.diff - merged upstream.
+  * Add patches:
+    - buildable_appchooser_states_demos.patch - images files aren't shipped
+      (Closes: #616500)
   * Update symbols files.
   * Update debian/rules:
     - remove catalan translation, obsolete and should have been contributed
diff --git a/debian/patches/buildable_appchooser_states_demos.patch b/debian/patches/buildable_appchooser_states_demos.patch
new file mode 100644
index 0000000..dcaa602
--- /dev/null
+++ b/debian/patches/buildable_appchooser_states_demos.patch
@@ -0,0 +1,29 @@
+Description: make states and appchooser demos buildable
+Bug-Debian: http://bugs.debian.org/616500
+Author: Fathi Boudra <fabo at debian.org>
+Last-Update: 2011-03-05
+--- a/examples/animation/appchooser/appchooser.pro
++++ b/examples/animation/appchooser/appchooser.pro
+@@ -3,7 +3,8 @@ RESOURCES = appchooser.qrc
+ 
+ # install
+ target.path = $$[QT_INSTALL_EXAMPLES]/animation/appchooser
+-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS appchooser.pro
++sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS appchooser.pro \
++                accessories-dictionary.png akregator.png digikam.png k3b.png
+ sources.path = $$[QT_INSTALL_EXAMPLES]/animation/appchooser
+ INSTALLS += target sources
+ 
+--- a/examples/animation/states/states.pro
++++ b/examples/animation/states/states.pro
+@@ -3,7 +3,9 @@ RESOURCES += states.qrc
+ 
+ # install
+ target.path = $$[QT_INSTALL_EXAMPLES]/animation/states
+-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS states.pro
++sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS states.pro \
++                accessories-dictionary.png akregator.png digikam.png \
++                help-browser.png k3b.png kchart.png
+ sources.path = $$[QT_INSTALL_EXAMPLES]/animation/states
+ INSTALLS += target sources
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 63aff5f..9090b32 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,6 +5,7 @@
 0225-invalidate-tabbar-geometry-on-refresh.patch
 
 # debian patches
+buildable_appchooser_states_demos.patch
 01_debian_append_qt4_suffix.diff
 02_syncqt_sane_timestamp_for_nonexisting_headers.diff
 07_trust_dpkg-arch_over_uname-m.diff

-- 
Qt 4 packaging