rev 12448 - in branches/kde4/packages/kdebindings/debian: . patches
Sune Vuorela
pusling-guest at alioth.debian.org
Mon Oct 20 21:45:01 UTC 2008
Author: pusling-guest
Date: 2008-10-20 21:45:00 +0000 (Mon, 20 Oct 2008)
New Revision: 12448
Removed:
branches/kde4/packages/kdebindings/debian/patches/05_static_class_constructor.diff
branches/kde4/packages/kdebindings/debian/patches/07_qtrubyshared_soname.diff
Modified:
branches/kde4/packages/kdebindings/debian/changelog
branches/kde4/packages/kdebindings/debian/control
branches/kde4/packages/kdebindings/debian/patches/01_python_modules_dont_link_against_libpython.diff
branches/kde4/packages/kdebindings/debian/patches/02_include_default_settings_in_python_cmakelist.diff
branches/kde4/packages/kdebindings/debian/patches/03_csharp_dont_use_qyotoshared_directly.diff
branches/kde4/packages/kdebindings/debian/patches/04_fix_ruby_requires.diff
branches/kde4/packages/kdebindings/debian/patches/06_qyotoshared_needs_soname.diff
branches/kde4/packages/kdebindings/debian/patches/97_fix_target_link_libraries.diff
branches/kde4/packages/kdebindings/debian/patches/99_enable_okular_plasma.diff
branches/kde4/packages/kdebindings/debian/patches/series
Log:
new upstream
Modified: branches/kde4/packages/kdebindings/debian/changelog
===================================================================
--- branches/kde4/packages/kdebindings/debian/changelog 2008-10-19 23:15:13 UTC (rev 12447)
+++ branches/kde4/packages/kdebindings/debian/changelog 2008-10-20 21:45:00 UTC (rev 12448)
@@ -1,3 +1,10 @@
+kdebindings (4:4.1.2-1) UNRELEASED; urgency=low
+
+ * Upstream new.
+ * Use upstream soname instead of debian soname of qtruby
+
+ -- Sune Vuorela <debian at puslintg.com> Sun, 19 Oct 2008 23:46:15 +0000
+
kdebindings (4:4.1.1-1) UNRELEASED; urgency=low
* Initial upload.
@@ -17,7 +24,7 @@
* Package rest of bindings
* Fix target link libraries
* Fix ruby build
- * Fix pykde seperate build
+ * Fix pykde separate build
* Reimplement a shell construct in make to have it be more reliable
* Add cdbs for utils.mk
Modified: branches/kde4/packages/kdebindings/debian/control
===================================================================
--- branches/kde4/packages/kdebindings/debian/control 2008-10-19 23:15:13 UTC (rev 12447)
+++ branches/kde4/packages/kdebindings/debian/control 2008-10-20 21:45:00 UTC (rev 12448)
@@ -80,7 +80,7 @@
.
This is part of KDE Bindings module
-Package: libqtruby4shared1d
+Package: libqtruby4shared2
Section: libs
Depends: ${shlibs:Depends}
Architecture: any
@@ -233,7 +233,7 @@
Package: libkimono4.1-cil
Section: libs
-Depends: libqyoto4.4-cil (= ${binary:Version}), ${cli:Depends}
+Depends: libqyoto4.4-cil (= ${binary:Version}), ${cli:Depends}, ${shlibs:Depends}
Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 lpia
Description: kde4 bindings for CLI
This package provides the kde-dotnet assembly that
@@ -243,7 +243,7 @@
Package: libkhtml2.0-cil
Section: libs
-Depends: libyoto4.4-cil (= ${binary:Version}), libkimono4.1-cil (= ${binary:Version}), ${cli:Depends}
+Depends: libyoto4.4-cil (= ${binary:Version}), libkimono4.1-cil (= ${binary:Version}), ${cli:Depends}, ${shlibs:Depends}
Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 lpia
Description: kde4 bindings for CLI, khtml edition
This package provides the khtml assembly that
@@ -253,7 +253,7 @@
Package: libnepomuk2.2-cil
Section: libs
-Depends: libqyoto4.4-cil (= ${binary:Version}), libkimono4.1-cil (= ${binary:Version}), ${cli:Depends}
+Depends: libqyoto4.4-cil (= ${binary:Version}), libkimono4.1-cil (= ${binary:Version}), ${cli:Depends}, ${shlibs:Depends}
Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 lpia
Description: kde4 bindings for CLI, Nepomuk-edition
This package provides the nepomuk assembly that allows
@@ -263,7 +263,7 @@
Package: libqtscript2.2-cil
Section: libs
-Depends: libqyoto4.4-cil (= ${binary:Version}), ${cli:Depends}
+Depends: libqyoto4.4-cil (= ${binary:Version}), ${cli:Depends}, ${shlibs:Depends}
Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 lpia
Description: Qt4 bindings for CLI, QtScript edition
This package provides the QtSCript assemply that allows
@@ -273,7 +273,7 @@
Package: libqtuitools2.2-cil
Section: libs
-Depends: libqyoto4.4-cil (= ${binary:Version}), ${cli:Depends}
+Depends: libqyoto4.4-cil (= ${binary:Version}), ${cli:Depends}, ${shlibs:Depends}
Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 lpia
Description: Qt4 bindings for CLI, QtUiTools edition
This package provides the QtUiTools assembly, that allows
@@ -283,7 +283,7 @@
Package: libqtwebkit2.2-cil
Section: libs
-Depends: libqyoto4.4-cil (= ${binary:Version}), ${cli:Depends}
+Depends: libqyoto4.4-cil (= ${binary:Version}), ${cli:Depends}, ${shlibs:Depends}
Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 lpia
Description: Qt4 bindings for CLI, QtWebkit edition
This package provides the QtWebkit assembly, that allows
@@ -291,7 +291,7 @@
Package: libsoprano2.0-cil
Section: libs
-Depends: libqyoto4.4-cil (= ${binary:Version}), ${cli:Depends}
+Depends: libqyoto4.4-cil (= ${binary:Version}), ${cli:Depends}, ${shlibs:Depends}
Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390 lpia
Description: Soprano bindings for CLI
This package provides the soprano assembly, that allows CLI based
Modified: branches/kde4/packages/kdebindings/debian/patches/01_python_modules_dont_link_against_libpython.diff
===================================================================
--- branches/kde4/packages/kdebindings/debian/patches/01_python_modules_dont_link_against_libpython.diff 2008-10-19 23:15:13 UTC (rev 12447)
+++ branches/kde4/packages/kdebindings/debian/patches/01_python_modules_dont_link_against_libpython.diff 2008-10-20 21:45:00 UTC (rev 12448)
@@ -2,8 +2,6 @@
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/cmake/modules/SIPMacros.cmake
-===================================================================
--- a/python/pykde4/cmake/modules/SIPMacros.cmake
+++ b/python/pykde4/cmake/modules/SIPMacros.cmake
@@ -106,7 +106,6 @@
@@ -14,11 +12,9 @@
TARGET_LINK_LIBRARIES(${_logical_name} ${EXTRA_LINK_LIBRARIES})
SET_TARGET_PROPERTIES(${_logical_name} PROPERTIES PREFIX "" OUTPUT_NAME ${_child_module_name})
-Index: b/python/pykde4/CMakeLists.txt
-===================================================================
--- a/python/pykde4/CMakeLists.txt
+++ b/python/pykde4/CMakeLists.txt
-@@ -59,6 +59,9 @@
+@@ -66,6 +66,9 @@
ADD_DEFINITIONS(-D_REENTRANT -DQT_NO_DEBUG -DQT_CORE_LIB -DQT_GUI_LIB)
Modified: branches/kde4/packages/kdebindings/debian/patches/02_include_default_settings_in_python_cmakelist.diff
===================================================================
--- branches/kde4/packages/kdebindings/debian/patches/02_include_default_settings_in_python_cmakelist.diff 2008-10-19 23:15:13 UTC (rev 12447)
+++ branches/kde4/packages/kdebindings/debian/patches/02_include_default_settings_in_python_cmakelist.diff 2008-10-20 21:45:00 UTC (rev 12448)
@@ -1,8 +1,8 @@
--- a/python/pykde4/CMakeLists.txt
+++ b/python/pykde4/CMakeLists.txt
-@@ -3,6 +3,18 @@
- # This module can be built independant from the rest of kdebindings.
- SET(CMAKE_MODULE_PATH ${pykde4_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
+@@ -10,6 +10,18 @@
+ SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/pykde)
+ ENDIF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 6)
+# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
Modified: branches/kde4/packages/kdebindings/debian/patches/03_csharp_dont_use_qyotoshared_directly.diff
===================================================================
--- branches/kde4/packages/kdebindings/debian/patches/03_csharp_dont_use_qyotoshared_directly.diff 2008-10-19 23:15:13 UTC (rev 12447)
+++ branches/kde4/packages/kdebindings/debian/patches/03_csharp_dont_use_qyotoshared_directly.diff 2008-10-20 21:45:00 UTC (rev 12448)
@@ -30,7 +30,7 @@
public static extern void InstallInvokeDelegate(InvokeDelegateFn callback);
[DllImport("libqyoto", CharSet=CharSet.Ansi)]
-@@ -831,4 +831,4 @@
+@@ -879,4 +879,4 @@
#endregion
}
Modified: branches/kde4/packages/kdebindings/debian/patches/04_fix_ruby_requires.diff
===================================================================
--- branches/kde4/packages/kdebindings/debian/patches/04_fix_ruby_requires.diff 2008-10-19 23:15:13 UTC (rev 12447)
+++ branches/kde4/packages/kdebindings/debian/patches/04_fix_ruby_requires.diff 2008-10-20 21:45:00 UTC (rev 12448)
@@ -1,5 +1,3 @@
-Index: b/ruby/korundum/examples/RubberDoc.rb
-===================================================================
--- a/ruby/korundum/examples/RubberDoc.rb
+++ b/ruby/korundum/examples/RubberDoc.rb
@@ -1,6 +1,6 @@
@@ -10,8 +8,6 @@
about = KDE::AboutData.new("one", "two", "three")
KDE::CmdLineArgs.init(1, ["RubberDoc"], about)
-Index: b/ruby/korundum/examples/kludgeror.rb
-===================================================================
--- a/ruby/korundum/examples/kludgeror.rb
+++ b/ruby/korundum/examples/kludgeror.rb
@@ -4,7 +4,7 @@
@@ -23,8 +19,6 @@
opt = [ [ "+[url]", "An URL to open at startup.", "" ],
[ "z", "A dummy binary option.", "" ],
-Index: b/ruby/korundum/examples/menudemo.rb
-===================================================================
--- a/ruby/korundum/examples/menudemo.rb
+++ b/ruby/korundum/examples/menudemo.rb
@@ -38,7 +38,7 @@
@@ -36,8 +30,6 @@
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 @@
@@ -49,8 +41,6 @@
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 @@
@@ -62,8 +52,6 @@
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 @@
@@ -75,8 +63,6 @@
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 @@
@@ -87,8 +73,6 @@
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 @@
@@ -100,8 +84,6 @@
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 @@
@@ -113,8 +95,6 @@
module KDE
class Application < Qt::Base
-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 @@
@@ -126,8 +106,6 @@
=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 @@
@@ -139,8 +117,6 @@
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 @@
@@ -152,8 +128,6 @@
-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 @@
@@ -165,8 +139,6 @@
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 @@
@@ -178,8 +150,6 @@
=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 @@
@@ -191,8 +161,6 @@
# 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 @@
@@ -204,8 +172,6 @@
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 @@
@@ -217,8 +183,6 @@
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 @@
@@ -230,8 +194,6 @@
-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 @@
@@ -243,8 +205,6 @@
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 @@
@@ -256,8 +216,6 @@
-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 @@
@@ -269,8 +227,6 @@
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 @@
@@ -282,8 +238,6 @@
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 @@
@@ -295,8 +249,6 @@
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 @@
@@ -308,8 +260,6 @@
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 @@
@@ -321,8 +271,6 @@
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 @@
@@ -334,8 +282,6 @@
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 @@
@@ -347,8 +293,6 @@
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 @@
@@ -360,8 +304,6 @@
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 @@
@@ -373,8 +315,6 @@
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 @@
@@ -386,8 +326,6 @@
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 @@
@@ -399,8 +337,6 @@
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 @@
@@ -412,8 +348,6 @@
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 @@
@@ -425,8 +359,6 @@
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 @@
@@ -438,8 +370,6 @@
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 @@
@@ -451,8 +381,6 @@
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 @@
@@ -464,8 +392,6 @@
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 @@
@@ -477,8 +403,6 @@
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 @@
@@ -490,8 +414,6 @@
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 @@
@@ -503,8 +425,6 @@
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 @@
@@ -516,8 +436,6 @@
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 @@
@@ -529,8 +447,6 @@
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 @@
@@ -542,8 +458,6 @@
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 @@
@@ -555,8 +469,6 @@
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 @@
@@ -568,8 +480,6 @@
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 @@
@@ -581,8 +491,6 @@
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 @@
@@ -594,8 +502,6 @@
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 @@
@@ -607,8 +513,6 @@
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 @@
@@ -620,8 +524,6 @@
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 @@
@@ -633,8 +535,6 @@
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 @@
@@ -646,8 +546,6 @@
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 @@
@@ -659,8 +557,6 @@
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 @@
@@ -672,8 +568,6 @@
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 @@
@@ -685,8 +579,6 @@
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 @@
@@ -698,8 +590,6 @@
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 @@
@@ -711,8 +601,6 @@
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 @@
@@ -724,8 +612,6 @@
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 @@
@@ -737,8 +623,6 @@
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 @@
@@ -750,8 +634,6 @@
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 @@
@@ -763,8 +645,6 @@
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 @@
@@ -776,8 +656,6 @@
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 @@
@@ -789,8 +667,6 @@
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 @@
@@ -802,8 +678,6 @@
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 @@
@@ -815,8 +689,6 @@
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 @@
@@ -828,8 +700,6 @@
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 @@
@@ -841,8 +711,6 @@
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 @@
@@ -854,8 +722,6 @@
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 @@
@@ -867,8 +733,6 @@
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 @@
@@ -880,8 +744,6 @@
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 @@
@@ -893,8 +755,6 @@
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 @@
@@ -906,8 +766,6 @@
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 @@
@@ -919,8 +777,6 @@
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 @@
@@ -932,8 +788,6 @@
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 @@
@@ -944,8 +798,6 @@
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 @@
@@ -957,8 +809,6 @@
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 @@
@@ -970,8 +820,6 @@
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 @@
@@ -983,8 +831,6 @@
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 @@
@@ -996,8 +842,6 @@
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 @@
@@ -1009,8 +853,6 @@
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 @@
@@ -1022,8 +864,6 @@
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 @@
@@ -1035,8 +875,6 @@
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 @@
@@ -1048,8 +886,6 @@
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 @@
@@ -1061,8 +897,6 @@
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 @@
@@ -1074,8 +908,6 @@
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 @@
@@ -1087,8 +919,6 @@
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 @@
@@ -1100,8 +930,6 @@
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 @@
@@ -1113,8 +941,6 @@
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 @@
@@ -1126,8 +952,6 @@
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 @@
@@ -1139,8 +963,6 @@
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 @@
@@ -1152,8 +974,6 @@
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 @@
@@ -1165,8 +985,6 @@
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 @@
@@ -1178,8 +996,6 @@
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 @@
@@ -1188,8 +1004,6 @@
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 @@
@@ -1198,8 +1012,6 @@
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 @@
@@ -1211,8 +1023,6 @@
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 @@
@@ -1222,8 +1032,6 @@
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 @@
@@ -1232,8 +1040,6 @@
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 @@
@@ -1245,8 +1051,6 @@
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 @@
@@ -1256,8 +1060,6 @@
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 @@
@@ -1266,8 +1068,6 @@
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 @@
@@ -1279,8 +1079,6 @@
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 @@
@@ -1289,8 +1087,6 @@
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 @@
@@ -1299,8 +1095,6 @@
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 @@
@@ -1309,8 +1103,6 @@
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 @@
@@ -1322,8 +1114,6 @@
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 @@
@@ -1335,8 +1125,6 @@
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 @@
@@ -1348,8 +1136,6 @@
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 @@
@@ -1361,8 +1147,6 @@
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 @@
@@ -1374,8 +1158,6 @@
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 @@
@@ -1387,8 +1169,6 @@
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 @@
@@ -1400,8 +1180,6 @@
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 @@
@@ -1411,8 +1189,6 @@
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 @@
@@ -1424,8 +1200,6 @@
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 @@
@@ -1434,8 +1208,6 @@
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 @@
@@ -1444,8 +1216,6 @@
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 @@
@@ -1457,8 +1227,6 @@
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 @@
@@ -1467,8 +1235,6 @@
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 @@
@@ -1477,8 +1243,6 @@
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 @@
@@ -1490,8 +1254,6 @@
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 @@
@@ -1503,8 +1265,6 @@
# 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 @@
@@ -1515,8 +1275,6 @@
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 @@
@@ -1528,8 +1286,6 @@
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 @@
@@ -1541,8 +1297,6 @@
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 @@
@@ -1551,8 +1305,6 @@
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 @@
@@ -1563,8 +1315,6 @@
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 @@
@@ -1576,8 +1326,6 @@
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 @@
@@ -1589,8 +1337,6 @@
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 @@
@@ -1602,8 +1348,6 @@
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 @@
@@ -1615,8 +1359,6 @@
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 @@
@@ -1628,8 +1370,6 @@
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 @@
@@ -1641,8 +1381,6 @@
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 @@
@@ -1654,8 +1392,6 @@
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 @@
@@ -1667,8 +1403,6 @@
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 @@
@@ -1680,8 +1414,6 @@
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 @@
@@ -1693,8 +1425,6 @@
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 @@
@@ -1706,8 +1436,6 @@
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 @@
@@ -1718,8 +1446,6 @@
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 @@
@@ -1731,8 +1457,6 @@
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 @@
@@ -1744,8 +1468,6 @@
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 @@
@@ -1757,8 +1479,6 @@
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
@@ -15,7 +15,7 @@
@@ -1770,8 +1490,6 @@
#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 @@
@@ -1783,8 +1501,6 @@
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 @@
@@ -1793,8 +1509,6 @@
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 @@
@@ -1803,8 +1517,6 @@
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 @@
@@ -1816,8 +1528,6 @@
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 @@
@@ -1829,8 +1539,6 @@
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 @@
@@ -1842,8 +1550,6 @@
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 @@
Deleted: branches/kde4/packages/kdebindings/debian/patches/05_static_class_constructor.diff
Modified: branches/kde4/packages/kdebindings/debian/patches/06_qyotoshared_needs_soname.diff
===================================================================
--- branches/kde4/packages/kdebindings/debian/patches/06_qyotoshared_needs_soname.diff 2008-10-19 23:15:13 UTC (rev 12447)
+++ branches/kde4/packages/kdebindings/debian/patches/06_qyotoshared_needs_soname.diff 2008-10-20 21:45:00 UTC (rev 12448)
@@ -1,11 +1,11 @@
We are currently treating this as a real library and sonaming it appropriately
--- a/csharp/qyoto/CMakeLists.txt
+++ b/csharp/qyoto/CMakeLists.txt
-@@ -42,6 +42,7 @@
+@@ -39,6 +39,7 @@
LINK_DIRECTORIES (${LIBRARY_OUTPUT_PATH})
ADD_LIBRARY (qyotoshared SHARED ${SRC_QYOTO_SHARED})
+set_target_properties(qyotoshared PROPERTIES VERSION 1d.0.0 SOVERSION 1d)
TARGET_LINK_LIBRARIES (qyotoshared smokeqt ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
+ set_target_properties(qyotoshared PROPERTIES VERSION 1.0.0 SOVERSION 1)
- ADD_LIBRARY (qyoto MODULE ${SRC_QYOTO})
Deleted: branches/kde4/packages/kdebindings/debian/patches/07_qtrubyshared_soname.diff
Modified: branches/kde4/packages/kdebindings/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- branches/kde4/packages/kdebindings/debian/patches/97_fix_target_link_libraries.diff 2008-10-19 23:15:13 UTC (rev 12447)
+++ branches/kde4/packages/kdebindings/debian/patches/97_fix_target_link_libraries.diff 2008-10-20 21:45:00 UTC (rev 12448)
@@ -1,5 +1,3 @@
-Index: b/smoke/qtuitools/CMakeLists.txt
-===================================================================
--- a/smoke/qtuitools/CMakeLists.txt
+++ b/smoke/qtuitools/CMakeLists.txt
@@ -27,7 +27,7 @@
Modified: branches/kde4/packages/kdebindings/debian/patches/99_enable_okular_plasma.diff
===================================================================
--- branches/kde4/packages/kdebindings/debian/patches/99_enable_okular_plasma.diff 2008-10-19 23:15:13 UTC (rev 12447)
+++ branches/kde4/packages/kdebindings/debian/patches/99_enable_okular_plasma.diff 2008-10-20 21:45:00 UTC (rev 12448)
@@ -1,21 +1,17 @@
-Index: b/CMakeLists.txt
-===================================================================
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -19,6 +19,8 @@
+@@ -32,6 +32,8 @@
macro_optional_find_package(KdepimLibs)
macro_optional_find_package(Phonon)
macro_optional_find_package(QScintilla)
+macro_optional_find_package(Okular)
+macro_optional_find_package(Plasma)
- macro_optional_add_subdirectory(smoke)
- macro_optional_add_subdirectory(ruby)
-Index: b/csharp/CMakeLists.txt
-===================================================================
+ # Look for Okular
+ set( OKULAR_FOUND "no" )
--- a/csharp/CMakeLists.txt
+++ b/csharp/CMakeLists.txt
-@@ -97,8 +97,8 @@
+@@ -106,8 +106,8 @@
endif(KDEPIMLIBS_FOUND AND Akonadi_FOUND)
IF(PLASMA_FOUND)
Modified: branches/kde4/packages/kdebindings/debian/patches/series
===================================================================
--- branches/kde4/packages/kdebindings/debian/patches/series 2008-10-19 23:15:13 UTC (rev 12447)
+++ branches/kde4/packages/kdebindings/debian/patches/series 2008-10-20 21:45:00 UTC (rev 12448)
@@ -2,8 +2,6 @@
02_include_default_settings_in_python_cmakelist.diff
03_csharp_dont_use_qyotoshared_directly.diff
04_fix_ruby_requires.diff
-05_static_class_constructor.diff
06_qyotoshared_needs_soname.diff
-07_qtrubyshared_soname.diff
97_fix_target_link_libraries.diff
99_enable_okular_plasma.diff
More information about the pkg-kde-commits
mailing list