[SCM] Qt 4 packaging branch, experimental-snapshots, updated. debian/4.7.3-1-7-g0470728

[Fathi Boudra]

The following commit has been merged in the experimental-snapshots branch:
commit 408ae7c451c4b9b8391b09f2c32c447503848261
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Dec 5 18:50:36 2010 +0200

    Patch bin/synqt to generate sane timestamp for symlinks of non existing headers.
    
    This is needed to avoid timestamp screw up for the QtConfig header-symlink file
    because ./configure runs syncqt before it generates qconfig.h file. Patch
    02_syncqt_sane_timestamp_for_nonexisting_headers.diff.
    
    Also do not run syncqt manually before ./configure in debian/rules. Simply
    remove include directory forcing ./configure to run syncqt for us.
---
 debian/changelog                                   |    6 +++++
 ...cqt_sane_timestamp_for_nonexisting_headers.diff |   22 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 debian/rules                                       |    5 ++-
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cb59570..e5cce0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -66,6 +66,12 @@ qt4-x11 (4:4.7.1-1) UNRELEASED; urgency=low
   * Backport patch 0001_backport_e3f1268_alsa_buffer_overrun.diff to fix
     potential buffer overrun in ALSA QAudioInput implementation. Thanks to
     Gregor Herrmann for heads up. (Closes: #603052)
+  * Patch bin/synqt to generate sane timestamp for symlinks of non existing
+    headers. This is needed to avoid timestamp screw up for QtConfig
+    header-symlink file.
+    Patch 02_syncqt_sane_timestamp_for_nonexisting_headers.diff.
+  * Do not run syncqt before ./configure in debian/rules. Simply remove include
+    directory forcing ./configure to run syncqt for us.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 05 Dec 2010 15:34:27 +0100
 
diff --git a/debian/patches/02_syncqt_sane_timestamp_for_nonexisting_headers.diff b/debian/patches/02_syncqt_sane_timestamp_for_nonexisting_headers.diff
new file mode 100644
index 0000000..196b741
--- /dev/null
+++ b/debian/patches/02_syncqt_sane_timestamp_for_nonexisting_headers.diff
@@ -0,0 +1,22 @@
+From: Modestas Vainius <modax at debian.org>
+Subject: set sane timestamps when generating header symlinks for non-existing headers
+Forwarded: no
+Origin: vendor
+Last-Update: 2010-12-05
+
+This is particularly important for QtCore/QtConfig symlink because typically
+qconfig.h does not exist when syncqt is run by ./configure. So instead of
+assigning a modification timestamp equal to the epoch (00:00 January 1, 1970
+GMT.) for the symlink, just use current time().
+
+--- a/bin/syncqt
++++ b/bin/syncqt
+@@ -828,7 +828,7 @@ foreach my $lib (@modules_to_sync) {
+                             print "SYMBOL: $_
";
+                         }
+                     } else {
+-                        my $ts = (stat($iheader))[9];
++                        my $ts = (-e $iheader) ? (stat($iheader))[9] : time;
+                         #find out all the places it goes..
+                         my @headers;
+                         if ($public_header) {
diff --git a/debian/patches/series b/debian/patches/series
index 0a551cf..7caec6e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,6 +7,7 @@
 
 # debian patches
 01_debian_append_qt4_suffix.diff
+02_syncqt_sane_timestamp_for_nonexisting_headers.diff
 07_trust_dpkg-arch_over_uname-m.diff
 08_configure_quilt_compat.diff
 10_config_tests_fixes.diff
diff --git a/debian/rules b/debian/rules
index 146e4a4..0cb618c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -73,8 +73,9 @@ endif
 	rm -rf mkspecs/glibc-g++
 	cp -a mkspecs/linux-g++ mkspecs/glibc-g++
 
-	# Generate include
-	rm -rf include && QTDIR="." perl bin/syncqt
+	# Remove include directory. Then ./configure will take care of calling
+	# syncqt and regenerating it.
+	rm -rf include
 
 	./configure -confirm-license \
 	            -prefix "/usr" \

-- 
Qt 4 packaging