rev 3334 - in trunk/packages/qt-x11-free/debian: . maintain/man patches

Christopher Martin chrsmrtn at costa.debian.org
Thu Mar 23 00:46:59 UTC 2006


Author: chrsmrtn
Date: 2006-03-23 00:46:56 +0000 (Thu, 23 Mar 2006)
New Revision: 3334

Removed:
   trunk/packages/qt-x11-free/debian/patches/30_qtc_qtoolbar_77047.dpatch
   trunk/packages/qt-x11-free/debian/patches/33_qgpluginmanager.dpatch
Modified:
   trunk/packages/qt-x11-free/debian/changelog
   trunk/packages/qt-x11-free/debian/libqt3-mt-dev.links
   trunk/packages/qt-x11-free/debian/libqt3-mt.links
   trunk/packages/qt-x11-free/debian/maintain/man/linguist.1
   trunk/packages/qt-x11-free/debian/patches/00list
   trunk/packages/qt-x11-free/debian/patches/25_qtc_qpixmap_mitshm.dpatch
   trunk/packages/qt-x11-free/debian/patches/45_immodule_unified.dpatch
   trunk/packages/qt-x11-free/debian/rules
Log:
Update for 3.3.6.

My adaptation of the immodule patch is dodgy, and I don't trust it.


Modified: trunk/packages/qt-x11-free/debian/changelog
===================================================================
--- trunk/packages/qt-x11-free/debian/changelog	2006-03-22 15:31:28 UTC (rev 3333)
+++ trunk/packages/qt-x11-free/debian/changelog	2006-03-23 00:46:56 UTC (rev 3334)
@@ -1,5 +1,7 @@
-qt-x11-free (3:3.3.5-5) UNRELEASED; urgency=low
+qt-x11-free (3:3.3.6-1) UNRELEASED; urgency=low
 
+  * New upstream release. Obsoletes patch #30, #33.
+
   +++ Changes by Christopher Martin:
 
   * Add another small patch for immodule from Dirk Mueller, fixing an
@@ -7,8 +9,10 @@
 
   * Build against libsqlite3-dev instead of libsqlite0-dev.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 10 Mar 2006 12:42:57 -0500
+  !!! ALSO THE IMMODULE CHANGES ARE DODGY... WATCH WHAT OTHER DISTROS USE !!!
 
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 17 Mar 2006 10:22:05 -0500
+
 qt-x11-free (3:3.3.5-4) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
@@ -730,7 +734,7 @@
   * debian/*: Various other little fixes and cleanups
   * debian/rules: Moved /usr/share/qt to be /usr/share/qt3
 
- -- Martin Loschwitz <madkiss at madkiss.org>  Wed, 29 Jan 2003 26:58:00 +0100
+ -- Martin Loschwitz <madkiss at madkiss.org>  Wed, 29 Jan 2003 16:58:00 +0100
 
 qt-x11-free (2:3.1.1+cvs.20021220-1) unstable; urgency=low
 

Modified: trunk/packages/qt-x11-free/debian/libqt3-mt-dev.links
===================================================================
--- trunk/packages/qt-x11-free/debian/libqt3-mt-dev.links	2006-03-22 15:31:28 UTC (rev 3333)
+++ trunk/packages/qt-x11-free/debian/libqt3-mt-dev.links	2006-03-23 00:46:56 UTC (rev 3334)
@@ -1,6 +1,6 @@
 /usr/lib/libqui.prl /usr/share/qt3/lib/libqui.prl
 /usr/lib/libqui.so.1.0.0 /usr/share/qt3/lib/libqui.so
 /usr/lib/libqt-mt.prl /usr/share/qt3/lib/libqt-mt.prl
-/usr/lib/libqt-mt.so.3.3.5 /usr/share/qt3/lib/libqt-mt.so
+/usr/lib/libqt-mt.so.3.3.6 /usr/share/qt3/lib/libqt-mt.so
 /usr/include/qt3 /usr/share/qt3/include
 /usr/lib/qt3/plugins /usr/share/qt3/plugins

Modified: trunk/packages/qt-x11-free/debian/libqt3-mt.links
===================================================================
--- trunk/packages/qt-x11-free/debian/libqt3-mt.links	2006-03-22 15:31:28 UTC (rev 3333)
+++ trunk/packages/qt-x11-free/debian/libqt3-mt.links	2006-03-23 00:46:56 UTC (rev 3334)
@@ -1,5 +1,5 @@
 /usr/lib/libqui.so.1.0.0 /usr/lib/libqui.so.1 
 /usr/lib/libqui.so.1.0.0 /usr/share/qt3/lib/libqui.so.1
 /usr/lib/libqui.so.1.0.0 /usr/share/qt3/lib/libqui.so.1.0
-/usr/lib/libqt-mt.so.3.3.5 /usr/share/qt3/lib/libqt-mt.so.3
-/usr/lib/libqt-mt.so.3.3.5 /usr/share/qt3/lib/libqt-mt.so.3.3
+/usr/lib/libqt-mt.so.3.3.6 /usr/share/qt3/lib/libqt-mt.so.3
+/usr/lib/libqt-mt.so.3.3.6 /usr/share/qt3/lib/libqt-mt.so.3.3

Modified: trunk/packages/qt-x11-free/debian/maintain/man/linguist.1
===================================================================
--- trunk/packages/qt-x11-free/debian/maintain/man/linguist.1	2006-03-22 15:31:28 UTC (rev 3333)
+++ trunk/packages/qt-x11-free/debian/maintain/man/linguist.1	2006-03-23 00:46:56 UTC (rev 3334)
@@ -33,5 +33,5 @@
 under the Help menu.
 
 .SH AUTHOR
-This manual page was written by Jeremy Lainé <jeremy.laine at m4x.org>,
+This manual page was written by Jeremy Laine <jeremy.laine at m4x.org>,
 for the Debian GNU/Linux system (but may be used by others).

Modified: trunk/packages/qt-x11-free/debian/patches/00list
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/00list	2006-03-22 15:31:28 UTC (rev 3333)
+++ trunk/packages/qt-x11-free/debian/patches/00list	2006-03-23 00:46:56 UTC (rev 3334)
@@ -21,10 +21,8 @@
 26_qtc_qpixmap_constants
 27_qtc_qscrollview-windowactivate-fix
 29_qtc_fix_rotated_randr
-30_qtc_qtoolbar_77047
 31_gcc4_buildkey
 32_gtkstyle
-33_qgpluginmanager
 34_qtc_dnd_optimization
 35_qtc_dnd_active_window_fix
 37_qtc_dragobject-dont-prefer-unknown

Modified: trunk/packages/qt-x11-free/debian/patches/25_qtc_qpixmap_mitshm.dpatch
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/25_qtc_qpixmap_mitshm.dpatch	2006-03-22 15:31:28 UTC (rev 3333)
+++ trunk/packages/qt-x11-free/debian/patches/25_qtc_qpixmap_mitshm.dpatch	2006-03-23 00:46:56 UTC (rev 3334)
@@ -534,12 +534,3 @@
 +#define QT_MITSHM
  
  #endif // QPLATFORMDEFS_H
---- qt.orig/mkspecs/linux-g++/qplatformdefs.h
-+++ qt.patched/mkspecs/linux-g++/qplatformdefs.h
-@@ -102,5 +102,6 @@
- #define QT_VSNPRINTF		::vsnprintf
- #endif
- 
-+#define QT_MITSHM
- 
- #endif // QPLATFORMDEFS_H

Deleted: trunk/packages/qt-x11-free/debian/patches/30_qtc_qtoolbar_77047.dpatch

Deleted: trunk/packages/qt-x11-free/debian/patches/33_qgpluginmanager.dpatch

Modified: trunk/packages/qt-x11-free/debian/patches/45_immodule_unified.dpatch
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/45_immodule_unified.dpatch	2006-03-22 15:31:28 UTC (rev 3333)
+++ trunk/packages/qt-x11-free/debian/patches/45_immodule_unified.dpatch	2006-03-23 00:46:56 UTC (rev 3334)
@@ -15660,7 +15660,7 @@
      d->imselstart = d->imstart + e->cursorPos();
      d->imselend = d->imselstart + e->selectionLength();
 +#if 0
-     d->cursor = e->selectionLength() ? d->imend : d->imselend;
+     d->cursor = d->imstart + e->cursorPos();
 +#else
 +    // Cursor placement code is changed for Asian input method that
 +    // shows candidate window. This behavior is same as Qt/E 2.3.7
@@ -15909,7 +15909,7 @@
      // insert can trigger an imEnd event as it emits a textChanged signal, so better
      // be careful
      if(d->preeditStart != -1) { 
-@@ -1598,18 +1644,29 @@
+@@ -1598,14 +1644,20 @@
  
  	cursor->setIndex( d->preeditStart + e->cursorPos() );
  
@@ -15931,15 +15931,6 @@
  	}
      }
  
-     repaintChanged();
-+
-+    // microFocusHint is required to place candidate window for Asian
-+    // input methods. Cursor position and IM selection text are
-+    // updated by the event.
-+    updateMicroFocusHint();
- }
- 
- /*!
 @@ -1628,11 +1685,12 @@
      if (undoRedoInfo.type == UndoRedoInfo::IME)
          undoRedoInfo.type = UndoRedoInfo::Invalid;
@@ -16044,7 +16035,7 @@
  #ifndef QT_NO_POPUPMENU
      QGuardedPtr<QTextEdit> that = this;
      QGuardedPtr<QPopupMenu> popup = createPopupMenu( e->pos() );
-@@ -2821,8 +2901,15 @@
+@@ -2823,6 +2823,12 @@
  void QTextEdit::updateMicroFocusHint()
  {
      QTextCursor c( *cursor );
@@ -16054,8 +16045,13 @@
 +    // Asian input methods. Asian input methods need start point of IM
 +    // selection text to place candidate window as adjacent to the
 +    // selection text.
-     if ( d->preeditStart != -1 )
+     if ( d->preeditStart != -1 ) {
  	c.setIndex( d->preeditStart );
+         if(doc->hasSelection(QTextDocument::IMSelectionText)) {
+@@ -2831,6 +2837,7 @@
+             c.setIndex(index);
+         }
+     }
 +#endif
  
      if ( hasFocus() || viewport()->hasFocus() ) {

Modified: trunk/packages/qt-x11-free/debian/rules
===================================================================
--- trunk/packages/qt-x11-free/debian/rules	2006-03-22 15:31:28 UTC (rev 3333)
+++ trunk/packages/qt-x11-free/debian/rules	2006-03-23 00:46:56 UTC (rev 3334)
@@ -250,7 +250,7 @@
 	dh_testroot
 	
 	dh_installdocs -i -XREADME.Debian
-	dh_installchangelogs -i changes-3.3.5
+	dh_installchangelogs -i changes-3.3.6
 								
 	find doc/man -path \*/CVS -prune -o -print | cpio -pmd $(P_DOC)/usr/share/qt3/doc/
 			
@@ -436,7 +436,7 @@
 	dh_installdocs -a $(IBASE) -XREADME.Debian
 	dh_installmenu -a $(IBASE)
 	
-	dh_installchangelogs -a $(IBASE) changes-3.3.5
+	dh_installchangelogs -a $(IBASE) changes-3.3.6
 
 	dh_link -a $(IBASE)
 	dh_strip -a $(IBASE) --dbg-package=qt-x11-free-dbg




More information about the pkg-kde-commits mailing list