[SCM] Qt 4 Debian packaging branch, master, updated. debian/4.6.3-1-1-gca6b629

[Fathi Boudra]

The following commit has been merged in the master branch:
commit ca6b629628ec8fe37121f8dfbcc40f8033ee1cfc
Author: Fathi Boudra <fabo at debian.org>
Date:   Thu Jun 17 09:05:10 2010 +0300

    Add upstream patch: 0005_fix_detection_of_headers_files.diff
---
 debian/changelog                                   |   11 ++++++
 .../0005_fix_detection_of_headers_files.diff       |   39 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 51 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 320eb3d..742989e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+qt4-x11 (4:4.6.3-2) UNRELEASED; urgency=low
+
+  * Add upstream patch:
+    - 0005_fix_detection_of_headers_files.diff
+      Disable the include generation iff a dot which is not followed by [hH]
+      is found after the last path separator. This implies that dots in
+      directory names are now ignored, and that files without an extension are
+      always considered headers (e.g., STL headers and Qt forwarding headers).
+
+ -- Fathi Boudra <fabo at debian.org>  Thu, 17 Jun 2010 09:03:32 +0300
+
 qt4-x11 (4:4.6.3-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/0005_fix_detection_of_headers_files.diff b/debian/patches/0005_fix_detection_of_headers_files.diff
new file mode 100644
index 0000000..bff5c62
--- /dev/null
+++ b/debian/patches/0005_fix_detection_of_headers_files.diff
@@ -0,0 +1,39 @@
+From 78e74249014b152b93dae07bf194b16769016ad0 Mon Sep 17 00:00:00 2001
+From: David Fries <david at fries.net>
+Date: Mon, 14 Jun 2010 13:57:46 +0200
+Subject: [PATCH] fix detection of header files
+
+Disable the include generation iff a dot which is not followed by [hH]
+is found after the last path separator. This implies that dots in
+directory names are now ignored, and that files without an extension are
+always considered headers (e.g., STL headers and Qt forwarding headers).
+
+Task-number: QTBUG-11369
+Merge-request: 686
+Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen at nokia.com>
+---
+ src/tools/moc/main.cpp |    7 +++----
+ 1 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/tools/moc/main.cpp b/src/tools/moc/main.cpp
+index ebe1834..4997690 100644
+--- a/src/tools/moc/main.cpp
++++ b/src/tools/moc/main.cpp
+@@ -359,11 +359,10 @@ int runMoc(int _argc, char **_argv)
+ 
+ 
+     if (autoInclude) {
++        int spos = filename.lastIndexOf(QDir::separator().toLatin1());
+         int ppos = filename.lastIndexOf('.');
+-        moc.noInclude = (ppos >= 0
+-                         && tolower(filename[ppos + 1]) != 'h'
+-                         && tolower(filename[ppos + 1]) != QDir::separator().toLatin1()
+-                        );
++        // spos >= -1 && ppos > spos => ppos >= 0
++        moc.noInclude = (ppos > spos && tolower(filename[ppos + 1]) != 'h');
+     }
+     if (moc.includeFiles.isEmpty()) {
+         if (moc.includePath.isEmpty()) {
+-- 
+1.6.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 51b310e..953b713 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 # upstream patches
 0004_problem_displaying_half_width_character.diff
+0005_fix_detection_of_headers_files.diff
 
 # qt-copy patches
 0180-window-role.diff

-- 
Qt 4 Debian packaging