rev 10442 - in trunk/packages/qt4-x11/debian: . patches

Modestas Vainius modax-guest at alioth.debian.org
Fri May 2 16:37:50 UTC 2008


Author: modax-guest
Date: 2008-05-02 16:37:50 +0000 (Fri, 02 May 2008)
New Revision: 10442

Removed:
   trunk/packages/qt4-x11/debian/patches/11_qdbus_to_dbus_fix.diff
   trunk/packages/qt4-x11/debian/patches/16_always_init_qt_x11data_ptrx.diff
Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff
   trunk/packages/qt4-x11/debian/patches/series
   trunk/packages/qt4-x11/debian/rules
Log:
Some updates for 4.4.0

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2008-05-02 14:51:12 UTC (rev 10441)
+++ trunk/packages/qt4-x11/debian/changelog	2008-05-02 16:37:50 UTC (rev 10442)
@@ -1,6 +1,6 @@
 qt4-x11 (4.4.0-1) UNRELEASED; urgency=low
 
-  * New upstream release (rumoured, but source N/A yet).
+  * New upstream release.
 
   +++ Changes by Modestas Vainius:
 
@@ -18,8 +18,13 @@
   * Use ${binary:Version} instead of ${source:Version} in dependences of
     libqt4-core and libqt4-gui transitional packages.
   * Require just libqtcore4 to install libqt4-dbg instead of libqt4-gui.
+  * Resync patches:
+    - 05_append_qt4_target.diff - fix offsets.
+    - 11_qdbus_to_dbus_fix.diff - remove, fixed upstream.
+    - Revert to "runtime" configuration for xcursor, xinerama, xfixes and drop
+      16_always_init_qt_x11data_ptrx.diff patch. Fixed upstream.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 01 May 2008 13:39:50 +0300
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 02 May 2008 19:30:48 +0300
 
 qt4-x11 (4.4.0~rc1-5) unstable; urgency=high
 

Modified: trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff	2008-05-02 14:51:12 UTC (rev 10441)
+++ trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff	2008-05-02 16:37:50 UTC (rev 10442)
@@ -66,7 +66,7 @@
      echo "Creating qmake. Please wait..."
  
      OLD_QCONFIG_H=
-@@ -5999,8 +5999,8 @@
+@@ -6012,8 +6012,8 @@
  QMAKE_MOC_SRC    = \$\$QT_BUILD_TREE/src/moc
  
  #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
@@ -77,7 +77,7 @@
  QMAKE_UIC3       = \$\$QT_BUILD_TREE/bin/uic3
  QMAKE_RCC        = \$\$QT_BUILD_TREE/bin/rcc
  QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
-@@ -6300,11 +6300,11 @@
+@@ -6313,11 +6313,11 @@
  #-------------------------------------------------------------------------------
  
  echo "Finding project files. Please wait..."
@@ -91,7 +91,7 @@
  fi
  
  # .projects      -> projects to process
-@@ -6477,7 +6477,7 @@
+@@ -6490,7 +6490,7 @@
              echo "  for $a\c"
          fi
  

Deleted: trunk/packages/qt4-x11/debian/patches/11_qdbus_to_dbus_fix.diff

Deleted: trunk/packages/qt4-x11/debian/patches/16_always_init_qt_x11data_ptrx.diff

Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series	2008-05-02 14:51:12 UTC (rev 10441)
+++ trunk/packages/qt4-x11/debian/patches/series	2008-05-02 16:37:50 UTC (rev 10442)
@@ -21,11 +21,9 @@
 07_trust_dpkg-arch_over_uname-m.diff
 09_qmake_lflags_as-needed.diff
 10_config_tests_fixes.diff
-11_qdbus_to_dbus_fix.diff
 12_fix_qmake_pkgconfig.diff
 14_add_libraries_to_gui_build_where_actually_needed.diff
 15_fix_qmake_makefile_generation.diff
-16_always_init_qt_x11data_ptrx.diff
 20_mips_atomic_ops.diff
 40_alpha_ice.diff
 41_disable_opengl_visibility.diff

Modified: trunk/packages/qt4-x11/debian/rules
===================================================================
--- trunk/packages/qt4-x11/debian/rules	2008-05-02 14:51:12 UTC (rev 10441)
+++ trunk/packages/qt4-x11/debian/rules	2008-05-02 16:37:50 UTC (rev 10442)
@@ -94,9 +94,6 @@
 	            -system-libpng \
 	            -system-libjpeg \
 	            -system-nas-sound \
-	            -xfixes \
-	            -xcursor \
-	            -xinerama \
 	            -qt-gif \
 	            -plugin-sql-mysql \
 	            -plugin-sql-odbc \




More information about the pkg-kde-commits mailing list