[SCM] qtruby packaging branch, master, updated. 89bf7da51083f9d6b7c43eeb4671c28b53130776

[Pino Toscano]

The following commit has been merged in the master branch:
commit 89bf7da51083f9d6b7c43eeb4671c28b53130776
Author: Pino Toscano <pino at debian.org>
Date:   Thu Aug 25 13:13:15 2011 +0200

    backport upstream fix-QtDeclarative-cmake-variable.patch
    
    ... to fix the linking of the qtdeclarative module
---
 debian/changelog                                   |    2 +
 .../patches/fix-QtDeclarative-cmake-variable.patch |   25 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1a1fb40..6c6080d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,8 @@ qtruby (4:4.7.0-0r1) UNRELEASED; urgency=low
     - strip sequence numbers from the filenames
     - refresh
     - add DEP-3 headers for patches which didn't have them
+    - backport upstream fix-QtDeclarative-cmake-variable.patch to fix the
+      linking of the qtdeclarative module
   * Install the examples for qscintilla and qttest.
   * Compress all the examples installed by ruby-qt4 in a single example.tar.gz
     archive, reducing the space they take.
diff --git a/debian/patches/fix-QtDeclarative-cmake-variable.patch b/debian/patches/fix-QtDeclarative-cmake-variable.patch
new file mode 100644
index 0000000..d12205a
--- /dev/null
+++ b/debian/patches/fix-QtDeclarative-cmake-variable.patch
@@ -0,0 +1,25 @@
+From 45c2835df2b6c6174bbd7620c276276359c8364c Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Sun, 14 Aug 2011 16:59:37 +0200
+Subject: [PATCH] fix QtDeclarative cmake variable
+
+---
+ modules/qtdeclarative/CMakeLists.txt |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/modules/qtdeclarative/CMakeLists.txt b/modules/qtdeclarative/CMakeLists.txt
+index 400ac24..f4fd1cd 100644
+--- a/modules/qtdeclarative/CMakeLists.txt
++++ b/modules/qtdeclarative/CMakeLists.txt
+@@ -4,7 +4,7 @@ INCLUDE_DIRECTORIES (${QT_INCLUDES})
+ set(rubyqtdeclarative_LIBRARY_SRC qtdeclarative.cpp qtdeclarativehandlers.cpp)
+ add_library(rubyqtdeclarative MODULE ${rubyqtdeclarative_LIBRARY_SRC})
+ target_link_libraries(rubyqtdeclarative
+-    ${QT_QTWEBKIT_LIBRARY}
++    ${QT_QTDECLARATIVE_LIBRARY}
+     ${SMOKE_QTDECLARATIVE_LIBRARY}
+     qtruby4shared
+ )
+-- 
+1.7.5.4
+
diff --git a/debian/patches/series b/debian/patches/series
index aa9ef00..6dcd101 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 use_ruby1.8.diff
 fix_ruby_requires.diff
+fix-QtDeclarative-cmake-variable.patch

-- 
qtruby packaging