[SCM] Qt 4 packaging branch, master, updated. debian/4.7.3-8-30-g746d167

[Fathi Boudra]

The following commit has been merged in the master branch:
commit a9110cbc2690e782f307971e8e51bfa73d69b6f9
Author: Fathi Boudra <fabo at debian.org>
Date:   Tue Dec 27 14:30:07 2011 +0200

    Refresh patches
---
 ...cqt_sane_timestamp_for_nonexisting_headers.diff |    2 +-
 ...low-QTDIR-to-contain-regex-metacharacters.patch |   14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/patches/02_syncqt_sane_timestamp_for_nonexisting_headers.diff b/debian/patches/02_syncqt_sane_timestamp_for_nonexisting_headers.diff
index 4ed2840..3c4c5dd 100644
--- a/debian/patches/02_syncqt_sane_timestamp_for_nonexisting_headers.diff
+++ b/debian/patches/02_syncqt_sane_timestamp_for_nonexisting_headers.diff
@@ -15,7 +15,7 @@ GMT.) for the symlink, just use current time().
 
 --- a/bin/syncqt
 +++ b/bin/syncqt
-@@ -832,7 +832,7 @@ foreach my $lib (@modules_to_sync) {
+@@ -831,7 +831,7 @@ foreach my $lib (@modules_to_sync) {
                              print "SYMBOL: $_
";
                          }
                      } else {
diff --git a/debian/patches/Bug-fix-Allow-QTDIR-to-contain-regex-metacharacters.patch b/debian/patches/Bug-fix-Allow-QTDIR-to-contain-regex-metacharacters.patch
index 94faa9f..55fa107 100644
--- a/debian/patches/Bug-fix-Allow-QTDIR-to-contain-regex-metacharacters.patch
+++ b/debian/patches/Bug-fix-Allow-QTDIR-to-contain-regex-metacharacters.patch
@@ -11,11 +11,11 @@ Merge-Request: 506
 Reviewed-by: Zeno Albisser
 ---
  bin/syncqt |   17 ++++++++---------
- 1 files changed, 8 insertions(+), 9 deletions(-)
+ 1 file changed, 8 insertions(+), 9 deletions(-)
 
 --- a/bin/syncqt
 +++ b/bin/syncqt
-@@ -75,6 +75,7 @@
+@@ -75,6 +75,7 @@ my @modules_to_sync ;
  $force_relative = 1 if ( -d "/System/Library/Frameworks" );
  my $out_basedir = $basedir;
  $out_basedir =~ s=\=/=g;
@@ -23,7 +23,7 @@ Reviewed-by: Zeno Albisser
  
  # functions ----------------------------------------------------------
  
-@@ -350,11 +351,9 @@
+@@ -352,11 +353,9 @@ sub syncHeader {
  ######################################################################
  sub fixPaths {
      my ($file, $dir) = @_;
@@ -36,7 +36,7 @@ Reviewed-by: Zeno Albisser
  
      #setup
      my $ret = $file;
-@@ -378,7 +377,7 @@
+@@ -380,7 +379,7 @@ sub fixPaths {
          my $slash = index($file_dir, "/", $i);
          last if($slash == -1);
          my $tmp = substr($file_dir, 0, $slash);
@@ -45,7 +45,7 @@ Reviewed-by: Zeno Albisser
          $match_dir = $tmp;
          $i = $slash;
      }
-@@ -389,7 +388,7 @@
+@@ -391,7 +390,7 @@ sub fixPaths {
          for(my $i = 0; $i < $count; $i++) {
              $dots .= "../";
          }
@@ -54,7 +54,7 @@ Reviewed-by: Zeno Albisser
      }
      $ret =~ s,/+,/,g;
      return $ret;
-@@ -507,13 +506,13 @@
+@@ -509,13 +508,13 @@ sub symlinkFile
  
      if ($isunix) {
          print "symlink created for $file " unless $quiet;
@@ -71,7 +71,7 @@ Reviewed-by: Zeno Albisser
              print " ($file)
" unless $quiet;
          }
          print "
" unless $quiet;
-@@ -837,7 +836,7 @@
+@@ -839,7 +838,7 @@ foreach my $lib (@modules_to_sync) {
                              @headers = ( "$out_basedir/include/$lib/$header" );
  
                              # write forwarding headers to include/Qt

-- 
Qt 4 packaging