rev 17189 - in trunk/packages/kdebindings/debian: . patches

David Palacio dpalacio-guest at alioth.debian.org
Sat Feb 27 16:40:53 UTC 2010


Author: dpalacio-guest
Date: 2010-02-27 16:40:51 +0000 (Sat, 27 Feb 2010)
New Revision: 17189

Removed:
   trunk/packages/kdebindings/debian/patches/13_csharp_fix_build_deps.diff
Modified:
   trunk/packages/kdebindings/debian/changelog
   trunk/packages/kdebindings/debian/patches/01_python_modules_dont_link_against_libpython.diff
   trunk/packages/kdebindings/debian/patches/02_include_default_settings_in_python_cmakelist.diff
   trunk/packages/kdebindings/debian/patches/04_fix_ruby_requires.diff
   trunk/packages/kdebindings/debian/patches/08_csharp_plasma_examples.diff
   trunk/packages/kdebindings/debian/patches/11_make_pykde4_respect_sip_flags.diff
   trunk/packages/kdebindings/debian/patches/series
Log:
refresh patches


Modified: trunk/packages/kdebindings/debian/changelog
===================================================================
--- trunk/packages/kdebindings/debian/changelog	2010-02-27 15:01:29 UTC (rev 17188)
+++ trunk/packages/kdebindings/debian/changelog	2010-02-27 16:40:51 UTC (rev 17189)
@@ -12,6 +12,10 @@
   * Few touches to the packages descriptions.
     - ... including a typo in the python-kde4 one. (Closes: #567161)
 
+  [ David Palacio ]
+  * Refresh patches
+    Remove 13_csharp_fix_build_deps.diff: applied upstream
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 25 Feb 2010 01:19:23 +0200
 
 kdebindings (4:4.3.4-1) unstable; urgency=low

Modified: trunk/packages/kdebindings/debian/patches/01_python_modules_dont_link_against_libpython.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/01_python_modules_dont_link_against_libpython.diff	2010-02-27 15:01:29 UTC (rev 17188)
+++ trunk/packages/kdebindings/debian/patches/01_python_modules_dont_link_against_libpython.diff	2010-02-27 16:40:51 UTC (rev 17189)
@@ -2,9 +2,11 @@
 uses --no-undefined by default, we have to remove that from the default
 CMAKE_SHARED_LINKER_FLAGS variable, but only for the pykde4 subdirectory.
 
+Index: b/python/pykde4/CMakeLists.txt
+===================================================================
 --- a/python/pykde4/CMakeLists.txt
 +++ b/python/pykde4/CMakeLists.txt
-@@ -75,6 +75,9 @@ SET(SIP_EXTRA_OPTIONS -g)
+@@ -93,6 +93,9 @@
  
  ADD_DEFINITIONS(-D_REENTRANT -DQT_CORE_LIB -DQT_GUI_LIB -DUSING_SOPRANO_NRLMODEL_UNSTABLE_API)
  

Modified: trunk/packages/kdebindings/debian/patches/02_include_default_settings_in_python_cmakelist.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/02_include_default_settings_in_python_cmakelist.diff	2010-02-27 15:01:29 UTC (rev 17188)
+++ trunk/packages/kdebindings/debian/patches/02_include_default_settings_in_python_cmakelist.diff	2010-02-27 16:40:51 UTC (rev 17189)
@@ -1,6 +1,8 @@
+Index: b/python/pykde4/CMakeLists.txt
+===================================================================
 --- a/python/pykde4/CMakeLists.txt
 +++ b/python/pykde4/CMakeLists.txt
-@@ -10,6 +10,18 @@ ELSE(CMAKE_MAJOR_VERSION EQUAL 2 AND CMA
+@@ -15,6 +15,18 @@
      SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/pykde)
  ENDIF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 6)
  

Modified: trunk/packages/kdebindings/debian/patches/04_fix_ruby_requires.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/04_fix_ruby_requires.diff	2010-02-27 15:01:29 UTC (rev 17188)
+++ trunk/packages/kdebindings/debian/patches/04_fix_ruby_requires.diff	2010-02-27 16:40:51 UTC (rev 17189)
@@ -1,3 +1,5 @@
+Index: b/ruby/korundum/examples/RubberDoc.rb
+===================================================================
 --- a/ruby/korundum/examples/RubberDoc.rb
 +++ b/ruby/korundum/examples/RubberDoc.rb
 @@ -1,6 +1,6 @@
@@ -8,9 +10,11 @@
  
  about = KDE::AboutData.new("one", "two", "three")
  KDE::CmdLineArgs.init(1, ["RubberDoc"], about)
+Index: b/ruby/korundum/examples/menudemo.rb
+===================================================================
 --- a/ruby/korundum/examples/menudemo.rb
 +++ b/ruby/korundum/examples/menudemo.rb
-@@ -38,7 +38,7 @@ dealings in this Software without prior 
+@@ -38,7 +38,7 @@
  copyright holder.
  =end
  
@@ -19,9 +23,11 @@
  include KDE
  
  class MainWin < MainWindow
+Index: b/ruby/korundum/examples/mimetype.rb
+===================================================================
 --- a/ruby/korundum/examples/mimetype.rb
 +++ b/ruby/korundum/examples/mimetype.rb
-@@ -41,7 +41,7 @@ dealings in this Software without prior 
+@@ -41,7 +41,7 @@
  copyright holder.
  =end
  
@@ -30,9 +36,11 @@
  include KDE
  
  class MainWin < MainWindow
+Index: b/ruby/korundum/examples/systray.rb
+===================================================================
 --- a/ruby/korundum/examples/systray.rb
 +++ b/ruby/korundum/examples/systray.rb
-@@ -31,7 +31,7 @@ dealings in this Software without prior 
+@@ -31,7 +31,7 @@
  copyright holder.
  =end
  
@@ -41,9 +49,11 @@
  
  class MainWin < KDE::MainWindow
      def initialize(*args)
+Index: b/ruby/korundum/examples/uikmdi.rb
+===================================================================
 --- a/ruby/korundum/examples/uikmdi.rb
 +++ b/ruby/korundum/examples/uikmdi.rb
-@@ -32,7 +32,7 @@ All is not rosy, however:
+@@ -32,7 +32,7 @@
  
  =end
  
@@ -52,6 +62,8 @@
  include KDE
  
  class KmdiExample < KDE::MdiMainFrm
+Index: b/ruby/korundum/examples/xmlgui.rb
+===================================================================
 --- a/ruby/korundum/examples/xmlgui.rb
 +++ b/ruby/korundum/examples/xmlgui.rb
 @@ -1,6 +1,6 @@
@@ -62,9 +74,11 @@
  require 'tempfile'
  
  about = KDE::AboutData.new("one", "two", "three")
+Index: b/ruby/korundum/examples/xmlmenudemo.rb
+===================================================================
 --- a/ruby/korundum/examples/xmlmenudemo.rb
 +++ b/ruby/korundum/examples/xmlmenudemo.rb
-@@ -38,7 +38,7 @@ dealings in this Software without prior 
+@@ -38,7 +38,7 @@
  copyright holder.
  =end
  
@@ -73,6 +87,8 @@
  
  class MainWin < KDE::MainWindow
  
+Index: b/ruby/korundum/src/lib/KDE/korundum4.rb
+===================================================================
 --- a/ruby/korundum/src/lib/KDE/korundum4.rb
 +++ b/ruby/korundum/src/lib/KDE/korundum4.rb
 @@ -19,7 +19,7 @@
@@ -84,9 +100,11 @@
  
  module KDE
  	def KDE.i18n(text, *args)
+Index: b/ruby/korundum/templates/annotated/basicapp.rb
+===================================================================
 --- a/ruby/korundum/templates/annotated/basicapp.rb
 +++ b/ruby/korundum/templates/annotated/basicapp.rb
-@@ -31,7 +31,7 @@ dealings in this Software without prior 
+@@ -31,7 +31,7 @@
  copyright holder.
  =end
  
@@ -95,9 +113,11 @@
  
  =begin
  Most Korundum applications will need a main window - the is the top
+Index: b/ruby/korundum/templates/annotated/menuapp1.rb
+===================================================================
 --- a/ruby/korundum/templates/annotated/menuapp1.rb
 +++ b/ruby/korundum/templates/annotated/menuapp1.rb
-@@ -41,7 +41,7 @@ copyright holder.
+@@ -41,7 +41,7 @@
  =end
  
  
@@ -106,9 +126,11 @@
  
  class MainWin < KDE::MainWindow
  	TOOLBAR_NEW   = 1
+Index: b/ruby/korundum/templates/annotated/menuapp2.rb
+===================================================================
 --- a/ruby/korundum/templates/annotated/menuapp2.rb
 +++ b/ruby/korundum/templates/annotated/menuapp2.rb
-@@ -36,7 +36,7 @@ copyright holder.
+@@ -36,7 +36,7 @@
  =end
  
  
@@ -117,9 +139,11 @@
  
  
  
+Index: b/ruby/korundum/templates/annotated/menuapp3.rb
+===================================================================
 --- a/ruby/korundum/templates/annotated/menuapp3.rb
 +++ b/ruby/korundum/templates/annotated/menuapp3.rb
-@@ -35,7 +35,7 @@ copyright holder.
+@@ -35,7 +35,7 @@
  =end
  
  
@@ -128,9 +152,11 @@
  
  class MainWin < KDE::MainWindow
  	STATUSBAR_LEFT   = 1
+Index: b/ruby/korundum/templates/annotated/minimal.rb
+===================================================================
 --- a/ruby/korundum/templates/annotated/minimal.rb
 +++ b/ruby/korundum/templates/annotated/minimal.rb
-@@ -36,7 +36,7 @@ dealings in this Software without prior 
+@@ -36,7 +36,7 @@
  copyright holder.
  =end
  
@@ -139,9 +165,11 @@
  
  
  =begin
+Index: b/ruby/korundum/templates/annotated/systray1.rb
+===================================================================
 --- a/ruby/korundum/templates/annotated/systray1.rb
 +++ b/ruby/korundum/templates/annotated/systray1.rb
-@@ -37,7 +37,7 @@ dealings in this Software without prior 
+@@ -37,7 +37,7 @@
  copyright holder.
  =end
  
@@ -150,9 +178,11 @@
  
  # This template uses KDE::MainWindow as the main window widget
  # It solves the problem described in systray.rb by using
+Index: b/ruby/korundum/templates/basic/basicapp.rb
+===================================================================
 --- a/ruby/korundum/templates/basic/basicapp.rb
 +++ b/ruby/korundum/templates/basic/basicapp.rb
-@@ -31,7 +31,7 @@ dealings in this Software without prior 
+@@ -31,7 +31,7 @@
  copyright holder.
  =end
  
@@ -161,9 +191,11 @@
  
  class MainWin < KDE::MainWindow
      def initialize(*args)
+Index: b/ruby/korundum/templates/basic/menuapp1.rb
+===================================================================
 --- a/ruby/korundum/templates/basic/menuapp1.rb
 +++ b/ruby/korundum/templates/basic/menuapp1.rb
-@@ -41,7 +41,7 @@ copyright holder.
+@@ -41,7 +41,7 @@
  =end
  
  
@@ -172,9 +204,11 @@
  
  class MainWin < KDE::MainWindow
  	TOOLBAR_NEW   = 1
+Index: b/ruby/korundum/templates/basic/menuapp2.rb
+===================================================================
 --- a/ruby/korundum/templates/basic/menuapp2.rb
 +++ b/ruby/korundum/templates/basic/menuapp2.rb
-@@ -36,7 +36,7 @@ copyright holder.
+@@ -36,7 +36,7 @@
  =end
  
  
@@ -183,9 +217,11 @@
  
  
  
+Index: b/ruby/korundum/templates/basic/menuapp3.rb
+===================================================================
 --- a/ruby/korundum/templates/basic/menuapp3.rb
 +++ b/ruby/korundum/templates/basic/menuapp3.rb
-@@ -35,7 +35,7 @@ copyright holder.
+@@ -35,7 +35,7 @@
  =end
  
  
@@ -194,9 +230,11 @@
  
  class MainWin < KDE::MainWindow
  	STATUSBAR_LEFT   = 1
+Index: b/ruby/korundum/templates/basic/minimal.rb
+===================================================================
 --- a/ruby/korundum/templates/basic/minimal.rb
 +++ b/ruby/korundum/templates/basic/minimal.rb
-@@ -31,7 +31,7 @@ dealings in this Software without prior 
+@@ -31,7 +31,7 @@
  copyright holder.
  =end
  
@@ -205,9 +243,11 @@
  
  
  
+Index: b/ruby/korundum/templates/basic/systray1.rb
+===================================================================
 --- a/ruby/korundum/templates/basic/systray1.rb
 +++ b/ruby/korundum/templates/basic/systray1.rb
-@@ -31,7 +31,7 @@ dealings in this Software without prior 
+@@ -31,7 +31,7 @@
  copyright holder.
  =end
  
@@ -216,6 +256,8 @@
  
  class MainWin < KDE::MainWindow
  	slots 'slotQuitSelected()'
+Index: b/ruby/qtruby/examples/designer/calculatorbuilder/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/designer/calculatorbuilder/main.rb
 +++ b/ruby/qtruby/examples/designer/calculatorbuilder/main.rb
 @@ -23,7 +23,7 @@
@@ -227,6 +269,8 @@
  require 'qrc_calculatorbuilder.rb'
  require 'calculatorform.rb'
  
+Index: b/ruby/qtruby/examples/designer/calculatorform/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/designer/calculatorform/main.rb
 +++ b/ruby/qtruby/examples/designer/calculatorform/main.rb
 @@ -23,7 +23,7 @@
@@ -238,6 +282,8 @@
  require 'calculatorform.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/desktop/screenshot/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/desktop/screenshot/main.rb
 +++ b/ruby/qtruby/examples/desktop/screenshot/main.rb
 @@ -23,7 +23,7 @@
@@ -249,6 +295,8 @@
  require 'screenshot.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/desktop/systray/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/desktop/systray/main.rb
 +++ b/ruby/qtruby/examples/desktop/systray/main.rb
 @@ -23,7 +23,7 @@
@@ -260,6 +308,8 @@
  require 'qrc_systray.rb'
  require 'window.rb'
  
+Index: b/ruby/qtruby/examples/dialogs/complexwizard/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/dialogs/complexwizard/main.rb
 +++ b/ruby/qtruby/examples/dialogs/complexwizard/main.rb
 @@ -23,7 +23,7 @@
@@ -271,6 +321,8 @@
  require 'licensewizard.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/dialogs/configdialog/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/dialogs/configdialog/main.rb
 +++ b/ruby/qtruby/examples/dialogs/configdialog/main.rb
 @@ -23,7 +23,7 @@
@@ -282,6 +334,8 @@
  require 'configdialog.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/dialogs/extension/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/dialogs/extension/main.rb
 +++ b/ruby/qtruby/examples/dialogs/extension/main.rb
 @@ -23,7 +23,7 @@
@@ -293,6 +347,8 @@
  require 'finddialog.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/dialogs/findfiles/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/dialogs/findfiles/main.rb
 +++ b/ruby/qtruby/examples/dialogs/findfiles/main.rb
 @@ -23,7 +23,7 @@
@@ -304,6 +360,8 @@
  require 'window.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/dialogs/simplewizard/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/dialogs/simplewizard/main.rb
 +++ b/ruby/qtruby/examples/dialogs/simplewizard/main.rb
 @@ -23,7 +23,7 @@
@@ -315,6 +373,8 @@
  require 'classwizard.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/dialogs/standarddialogs/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/dialogs/standarddialogs/main.rb
 +++ b/ruby/qtruby/examples/dialogs/standarddialogs/main.rb
 @@ -23,7 +23,7 @@
@@ -326,6 +386,8 @@
  require 'dialog.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/dialogs/tabdialog/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/dialogs/tabdialog/main.rb
 +++ b/ruby/qtruby/examples/dialogs/tabdialog/main.rb
 @@ -23,7 +23,7 @@
@@ -337,6 +399,8 @@
  require 'tabdialog.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/draganddrop/draggableicons/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/draganddrop/draggableicons/main.rb
 +++ b/ruby/qtruby/examples/draganddrop/draggableicons/main.rb
 @@ -23,7 +23,7 @@
@@ -348,6 +412,8 @@
  require 'dragwidget.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/draganddrop/draggabletext/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/draganddrop/draggabletext/main.rb
 +++ b/ruby/qtruby/examples/draganddrop/draggabletext/main.rb
 @@ -23,7 +23,7 @@
@@ -359,6 +425,8 @@
  require 'dragwidget.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/draganddrop/dropsite/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/draganddrop/dropsite/main.rb
 +++ b/ruby/qtruby/examples/draganddrop/dropsite/main.rb
 @@ -23,7 +23,7 @@
@@ -370,6 +438,8 @@
  require 'dropsitewindow.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/draganddrop/fridgemagnets/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/draganddrop/fridgemagnets/main.rb
 +++ b/ruby/qtruby/examples/draganddrop/fridgemagnets/main.rb
 @@ -23,7 +23,7 @@
@@ -381,6 +451,8 @@
  require 'dragwidget.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/draganddrop/puzzle/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/draganddrop/puzzle/main.rb
 +++ b/ruby/qtruby/examples/draganddrop/puzzle/main.rb
 @@ -23,7 +23,7 @@
@@ -392,6 +464,8 @@
  require 'mainwindow.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/graphicsview/collidingmice/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/graphicsview/collidingmice/main.rb
 +++ b/ruby/qtruby/examples/graphicsview/collidingmice/main.rb
 @@ -23,7 +23,7 @@
@@ -403,6 +477,8 @@
  require 'qrc_mice.rb'
  require 'mouse.rb'
  
+Index: b/ruby/qtruby/examples/graphicsview/dragdroprobot/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/graphicsview/dragdroprobot/main.rb
 +++ b/ruby/qtruby/examples/graphicsview/dragdroprobot/main.rb
 @@ -23,7 +23,7 @@
@@ -414,6 +490,8 @@
  require 'qrc_robot.rb'
  require 'coloritem.rb'
  require 'robot.rb'
+Index: b/ruby/qtruby/examples/itemviews/chart/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/itemviews/chart/main.rb
 +++ b/ruby/qtruby/examples/itemviews/chart/main.rb
 @@ -23,7 +23,7 @@
@@ -425,6 +503,8 @@
  require 'qrc_chart.rb'
  require 'mainwindow.rb'
  
+Index: b/ruby/qtruby/examples/itemviews/dirview/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/itemviews/dirview/main.rb
 +++ b/ruby/qtruby/examples/itemviews/dirview/main.rb
 @@ -23,7 +23,7 @@
@@ -436,6 +516,8 @@
  	
  app = Qt::Application.new(ARGV)
  	
+Index: b/ruby/qtruby/examples/itemviews/pixelator/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/itemviews/pixelator/main.rb
 +++ b/ruby/qtruby/examples/itemviews/pixelator/main.rb
 @@ -23,7 +23,7 @@
@@ -447,6 +529,8 @@
  require 'qrc_images.rb'
  require 'mainwindow.rb'
  
+Index: b/ruby/qtruby/examples/itemviews/puzzle/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/itemviews/puzzle/main.rb
 +++ b/ruby/qtruby/examples/itemviews/puzzle/main.rb
 @@ -23,7 +23,7 @@
@@ -458,6 +542,8 @@
  require 'mainwindow.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/itemviews/simpledommodel/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/itemviews/simpledommodel/main.rb
 +++ b/ruby/qtruby/examples/itemviews/simpledommodel/main.rb
 @@ -23,7 +23,7 @@
@@ -469,6 +555,8 @@
  require 'mainwindow.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/itemviews/simpletreemodel/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/itemviews/simpletreemodel/main.rb
 +++ b/ruby/qtruby/examples/itemviews/simpletreemodel/main.rb
 @@ -23,7 +23,7 @@
@@ -480,6 +568,8 @@
  require 'qrc_simpletreemodel.rb'
  require 'treemodel.rb'
  
+Index: b/ruby/qtruby/examples/itemviews/sortingmodel/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/itemviews/sortingmodel/main.rb
 +++ b/ruby/qtruby/examples/itemviews/sortingmodel/main.rb
 @@ -23,7 +23,7 @@
@@ -491,6 +581,8 @@
  require 'treemodel.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/itemviews/spinboxdelegate/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/itemviews/spinboxdelegate/main.rb
 +++ b/ruby/qtruby/examples/itemviews/spinboxdelegate/main.rb
 @@ -23,7 +23,7 @@
@@ -502,6 +594,8 @@
  require 'spinboxdelegate.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/killerfilter/killerfilter.rb
+===================================================================
 --- a/ruby/qtruby/examples/killerfilter/killerfilter.rb
 +++ b/ruby/qtruby/examples/killerfilter/killerfilter.rb
 @@ -2,7 +2,7 @@
@@ -513,6 +607,8 @@
  
  class KillerFilter < Qt::Object
  
+Index: b/ruby/qtruby/examples/layouts/basiclayouts/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/layouts/basiclayouts/main.rb
 +++ b/ruby/qtruby/examples/layouts/basiclayouts/main.rb
 @@ -23,7 +23,7 @@
@@ -524,6 +620,8 @@
  require 'dialog.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/layouts/borderlayout/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/layouts/borderlayout/main.rb
 +++ b/ruby/qtruby/examples/layouts/borderlayout/main.rb
 @@ -23,7 +23,7 @@
@@ -535,6 +633,8 @@
  require 'window.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/layouts/flowlayouts/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/layouts/flowlayouts/main.rb
 +++ b/ruby/qtruby/examples/layouts/flowlayouts/main.rb
 @@ -23,7 +23,7 @@
@@ -546,6 +646,8 @@
  require 'window.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/mainwindows/application/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/mainwindows/application/main.rb
 +++ b/ruby/qtruby/examples/mainwindows/application/main.rb
 @@ -23,7 +23,7 @@
@@ -557,6 +659,8 @@
  require 'mainwindow.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/mainwindows/dockwidgets/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/mainwindows/dockwidgets/main.rb
 +++ b/ruby/qtruby/examples/mainwindows/dockwidgets/main.rb
 @@ -23,7 +23,7 @@
@@ -568,6 +672,8 @@
  require 'mainwindow.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/mainwindows/mdi/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/mainwindows/mdi/main.rb
 +++ b/ruby/qtruby/examples/mainwindows/mdi/main.rb
 @@ -23,7 +23,7 @@
@@ -579,6 +685,8 @@
  require 'mainwindow.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/mainwindows/menus/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/mainwindows/menus/main.rb
 +++ b/ruby/qtruby/examples/mainwindows/menus/main.rb
 @@ -23,7 +23,7 @@
@@ -590,6 +698,8 @@
  require 'mainwindow.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/mainwindows/recentfiles/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/mainwindows/recentfiles/main.rb
 +++ b/ruby/qtruby/examples/mainwindows/recentfiles/main.rb
 @@ -23,7 +23,7 @@
@@ -601,6 +711,8 @@
  require 'mainwindow.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/mainwindows/sdi/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/mainwindows/sdi/main.rb
 +++ b/ruby/qtruby/examples/mainwindows/sdi/main.rb
 @@ -23,7 +23,7 @@
@@ -612,6 +724,8 @@
  require 'mainwindow.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/network/broadcastreceiver/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/network/broadcastreceiver/main.rb
 +++ b/ruby/qtruby/examples/network/broadcastreceiver/main.rb
 @@ -23,7 +23,7 @@
@@ -623,6 +737,8 @@
  require 'receiver.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/network/broadcastsender/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/network/broadcastsender/main.rb
 +++ b/ruby/qtruby/examples/network/broadcastsender/main.rb
 @@ -23,7 +23,7 @@
@@ -634,6 +750,8 @@
  require 'sender.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/network/fortuneclient/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/network/fortuneclient/main.rb
 +++ b/ruby/qtruby/examples/network/fortuneclient/main.rb
 @@ -23,7 +23,7 @@
@@ -645,6 +763,8 @@
  require 'client.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/network/fortuneserver/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/network/fortuneserver/main.rb
 +++ b/ruby/qtruby/examples/network/fortuneserver/main.rb
 @@ -23,7 +23,7 @@
@@ -656,6 +776,8 @@
  require 'server.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/network/ftp/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/network/ftp/main.rb
 +++ b/ruby/qtruby/examples/network/ftp/main.rb
 @@ -23,7 +23,7 @@
@@ -667,6 +789,8 @@
  require 'ftpwindow.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/network/http/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/network/http/main.rb
 +++ b/ruby/qtruby/examples/network/http/main.rb
 @@ -23,7 +23,7 @@
@@ -678,6 +802,8 @@
  require 'httpwindow.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/network/loopback/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/network/loopback/main.rb
 +++ b/ruby/qtruby/examples/network/loopback/main.rb
 @@ -23,7 +23,7 @@
@@ -689,6 +815,8 @@
  require 'dialog.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/opengl/grabber/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/opengl/grabber/main.rb
 +++ b/ruby/qtruby/examples/opengl/grabber/main.rb
 @@ -23,7 +23,7 @@
@@ -700,6 +828,8 @@
  require 'mainwindow.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/opengl/hellogl/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/opengl/hellogl/main.rb
 +++ b/ruby/qtruby/examples/opengl/hellogl/main.rb
 @@ -23,7 +23,7 @@
@@ -711,6 +841,8 @@
  require 'window.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/opengl/textures/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/opengl/textures/main.rb
 +++ b/ruby/qtruby/examples/opengl/textures/main.rb
 @@ -23,7 +23,7 @@
@@ -722,6 +854,8 @@
  require 'window.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/painting/basicdrawing/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/painting/basicdrawing/main.rb
 +++ b/ruby/qtruby/examples/painting/basicdrawing/main.rb
 @@ -23,7 +23,7 @@
@@ -733,6 +867,8 @@
  require 'window.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/painting/concentriccircles/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/painting/concentriccircles/main.rb
 +++ b/ruby/qtruby/examples/painting/concentriccircles/main.rb
 @@ -23,7 +23,7 @@
@@ -744,6 +880,8 @@
  require 'window.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/painting/fontsampler/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/painting/fontsampler/main.rb
 +++ b/ruby/qtruby/examples/painting/fontsampler/main.rb
 @@ -23,7 +23,7 @@
@@ -755,6 +893,8 @@
  require 'mainwindow.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/painting/svgviewer/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/painting/svgviewer/main.rb
 +++ b/ruby/qtruby/examples/painting/svgviewer/main.rb
 @@ -23,7 +23,7 @@
@@ -766,6 +906,8 @@
  require 'mainwindow.rb'
  require 'qrc_svgviewer.rb'
  
+Index: b/ruby/qtruby/examples/painting/transformations/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/painting/transformations/main.rb
 +++ b/ruby/qtruby/examples/painting/transformations/main.rb
 @@ -23,7 +23,7 @@
@@ -777,6 +919,8 @@
  require 'window.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/passivepopup/passivepopup.rb
+===================================================================
 --- a/ruby/qtruby/examples/passivepopup/passivepopup.rb
 +++ b/ruby/qtruby/examples/passivepopup/passivepopup.rb
 @@ -1,6 +1,6 @@
@@ -787,6 +931,8 @@
   
  class PassiveWindow < Qt::Frame
  	MARGIN = 20
+Index: b/ruby/qtruby/examples/qdbus/chat/chat.rb
+===================================================================
 --- a/ruby/qtruby/examples/qdbus/chat/chat.rb
 +++ b/ruby/qtruby/examples/qdbus/chat/chat.rb
 @@ -23,7 +23,7 @@
@@ -798,6 +944,8 @@
  require 'chat_interface.rb'
  require 'chat_adaptor.rb'
  
+Index: b/ruby/qtruby/examples/qdbus/complexpingpong/complexping.rb
+===================================================================
 --- a/ruby/qtruby/examples/qdbus/complexpingpong/complexping.rb
 +++ b/ruby/qtruby/examples/qdbus/complexpingpong/complexping.rb
 @@ -23,7 +23,7 @@
@@ -809,6 +957,8 @@
  require 'ping-common.rb'
     
  class Ping < Qt::Object
+Index: b/ruby/qtruby/examples/qdbus/complexpingpong/complexpong.rb
+===================================================================
 --- a/ruby/qtruby/examples/qdbus/complexpingpong/complexpong.rb
 +++ b/ruby/qtruby/examples/qdbus/complexpingpong/complexpong.rb
 @@ -25,7 +25,7 @@
@@ -820,9 +970,11 @@
  require 'ping-common.rb'
  
  class Pong < Qt::DBusAbstractAdaptor
+Index: b/ruby/qtruby/examples/qdbus/listnames/listnames.rb
+===================================================================
 --- a/ruby/qtruby/examples/qdbus/listnames/listnames.rb
 +++ b/ruby/qtruby/examples/qdbus/listnames/listnames.rb
-@@ -23,7 +23,7 @@
+@@ -24,7 +24,7 @@
  ** Translated to QtRuby by Richard Dale
  =end
      
@@ -831,6 +983,8 @@
  
  def method1()
      qDebug("Method 1:")
+Index: b/ruby/qtruby/examples/qdbus/pingpong/ping.rb
+===================================================================
 --- a/ruby/qtruby/examples/qdbus/pingpong/ping.rb
 +++ b/ruby/qtruby/examples/qdbus/pingpong/ping.rb
 @@ -23,7 +23,7 @@
@@ -842,6 +996,8 @@
  require 'ping-common.rb'
  	
  app = Qt::CoreApplication.new(ARGV)
+Index: b/ruby/qtruby/examples/qdbus/pingpong/pong.rb
+===================================================================
 --- a/ruby/qtruby/examples/qdbus/pingpong/pong.rb
 +++ b/ruby/qtruby/examples/qdbus/pingpong/pong.rb
 @@ -23,7 +23,7 @@
@@ -853,6 +1009,8 @@
  require 'ping-common.rb'
  
  class Pong < Qt::Object
+Index: b/ruby/qtruby/examples/qdbus/remotecontrolledcar/car/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/qdbus/remotecontrolledcar/car/main.rb
 +++ b/ruby/qtruby/examples/qdbus/remotecontrolledcar/car/main.rb
 @@ -23,7 +23,7 @@
@@ -864,6 +1022,8 @@
  require 'car.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/qdbus/remotecontrolledcar/controller/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/qdbus/remotecontrolledcar/controller/main.rb
 +++ b/ruby/qtruby/examples/qdbus/remotecontrolledcar/controller/main.rb
 @@ -23,7 +23,7 @@
@@ -875,6 +1035,8 @@
  require 'controller.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/qtscribble/scribble.rb
+===================================================================
 --- a/ruby/qtruby/examples/qtscribble/scribble.rb
 +++ b/ruby/qtruby/examples/qtscribble/scribble.rb
 @@ -5,7 +5,7 @@
@@ -886,6 +1048,8 @@
  	
  	class ScribbleArea < Qt::Widget
  	
+Index: b/ruby/qtruby/examples/richtext/calendar/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/richtext/calendar/main.rb
 +++ b/ruby/qtruby/examples/richtext/calendar/main.rb
 @@ -23,7 +23,7 @@
@@ -897,6 +1061,8 @@
  require 'mainwindow.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/richtext/orderform/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/richtext/orderform/main.rb
 +++ b/ruby/qtruby/examples/richtext/orderform/main.rb
 @@ -23,7 +23,7 @@
@@ -908,6 +1074,8 @@
  require 'mainwindow.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/richtext/syntaxhighlighter/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/richtext/syntaxhighlighter/main.rb
 +++ b/ruby/qtruby/examples/richtext/syntaxhighlighter/main.rb
 @@ -23,7 +23,7 @@
@@ -919,6 +1087,8 @@
  require 'mainwindow.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/ruboids/ruboids/CameraDialog.rb
+===================================================================
 --- a/ruby/qtruby/examples/ruboids/ruboids/CameraDialog.rb
 +++ b/ruby/qtruby/examples/ruboids/ruboids/CameraDialog.rb
 @@ -5,7 +5,7 @@
@@ -930,6 +1100,8 @@
  require 'World'
  require 'Camera'
  
+Index: b/ruby/qtruby/examples/ruboids/ruboids/Canvas.rb
+===================================================================
 --- a/ruby/qtruby/examples/ruboids/ruboids/Canvas.rb
 +++ b/ruby/qtruby/examples/ruboids/ruboids/Canvas.rb
 @@ -5,7 +5,7 @@
@@ -941,6 +1113,8 @@
  require 'opengl'
  require 'World'
  require 'Cloud'
+Index: b/ruby/qtruby/examples/ruboids/ruboids/CloudView.rb
+===================================================================
 --- a/ruby/qtruby/examples/ruboids/ruboids/CloudView.rb
 +++ b/ruby/qtruby/examples/ruboids/ruboids/CloudView.rb
 @@ -5,7 +5,7 @@
@@ -952,6 +1126,8 @@
  require 'View'
  require 'Cloud'
  require 'Params'
+Index: b/ruby/qtruby/examples/ruboids/ruboids/World.rb
+===================================================================
 --- a/ruby/qtruby/examples/ruboids/ruboids/World.rb
 +++ b/ruby/qtruby/examples/ruboids/ruboids/World.rb
 @@ -6,7 +6,7 @@
@@ -963,6 +1139,8 @@
  require 'Params'
  require 'Cloud'
  require 'Flock'
+Index: b/ruby/qtruby/examples/ruboids/ruboids/WorldWindow.rb
+===================================================================
 --- a/ruby/qtruby/examples/ruboids/ruboids/WorldWindow.rb
 +++ b/ruby/qtruby/examples/ruboids/ruboids/WorldWindow.rb
 @@ -5,7 +5,7 @@
@@ -974,6 +1152,8 @@
  require 'Canvas'
  require 'CameraDialog'
  
+Index: b/ruby/qtruby/examples/tutorial/t1/t1.rb
+===================================================================
 --- a/ruby/qtruby/examples/tutorial/t1/t1.rb
 +++ b/ruby/qtruby/examples/tutorial/t1/t1.rb
 @@ -1,7 +1,7 @@
@@ -985,6 +1165,8 @@
  
  a = Qt::Application.new(ARGV)
  hello = Qt::PushButton.new('Hello World!', nil)
+Index: b/ruby/qtruby/examples/tutorial/t10/cannon.rb
+===================================================================
 --- a/ruby/qtruby/examples/tutorial/t10/cannon.rb
 +++ b/ruby/qtruby/examples/tutorial/t10/cannon.rb
 @@ -1,4 +1,4 @@
@@ -993,6 +1175,8 @@
  
  class CannonField < Qt::Widget
      signals 'angleChanged(int)', 'forceChanged(int)'
+Index: b/ruby/qtruby/examples/tutorial/t10/lcdrange.rb
+===================================================================
 --- a/ruby/qtruby/examples/tutorial/t10/lcdrange.rb
 +++ b/ruby/qtruby/examples/tutorial/t10/lcdrange.rb
 @@ -1,4 +1,4 @@
@@ -1001,6 +1185,8 @@
  
  class LCDRange < Qt::Widget
      signals 'valueChanged(int)'
+Index: b/ruby/qtruby/examples/tutorial/t10/t10.rb
+===================================================================
 --- a/ruby/qtruby/examples/tutorial/t10/t10.rb
 +++ b/ruby/qtruby/examples/tutorial/t10/t10.rb
 @@ -1,7 +1,7 @@
@@ -1012,6 +1198,8 @@
  require 'lcdrange.rb'
  require 'cannon.rb'
  
+Index: b/ruby/qtruby/examples/tutorial/t11/cannon.rb
+===================================================================
 --- a/ruby/qtruby/examples/tutorial/t11/cannon.rb
 +++ b/ruby/qtruby/examples/tutorial/t11/cannon.rb
 @@ -1,5 +1,5 @@
@@ -1021,6 +1209,8 @@
  
  class CannonField < Qt::Widget
      
+Index: b/ruby/qtruby/examples/tutorial/t11/lcdrange.rb
+===================================================================
 --- a/ruby/qtruby/examples/tutorial/t11/lcdrange.rb
 +++ b/ruby/qtruby/examples/tutorial/t11/lcdrange.rb
 @@ -1,4 +1,4 @@
@@ -1029,6 +1219,8 @@
  
  class LCDRange < Qt::Widget
      signals 'valueChanged(int)'
+Index: b/ruby/qtruby/examples/tutorial/t11/t11.rb
+===================================================================
 --- a/ruby/qtruby/examples/tutorial/t11/t11.rb
 +++ b/ruby/qtruby/examples/tutorial/t11/t11.rb
 @@ -1,7 +1,7 @@
@@ -1040,6 +1232,8 @@
  require 'lcdrange.rb'
  require 'cannon.rb'
  
+Index: b/ruby/qtruby/examples/tutorial/t12/cannon.rb
+===================================================================
 --- a/ruby/qtruby/examples/tutorial/t12/cannon.rb
 +++ b/ruby/qtruby/examples/tutorial/t12/cannon.rb
 @@ -1,5 +1,5 @@
@@ -1049,6 +1243,8 @@
  
  class CannonField < Qt::Widget
      
+Index: b/ruby/qtruby/examples/tutorial/t12/lcdrange.rb
+===================================================================
 --- a/ruby/qtruby/examples/tutorial/t12/lcdrange.rb
 +++ b/ruby/qtruby/examples/tutorial/t12/lcdrange.rb
 @@ -1,4 +1,4 @@
@@ -1057,6 +1253,8 @@
  require 'pp'
  
  class LCDRange < Qt::Widget
+Index: b/ruby/qtruby/examples/tutorial/t12/t12.rb
+===================================================================
 --- a/ruby/qtruby/examples/tutorial/t12/t12.rb
 +++ b/ruby/qtruby/examples/tutorial/t12/t12.rb
 @@ -1,7 +1,7 @@
@@ -1068,6 +1266,8 @@
  require 'lcdrange.rb'
  require 'cannon.rb'
  
+Index: b/ruby/qtruby/examples/tutorial/t13/cannon.rb
+===================================================================
 --- a/ruby/qtruby/examples/tutorial/t13/cannon.rb
 +++ b/ruby/qtruby/examples/tutorial/t13/cannon.rb
 @@ -1,4 +1,4 @@
@@ -1076,6 +1276,8 @@
  include Math
  
  class CannonField < Qt::Widget
+Index: b/ruby/qtruby/examples/tutorial/t13/gamebrd.rb
+===================================================================
 --- a/ruby/qtruby/examples/tutorial/t13/gamebrd.rb
 +++ b/ruby/qtruby/examples/tutorial/t13/gamebrd.rb
 @@ -1,4 +1,4 @@
@@ -1084,6 +1286,8 @@
  require 'lcdrange.rb'
  require 'cannon.rb'
  
+Index: b/ruby/qtruby/examples/tutorial/t13/lcdrange.rb
+===================================================================
 --- a/ruby/qtruby/examples/tutorial/t13/lcdrange.rb
 +++ b/ruby/qtruby/examples/tutorial/t13/lcdrange.rb
 @@ -1,4 +1,4 @@
@@ -1092,6 +1296,8 @@
  
  class LCDRange < Qt::Widget
      signals 'valueChanged(int)'
+Index: b/ruby/qtruby/examples/tutorial/t13/t13.rb
+===================================================================
 --- a/ruby/qtruby/examples/tutorial/t13/t13.rb
 +++ b/ruby/qtruby/examples/tutorial/t13/t13.rb
 @@ -1,7 +1,7 @@
@@ -1103,6 +1309,8 @@
  require 'gamebrd.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/tutorial/t14/t14.rb
+===================================================================
 --- a/ruby/qtruby/examples/tutorial/t14/t14.rb
 +++ b/ruby/qtruby/examples/tutorial/t14/t14.rb
 @@ -1,7 +1,7 @@
@@ -1114,6 +1322,8 @@
  require 'gamebrd.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/tutorial/t2/t2.rb
+===================================================================
 --- a/ruby/qtruby/examples/tutorial/t2/t2.rb
 +++ b/ruby/qtruby/examples/tutorial/t2/t2.rb
 @@ -1,7 +1,7 @@
@@ -1125,6 +1335,8 @@
  
  a = Qt::Application.new(ARGV)
  
+Index: b/ruby/qtruby/examples/tutorial/t3/t3.rb
+===================================================================
 --- a/ruby/qtruby/examples/tutorial/t3/t3.rb
 +++ b/ruby/qtruby/examples/tutorial/t3/t3.rb
 @@ -1,7 +1,7 @@
@@ -1136,6 +1348,8 @@
  
  app = Qt::Application.new(ARGV)
  
+Index: b/ruby/qtruby/examples/tutorial/t4/t4.rb
+===================================================================
 --- a/ruby/qtruby/examples/tutorial/t4/t4.rb
 +++ b/ruby/qtruby/examples/tutorial/t4/t4.rb
 @@ -1,7 +1,7 @@
@@ -1147,6 +1361,8 @@
  
  class MyWidget < Qt::Widget
  
+Index: b/ruby/qtruby/examples/tutorial/t5/t5.rb
+===================================================================
 --- a/ruby/qtruby/examples/tutorial/t5/t5.rb
 +++ b/ruby/qtruby/examples/tutorial/t5/t5.rb
 @@ -1,7 +1,7 @@
@@ -1158,6 +1374,8 @@
  
  class MyWidget < Qt::Widget
  
+Index: b/ruby/qtruby/examples/tutorial/t6/t6.rb
+===================================================================
 --- a/ruby/qtruby/examples/tutorial/t6/t6.rb
 +++ b/ruby/qtruby/examples/tutorial/t6/t6.rb
 @@ -1,7 +1,7 @@
@@ -1169,6 +1387,8 @@
  
  class LCDRange < Qt::Widget
  
+Index: b/ruby/qtruby/examples/tutorial/t7/lcdrange.rb
+===================================================================
 --- a/ruby/qtruby/examples/tutorial/t7/lcdrange.rb
 +++ b/ruby/qtruby/examples/tutorial/t7/lcdrange.rb
 @@ -1,5 +1,5 @@
@@ -1178,6 +1398,8 @@
  
  class LCDRange < Qt::Widget
      signals 'valueChanged(int)'
+Index: b/ruby/qtruby/examples/tutorial/t7/t7.rb
+===================================================================
 --- a/ruby/qtruby/examples/tutorial/t7/t7.rb
 +++ b/ruby/qtruby/examples/tutorial/t7/t7.rb
 @@ -1,7 +1,7 @@
@@ -1189,6 +1411,8 @@
  require 'lcdrange.rb'
  
  class MyWidget < Qt::Widget
+Index: b/ruby/qtruby/examples/tutorial/t8/cannon.rb
+===================================================================
 --- a/ruby/qtruby/examples/tutorial/t8/cannon.rb
 +++ b/ruby/qtruby/examples/tutorial/t8/cannon.rb
 @@ -1,4 +1,4 @@
@@ -1197,6 +1421,8 @@
  
  class CannonField < Qt::Widget
  	signals 'angleChanged(int)'
+Index: b/ruby/qtruby/examples/tutorial/t8/lcdrange.rb
+===================================================================
 --- a/ruby/qtruby/examples/tutorial/t8/lcdrange.rb
 +++ b/ruby/qtruby/examples/tutorial/t8/lcdrange.rb
 @@ -1,4 +1,4 @@
@@ -1205,6 +1431,8 @@
  
  class LCDRange < Qt::Widget
  	signals 'valueChanged(int)'
+Index: b/ruby/qtruby/examples/tutorial/t8/t8.rb
+===================================================================
 --- a/ruby/qtruby/examples/tutorial/t8/t8.rb
 +++ b/ruby/qtruby/examples/tutorial/t8/t8.rb
 @@ -1,7 +1,7 @@
@@ -1216,6 +1444,8 @@
  require 'lcdrange.rb'
  require 'cannon.rb'
  
+Index: b/ruby/qtruby/examples/tutorial/t9/cannon.rb
+===================================================================
 --- a/ruby/qtruby/examples/tutorial/t9/cannon.rb
 +++ b/ruby/qtruby/examples/tutorial/t9/cannon.rb
 @@ -1,4 +1,4 @@
@@ -1224,6 +1454,8 @@
  
  class CannonField < Qt::Widget
      signals 'angleChanged(int)'
+Index: b/ruby/qtruby/examples/tutorial/t9/lcdrange.rb
+===================================================================
 --- a/ruby/qtruby/examples/tutorial/t9/lcdrange.rb
 +++ b/ruby/qtruby/examples/tutorial/t9/lcdrange.rb
 @@ -1,4 +1,4 @@
@@ -1232,6 +1464,8 @@
  
  class LCDRange < Qt::Widget
      signals 'valueChanged(int)'
+Index: b/ruby/qtruby/examples/tutorial/t9/t9.rb
+===================================================================
 --- a/ruby/qtruby/examples/tutorial/t9/t9.rb
 +++ b/ruby/qtruby/examples/tutorial/t9/t9.rb
 @@ -1,7 +1,7 @@
@@ -1243,6 +1477,8 @@
  require 'lcdrange.rb'
  require 'cannon.rb'
  
+Index: b/ruby/qtruby/examples/widgets/analogclock/analogclock.rb
+===================================================================
 --- a/ruby/qtruby/examples/widgets/analogclock/analogclock.rb
 +++ b/ruby/qtruby/examples/widgets/analogclock/analogclock.rb
 @@ -25,7 +25,7 @@
@@ -1254,6 +1490,8 @@
  
  # an analog clock widget using an internal Qt::Timer
  class AnalogClock < Qt::Widget
+Index: b/ruby/qtruby/examples/widgets/analogclock/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/widgets/analogclock/main.rb
 +++ b/ruby/qtruby/examples/widgets/analogclock/main.rb
 @@ -1,6 +1,6 @@
@@ -1264,6 +1502,8 @@
  require 'analogclock.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/widgets/calculator/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/widgets/calculator/main.rb
 +++ b/ruby/qtruby/examples/widgets/calculator/main.rb
 @@ -23,7 +23,7 @@
@@ -1275,6 +1515,8 @@
  require 'calculator.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/widgets/charactermap/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/widgets/charactermap/main.rb
 +++ b/ruby/qtruby/examples/widgets/charactermap/main.rb
 @@ -23,7 +23,7 @@
@@ -1286,6 +1528,8 @@
  require 'mainwindow.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/widgets/digitalclock/digitalclock.rb
+===================================================================
 --- a/ruby/qtruby/examples/widgets/digitalclock/digitalclock.rb
 +++ b/ruby/qtruby/examples/widgets/digitalclock/digitalclock.rb
 @@ -1,4 +1,4 @@
@@ -1294,6 +1538,8 @@
  
  class DigitalClock < Qt::LCDNumber
  
+Index: b/ruby/qtruby/examples/widgets/digitalclock/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/widgets/digitalclock/main.rb
 +++ b/ruby/qtruby/examples/widgets/digitalclock/main.rb
 @@ -1,6 +1,6 @@
@@ -1304,6 +1550,8 @@
  require 'digitalclock.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/widgets/groupbox/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/widgets/groupbox/main.rb
 +++ b/ruby/qtruby/examples/widgets/groupbox/main.rb
 @@ -23,7 +23,7 @@
@@ -1315,6 +1563,8 @@
  require 'window.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/widgets/icons/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/widgets/icons/main.rb
 +++ b/ruby/qtruby/examples/widgets/icons/main.rb
 @@ -23,7 +23,7 @@
@@ -1326,6 +1576,8 @@
  require 'mainwindow.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/widgets/imageviewer/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/widgets/imageviewer/main.rb
 +++ b/ruby/qtruby/examples/widgets/imageviewer/main.rb
 @@ -23,7 +23,7 @@
@@ -1337,6 +1589,8 @@
  require 'imageviewer.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/widgets/lineedits/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/widgets/lineedits/main.rb
 +++ b/ruby/qtruby/examples/widgets/lineedits/main.rb
 @@ -23,7 +23,7 @@
@@ -1348,6 +1602,8 @@
  require 'window.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/widgets/movie/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/widgets/movie/main.rb
 +++ b/ruby/qtruby/examples/widgets/movie/main.rb
 @@ -23,7 +23,7 @@
@@ -1359,6 +1615,8 @@
  require 'movieplayer.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/widgets/screenshot/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/widgets/screenshot/main.rb
 +++ b/ruby/qtruby/examples/widgets/screenshot/main.rb
 @@ -23,7 +23,7 @@
@@ -1370,6 +1628,8 @@
  require 'screenshot.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/widgets/scribble/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/widgets/scribble/main.rb
 +++ b/ruby/qtruby/examples/widgets/scribble/main.rb
 @@ -23,7 +23,7 @@
@@ -1381,6 +1641,8 @@
  require 'mainwindow.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/widgets/sliders/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/widgets/sliders/main.rb
 +++ b/ruby/qtruby/examples/widgets/sliders/main.rb
 @@ -23,7 +23,7 @@
@@ -1392,6 +1654,8 @@
  require 'window.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/widgets/spinboxes/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/widgets/spinboxes/main.rb
 +++ b/ruby/qtruby/examples/widgets/spinboxes/main.rb
 @@ -23,7 +23,7 @@
@@ -1403,6 +1667,8 @@
  require 'window.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/widgets/tetrix/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/widgets/tetrix/main.rb
 +++ b/ruby/qtruby/examples/widgets/tetrix/main.rb
 @@ -23,7 +23,7 @@
@@ -1414,6 +1680,8 @@
  require 'tetrixwindow.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/widgets/tooltips/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/widgets/tooltips/main.rb
 +++ b/ruby/qtruby/examples/widgets/tooltips/main.rb
 @@ -23,7 +23,7 @@
@@ -1425,6 +1693,8 @@
  require 'sortingbox.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/widgets/wiggly/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/widgets/wiggly/main.rb
 +++ b/ruby/qtruby/examples/widgets/wiggly/main.rb
 @@ -1,6 +1,6 @@
@@ -1435,6 +1705,8 @@
  require 'dialog.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/widgets/windowflags/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/widgets/windowflags/main.rb
 +++ b/ruby/qtruby/examples/widgets/windowflags/main.rb
 @@ -23,7 +23,7 @@
@@ -1446,6 +1718,8 @@
  require 'controllerwindow.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/xml/dombookmarks/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/xml/dombookmarks/main.rb
 +++ b/ruby/qtruby/examples/xml/dombookmarks/main.rb
 @@ -23,7 +23,7 @@
@@ -1457,6 +1731,8 @@
  require 'mainwindow.rb'
  
  $KCODE = 'u'
+Index: b/ruby/qtruby/examples/xml/saxbookmarks/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/xml/saxbookmarks/main.rb
 +++ b/ruby/qtruby/examples/xml/saxbookmarks/main.rb
 @@ -23,7 +23,7 @@
@@ -1468,9 +1744,11 @@
  require 'mainwindow.rb'
  
  $KCODE = 'u'
+Index: b/ruby/qtruby/rails_support/active_item_model.rb
+===================================================================
 --- a/ruby/qtruby/rails_support/active_item_model.rb
 +++ b/ruby/qtruby/rails_support/active_item_model.rb
-@@ -16,7 +16,7 @@ Written by Richard Dale and Silvio Fonse
+@@ -16,7 +16,7 @@
  
  =end
  
@@ -1479,9 +1757,11 @@
  
  #require "active_record"
  #require "active_support"
+Index: b/ruby/qtruby/rails_support/active_table_model.rb
+===================================================================
 --- a/ruby/qtruby/rails_support/active_table_model.rb
 +++ b/ruby/qtruby/rails_support/active_table_model.rb
-@@ -15,7 +15,7 @@ Written by Richard Dale and Silvio Fonse
+@@ -15,7 +15,7 @@
  
  =end
  
@@ -1490,6 +1770,8 @@
  require 'date'
  
  class ActiveTableModel < Qt::AbstractTableModel
+Index: b/ruby/qtruby/test/opoverloading.rb
+===================================================================
 --- a/ruby/qtruby/test/opoverloading.rb
 +++ b/ruby/qtruby/test/opoverloading.rb
 @@ -1,4 +1,4 @@
@@ -1498,6 +1780,8 @@
  
  class Qt::Point
     def to_s
+Index: b/ruby/qtruby/test/unittests.rb
+===================================================================
 --- a/ruby/qtruby/test/unittests.rb
 +++ b/ruby/qtruby/test/unittests.rb
 @@ -1,4 +1,4 @@
@@ -1506,6 +1790,8 @@
  require 'test/unit'
  
  class TestQtRuby < Test::Unit::TestCase
+Index: b/ruby/qtruby/examples/painting/imagecomposition/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/painting/imagecomposition/main.rb
 +++ b/ruby/qtruby/examples/painting/imagecomposition/main.rb
 @@ -23,7 +23,7 @@
@@ -1517,6 +1803,8 @@
  require 'imagecomposer.rb'
  require 'qrc_imagecomposition.rb'
  
+Index: b/ruby/qtruby/examples/painting/painterpaths/main.rb
+===================================================================
 --- a/ruby/qtruby/examples/painting/painterpaths/main.rb
 +++ b/ruby/qtruby/examples/painting/painterpaths/main.rb
 @@ -23,7 +23,7 @@
@@ -1528,6 +1816,8 @@
  require 'window.rb'
  
  app = Qt::Application.new(ARGV)
+Index: b/ruby/qtruby/examples/ruboids/ruboids/ruboids.rb
+===================================================================
 --- a/ruby/qtruby/examples/ruboids/ruboids/ruboids.rb
 +++ b/ruby/qtruby/examples/ruboids/ruboids/ruboids.rb
 @@ -6,7 +6,7 @@
@@ -1539,6 +1829,8 @@
  require 'World'
  require 'WorldWindow'
  require 'Canvas'
+Index: b/ruby/qtruby/examples/textedit/textedit.rb
+===================================================================
 --- a/ruby/qtruby/examples/textedit/textedit.rb
 +++ b/ruby/qtruby/examples/textedit/textedit.rb
 @@ -1,6 +1,6 @@

Modified: trunk/packages/kdebindings/debian/patches/08_csharp_plasma_examples.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/08_csharp_plasma_examples.diff	2010-02-27 15:01:29 UTC (rev 17188)
+++ trunk/packages/kdebindings/debian/patches/08_csharp_plasma_examples.diff	2010-02-27 16:40:51 UTC (rev 17189)
@@ -1,9 +1,9 @@
+Index: b/csharp/plasma/examples/applets/CMakeLists.txt
+===================================================================
 --- a/csharp/plasma/examples/applets/CMakeLists.txt
 +++ b/csharp/plasma/examples/applets/CMakeLists.txt
-@@ -1,4 +1,4 @@
+@@ -1,2 +1,3 @@
  add_subdirectory( extendertutorial )
 -add_subdirectory( tiger )
 +#add_subdirectory( tiger )
- add_subdirectory( plasmaclock )
--add_subdirectory( analog-clock )
-+#add_subdirectory( analog-clock )
++

Modified: trunk/packages/kdebindings/debian/patches/11_make_pykde4_respect_sip_flags.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/11_make_pykde4_respect_sip_flags.diff	2010-02-27 15:01:29 UTC (rev 17188)
+++ trunk/packages/kdebindings/debian/patches/11_make_pykde4_respect_sip_flags.diff	2010-02-27 16:40:51 UTC (rev 17189)
@@ -1,6 +1,8 @@
+Index: b/python/pykde4/CMakeLists.txt
+===================================================================
 --- a/python/pykde4/CMakeLists.txt
 +++ b/python/pykde4/CMakeLists.txt
-@@ -75,6 +75,9 @@ INCLUDE_DIRECTORIES(
+@@ -87,6 +87,9 @@
      ${KDEPIMLIBS_INCLUDE_DIRS}
  )
  
@@ -10,12 +12,12 @@
  SET(SIP_INCLUDES ${PYQT4_SIP_DIR} sip)
  SET(SIP_CONCAT_PARTS 8)
  IF (WIN32)
-@@ -82,7 +85,7 @@ IF (WIN32)
+@@ -94,7 +97,7 @@
  ELSE (WIN32)
      SET(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG})
  ENDIF (WIN32)
 -SET(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug)
 +SET(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug ${SIP_ARM_HACK})
- SET(SIP_EXTRA_OPTIONS -g)
  
- ADD_DEFINITIONS(-D_REENTRANT -DQT_CORE_LIB -DQT_GUI_LIB -DUSING_SOPRANO_NRLMODEL_UNSTABLE_API)
+ # Use an extra option when compiling on Python 3.
+ IF (PYTHON_3)

Modified: trunk/packages/kdebindings/debian/patches/series
===================================================================
--- trunk/packages/kdebindings/debian/patches/series	2010-02-27 15:01:29 UTC (rev 17188)
+++ trunk/packages/kdebindings/debian/patches/series	2010-02-27 16:40:51 UTC (rev 17189)
@@ -1,12 +1,11 @@
 01_python_modules_dont_link_against_libpython.diff
 02_include_default_settings_in_python_cmakelist.diff
-03_csharp_dont_use_qyotoshared_directly.diff
+# import changed from libqyotoshared to qyotoshared
+#03_csharp_dont_use_qyotoshared_directly.diff
 04_fix_ruby_requires.diff
 05_rbqtapi_ruby1.8.diff
-06_build_smokephonon.diff
 07_fix_kpythonpluginfactory_build.diff
 08_csharp_plasma_examples.diff
 10_fix_kimono_dllimports.diff
 11_make_pykde4_respect_sip_flags.diff
 12_pythonpluginfactory_use_versioned_python_lib.diff
-13_csharp_fix_build_deps.diff




More information about the pkg-kde-commits mailing list