rev 11726 - in branches/kde4/packages/kdebindings/debian: . patches
David Palacio
dpalacio-guest at alioth.debian.org
Fri Jul 25 16:33:18 UTC 2008
Author: dpalacio-guest
Date: 2008-07-25 16:33:18 +0000 (Fri, 25 Jul 2008)
New Revision: 11726
Added:
branches/kde4/packages/kdebindings/debian/korundum4.install
branches/kde4/packages/kdebindings/debian/krubyapplication.1
branches/kde4/packages/kdebindings/debian/libkde4-ruby.install
branches/kde4/packages/kdebindings/debian/libkde4-ruby1.8.install
branches/kde4/packages/kdebindings/debian/libokular-ruby.install
branches/kde4/packages/kdebindings/debian/libokular-ruby1.8.install
branches/kde4/packages/kdebindings/debian/libplasma-ruby.install
branches/kde4/packages/kdebindings/debian/libplasma-ruby1.8.install
branches/kde4/packages/kdebindings/debian/libqt4-ruby.install
branches/kde4/packages/kdebindings/debian/libqt4-ruby1.8-dev.install
branches/kde4/packages/kdebindings/debian/libqt4-ruby1.8.install
branches/kde4/packages/kdebindings/debian/libqt4-ruby1.8.links
branches/kde4/packages/kdebindings/debian/libqt4-ruby1.8.manpages
branches/kde4/packages/kdebindings/debian/libsmokekde4-dev.install
branches/kde4/packages/kdebindings/debian/libsmokekde4.install
branches/kde4/packages/kdebindings/debian/libsmokeokular-dev.install
branches/kde4/packages/kdebindings/debian/libsmokeokular.install
branches/kde4/packages/kdebindings/debian/libsmokeplasma-dev.install
branches/kde4/packages/kdebindings/debian/libsmokeplasma.install
branches/kde4/packages/kdebindings/debian/libsmokeqt4-dev.install
branches/kde4/packages/kdebindings/debian/libsmokeqt4.install
branches/kde4/packages/kdebindings/debian/patches/04_fix_ruby_requires.diff
branches/kde4/packages/kdebindings/debian/patches/99_enable_okular_plasma.diff
branches/kde4/packages/kdebindings/debian/rbkconfig_compiler4.1
branches/kde4/packages/kdebindings/debian/rbqtapi.1
branches/kde4/packages/kdebindings/debian/rbrcc.1
branches/kde4/packages/kdebindings/debian/rbuic4.1
Removed:
branches/kde4/packages/kdebindings/debian/patches/04_disable_csharp_tutorials.diff
branches/kde4/packages/kdebindings/debian/patches/bindings_branch.diff
Modified:
branches/kde4/packages/kdebindings/debian/control
branches/kde4/packages/kdebindings/debian/libsmoke2-dev.install
branches/kde4/packages/kdebindings/debian/not-installed
branches/kde4/packages/kdebindings/debian/patches/01_python_modules_dont_link_against_libpython.diff
branches/kde4/packages/kdebindings/debian/patches/03_disable_python-nepomuk_the_hard_way.diff
branches/kde4/packages/kdebindings/debian/patches/97_fix_target_link_libraries.diff
branches/kde4/packages/kdebindings/debian/patches/series
branches/kde4/packages/kdebindings/debian/rules
Log:
* Made Ruby bindings more rubyish by naming them lib[package]-ruby
* Split smoke in smaller packages for okular and plasma
* Build and package Okular, plasma and Nepomuk ruby bindings
Modified: branches/kde4/packages/kdebindings/debian/control
===================================================================
--- branches/kde4/packages/kdebindings/debian/control 2008-07-25 07:18:40 UTC (rev 11725)
+++ branches/kde4/packages/kdebindings/debian/control 2008-07-25 16:33:18 UTC (rev 11726)
@@ -11,6 +11,135 @@
Standards-Version: 3.7.3
Homepage: http://www.kde.org
+Package: korundum4
+Section: libs
+Architecture: any
+Depends: libkde4-ruby
+Suggests: libokular-ruby, libplasma-ruby
+Description: KDE4 ruby bindings
+ This package installs the complete suite
+ of KDE4 bindings including KHTML, Okular
+ Nepomuk and Solid bindings.
+
+Package: libsmoke2-dev
+Section: libdevel
+Depends: libsmokekde4 (= ${binary:Version}), libsmoke-qt4-2 (= ${binary:Version})
+Architecture: any
+Description: header files for qt4 and kde4 smoke
+ This contains the headers needed to build more bindings using smoke.
+
+Package: libsmokeqt4
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Architecture: any
+Description: qt4 smoke libraries
+ smoke libraries are a part of the bindings used for qt and kde. This package contains pure qt4 smoke.
+
+Package: libsmokeqt4-dev
+sections: libdevel
+Depends: libsmokeqt4
+Architecture: any
+Description: Smoke Qt4 headers
+
+Package: libsmokekde4
+Section: libs
+Depends: ${shlibs:Depends}, libsmokeqt4 (= ${binary:Version})
+Architecture: any
+Description: kde4 smoke libraries
+ smoke libraries are part of the bindings used for qt and kde. This package contains the kde4 parts of smoke.
+
+Package: libsmokekde4-dev
+Section: libdevel
+Depends: libsmokekde4-dev
+Architecture: any
+Description: KDE4 smoke headers
+
+Package: libqt4-ruby
+Section: libs
+Depends: libqt4-ruby1.8
+Architecture: any
+Description: Qt4 ruby bindings
+ This package installs the Qt4 bindings for the
+ default ruby version.
+
+Package: libqt4-ruby1.8
+Section: libs
+Depends: ${shlibs:Depends}, libsmokeqt4
+Architecture: any
+Description: qt4 bindings for ruby
+
+Package: libqt4-ruby1.8-dev
+Section: libdevel
+Depends: libqt4-ruby1.8
+Architecture: any
+Description: qt4 ruby dev tools
+
+Package: libkde4-ruby
+Section: libs
+Depends: libkde4-ruby1.8
+Architecture: any
+Description: KDE4 ruby bindings
+ This package installs the ruby bindings for
+ the default ruby interpreter.
+
+Package: libkde4-ruby1.8
+Section: libs
+Depends: ${shlibs:Depends}, libqt4-ruby1.8 (= ${binary:Version}), libsmokekde4 (= ${binary:Version})
+Architecture: any
+Description: kde4 bindings for ruby
+ KDE4 bindings for ruby
+
+Package: libsmokeokular
+Section: libs
+Depends: ${shlibs:Depends}, libsmokekde4 (= ${binary:Version})
+Architecture: any
+Description: Okular smoke bindings
+
+Package: libsmokeokular-dev
+Section: libdevel
+Depends: libsmokeokular
+Architecture: any
+Description: Okular smoke headers
+
+Package: libokular-ruby
+Section: libs
+Depends: libokular-ruby1.8
+Architecture: any
+Description: Okular ruby bindings
+ Defaults to ruby 1.8
+
+Package: libokular-ruby1.8
+Section: libs
+Depends: ${shlibs:Depends}, libkde4-ruby1.8
+Architecture: any
+Description: Okular ruby bindings
+
+Package: libsmokeplasma
+Section: libs
+Depends: libsmokekde4 (= ${binary:Version}), ${shlibs:Depends}
+Architecture: any
+Description: KDE4 plasma smoke library
+
+Package: libsmokeplasma-dev
+Section: libdevel
+Depends: libsmokeplasma, libplasma-dev
+Architecture: any
+Description: KDE4 plasma smoke library
+
+Package: libplasma-ruby
+Section: libs
+Depends: libplasma-ruby1.8
+Architecture: any
+Description: KDE4 plasma ruby bindings
+ This package allows you to create desktop widgets in the Ruby language. Get ruby 1.8.
+
+Package: libplasma-ruby1.8
+Section: libs
+Depends: libsmokeplasma (= ${binary:Version}), ${shlibs:Depends}
+Architecture: any
+Description: KDE4 plasma ruby1.8 bindings
+ This package allows you to create desktop widgets in the Ruby language
+
Package: python-kde4
Section: python
Architecture: any
@@ -55,29 +184,6 @@
This package contains documentation for PyKDE4, and some example code
showing how to use it.
-Package: libsmoke-qt4-2
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Architecture: any
-Description: qt4 smoke libraries
- smoke libraries are a part of the bindings used for qt and kde. This package
- contains pure qt4 smoke.
-
-Package: libsmoke-kde4-2
-Section: libs
-Depends: ${shlibs:Depends}, libsmoke-qt4-2 (= ${binary:Version})
-Architecture: any
-Description: kde4 smoke libraries
- smoke libraries are part of the bindings used for qt and kde. This package
- contains the kde4 parts of smoke.
-
-Package: libsmoke2-dev
-Section: libdevel
-Depends: libsmoke-kde4-2 (= ${binary:Version}), libsmoke-qt4-2 (= ${binary:Version})
-Architecture: any
-Description: header files for qt4 and kde4 smoke
- This contains the headers needed to build more bindings using smoke.
-
Package: kimono
Section: libs
Depends: libkhtml2.0-cil, libkde-dotnet4.1-cil
@@ -114,20 +220,3 @@
Architecture: any
Description: kde4 bindings for c-sharp, khtml edition
-Package: qt4-ruby
-Section: libs
-Depends: ${shlibs:Depends}
-Architecture: any
-Description: qt4 bindings for ruby
-
-Package: kde4-ruby
-Section: libs
-Depends: ${shlibs:Depends}, qt4-ruby (= ${binary:Version})
-Architecture: any
-Description: kde4 bindings for ruby
-
-Package: qt4-ruby-dev
-Section: libdevel
-Depends: ${shlibs:Depends}
-Architecture: any
-Description: qt4 ruby dev tools
Added: branches/kde4/packages/kdebindings/debian/korundum4.install
===================================================================
Added: branches/kde4/packages/kdebindings/debian/krubyapplication.1
===================================================================
--- branches/kde4/packages/kdebindings/debian/krubyapplication.1 (rev 0)
+++ branches/kde4/packages/kdebindings/debian/krubyapplication.1 2008-07-25 16:33:18 UTC (rev 11726)
@@ -0,0 +1,51 @@
+.TH RBQTAPI "1" "October 2006" "Qt4-qtruby version 1.4.6"
+.SH NAME
+rbqtapi \- a qtruby introspection tool
+
+.SH SYNOPSIS
+.B rbqtapi
+[options]
+.I [\-r re] [class]
+
+.SH DESCRIPTION
+
+.B rbqtapi
+can be used to check which Qt functions are known to
+qt4-qtruby. Without arguments, it lists all the function known. An
+argument is interpreted as a class name whose methods are
+displayed. You can also specify a regular expression to search for
+functions with the
+.B \-r
+option.
+
+.SH OPTIONS
+.TP
+.BI \-r \ re
+find all functions matching regular expression/keyword
+.IR re .
+
+.TP
+.B \-i
+together with
+.BR \-r ,
+performs a case insensitive search.
+
+.TP
+.B \-p
+display also inherited methods for
+.IR class .
+
+.TP
+.B \-v
+print qtruby and Qt versions
+
+.TP
+.B \-h
+prints a short help message.
+
+.SH AUTHOR
+.B rbqtapi
+was written by Germain Garand.
+
+This manual page was written by Vincent Fourmond for the Debian
+project, but may be used by others.
Added: branches/kde4/packages/kdebindings/debian/libkde4-ruby.install
===================================================================
Added: branches/kde4/packages/kdebindings/debian/libkde4-ruby1.8.install
===================================================================
--- branches/kde4/packages/kdebindings/debian/libkde4-ruby1.8.install (rev 0)
+++ branches/kde4/packages/kdebindings/debian/libkde4-ruby1.8.install 2008-07-25 16:33:18 UTC (rev 11726)
@@ -0,0 +1,15 @@
+usr/lib/ruby/1.8/KDE/korundum4.rb
+usr/lib/ruby/1.8/khtml/khtml.rb
+usr/lib/ruby/1.8/ktexteditor/ktexteditor.rb
+usr/lib/ruby/1.8/solid/solid.rb
+usr/lib/ruby/1.8/nepomuk/nepomuk.rb
+usr/lib/ruby/1.8/*/khtml.so
+usr/lib/ruby/1.8/*/korundum4.so
+usr/lib/ruby/1.8/*/ktexteditor.so
+usr/lib/ruby/1.8/*/solid.so
+usr/lib/ruby/1.8/*/nepomuk.so
+
+usr/lib/kde4/krossruby.so
+usr/lib/kde4/krubypluginfactory.so
+usr/bin/krubyapplication
+usr/bin/rbkconfig_compiler4
Added: branches/kde4/packages/kdebindings/debian/libokular-ruby.install
===================================================================
Added: branches/kde4/packages/kdebindings/debian/libokular-ruby1.8.install
===================================================================
--- branches/kde4/packages/kdebindings/debian/libokular-ruby1.8.install (rev 0)
+++ branches/kde4/packages/kdebindings/debian/libokular-ruby1.8.install 2008-07-25 16:33:18 UTC (rev 11726)
@@ -0,0 +1,2 @@
+usr/lib/ruby/1.8/x86_64-linux/okular.so
+usr/lib/ruby/1.8/okular/okular.rb
Added: branches/kde4/packages/kdebindings/debian/libplasma-ruby.install
===================================================================
Added: branches/kde4/packages/kdebindings/debian/libplasma-ruby1.8.install
===================================================================
--- branches/kde4/packages/kdebindings/debian/libplasma-ruby1.8.install (rev 0)
+++ branches/kde4/packages/kdebindings/debian/libplasma-ruby1.8.install 2008-07-25 16:33:18 UTC (rev 11726)
@@ -0,0 +1,19 @@
+/usr/share/kde4/services/plasma-ruby-clock-default.desktop
+/usr/share/kde4/apps/plasma_ruby_analog_clock/clock.rb
+/usr/share/kde4/apps/plasma_ruby_analog_clock/analog_clock_config.rb
+/usr/share/kde4/apps/plasma_ruby_analog_clock/calendar.rb
+/usr/share/kde4/services/plasma-ruby-digital-clock-default.desktop
+/usr/share/kde4/apps/plasma_ruby_digital_clock/clock.rb
+/usr/share/kde4/apps/plasma_ruby_digital_clock/digital_clock_config.rb
+/usr/share/kde4/apps/plasma_ruby_digital_clock/calendar.rb
+/usr/share/kde4/services/plasma-ruby-applet-web.desktop
+/usr/share/kde4/apps/plasma_ruby_web_applet/web_applet.rb
+/usr/lib/ruby/1.8/x86_64-linux/plasma_applet.so
+/usr/share/kde4/apps/plasma_scriptengine_ruby/package_ruboid.rb
+/usr/share/kde4/apps/plasma_scriptengine_ruby/applet.rb
+/usr/share/kde4/apps/plasma_scriptengine_ruby/data_engine.rb
+/usr/share/kde4/services/plasma-scriptengine-ruby-package.desktop
+/usr/share/kde4/services/plasma-scriptengine-ruby-applet.desktop
+/usr/share/kde4/services/plasma-scriptengine-ruby-dataengine.desktop
+/usr/lib/ruby/1.8/KDE/plasma.rb
+
Added: branches/kde4/packages/kdebindings/debian/libqt4-ruby.install
===================================================================
Added: branches/kde4/packages/kdebindings/debian/libqt4-ruby1.8-dev.install
===================================================================
--- branches/kde4/packages/kdebindings/debian/libqt4-ruby1.8-dev.install (rev 0)
+++ branches/kde4/packages/kdebindings/debian/libqt4-ruby1.8-dev.install 2008-07-25 16:33:18 UTC (rev 11726)
@@ -0,0 +1,8 @@
+./usr/include/qtruby/marshall.h
+./usr/include/qtruby/marshall_basetypes.h
+./usr/include/qtruby/marshall_complex.h
+./usr/include/qtruby/marshall_macros.h
+./usr/include/qtruby/marshall_primitives.h
+./usr/include/qtruby/marshall_types.h
+./usr/include/qtruby/qtruby.h
+./usr/include/qtruby/smokeruby.h
Added: branches/kde4/packages/kdebindings/debian/libqt4-ruby1.8.install
===================================================================
--- branches/kde4/packages/kdebindings/debian/libqt4-ruby1.8.install (rev 0)
+++ branches/kde4/packages/kdebindings/debian/libqt4-ruby1.8.install 2008-07-25 16:33:18 UTC (rev 11726)
@@ -0,0 +1,16 @@
+usr/lib/libqtruby4shared.so
+usr/lib/ruby/1.8/Qt.rb
+usr/lib/ruby/1.8/Qt/active_item_model.rb
+usr/lib/ruby/1.8/Qt/active_table_model.rb
+usr/lib/ruby/1.8/Qt/qtruby4.rb
+usr/lib/ruby/1.8/Qt4.rb
+usr/lib/ruby/1.8/phonon/phonon.rb
+usr/lib/ruby/1.8/qtuitools/qtuitools.rb
+usr/lib/ruby/1.8/qtwebkit/qtwebkit.rb
+usr/lib/ruby/1.8/*/phonon.so
+usr/lib/ruby/1.8/*/qtruby4.so
+usr/lib/ruby/1.8/*/qtuitools.so
+usr/lib/ruby/1.8/*/qtwebkit.so
+usr/bin/rbqtapi
+usr/bin/rbrcc
+usr/bin/rbuic4
Added: branches/kde4/packages/kdebindings/debian/libqt4-ruby1.8.links
===================================================================
--- branches/kde4/packages/kdebindings/debian/libqt4-ruby1.8.links (rev 0)
+++ branches/kde4/packages/kdebindings/debian/libqt4-ruby1.8.links 2008-07-25 16:33:18 UTC (rev 11726)
@@ -0,0 +1,2 @@
+usr/share/man/man1/rbqtapi.1.gz usr/share/man/man1/rbqt4api.1.gz
+usr/bin/rbqtapi usr/bin/rbqt4api
\ No newline at end of file
Added: branches/kde4/packages/kdebindings/debian/libqt4-ruby1.8.manpages
===================================================================
--- branches/kde4/packages/kdebindings/debian/libqt4-ruby1.8.manpages (rev 0)
+++ branches/kde4/packages/kdebindings/debian/libqt4-ruby1.8.manpages 2008-07-25 16:33:18 UTC (rev 11726)
@@ -0,0 +1,3 @@
+debian/rbqtapi.1
+debian/rbuic4.1
+debian/rbrcc.1
Modified: branches/kde4/packages/kdebindings/debian/libsmoke2-dev.install
===================================================================
--- branches/kde4/packages/kdebindings/debian/libsmoke2-dev.install 2008-07-25 07:18:40 UTC (rev 11725)
+++ branches/kde4/packages/kdebindings/debian/libsmoke2-dev.install 2008-07-25 16:33:18 UTC (rev 11726)
@@ -0,0 +1 @@
+usr/include/smoke.h
Added: branches/kde4/packages/kdebindings/debian/libsmokekde4-dev.install
===================================================================
--- branches/kde4/packages/kdebindings/debian/libsmokekde4-dev.install (rev 0)
+++ branches/kde4/packages/kdebindings/debian/libsmokekde4-dev.install 2008-07-25 16:33:18 UTC (rev 11726)
@@ -0,0 +1,12 @@
+./usr/lib/libsmokekde.so
+./usr/lib/libsmokekhtml.so
+./usr/lib/libsmokektexteditor.so
+./usr/lib/libsmokesolid.so
+./usr/lib/libsmokesoprano.so
+./usr/lib/libsmokenepomuk.so
+./usr/include/smoke/kde_smoke.h
+./usr/include/smoke/khtml_smoke.h
+./usr/include/smoke/ktexteditor_smoke.h
+./usr/include/smoke/solid_smoke.h
+./usr/include/smoke/soprano_smoke.h
+./usr/include/smoke/nepomuk_smoke.h
Added: branches/kde4/packages/kdebindings/debian/libsmokekde4.install
===================================================================
--- branches/kde4/packages/kdebindings/debian/libsmokekde4.install (rev 0)
+++ branches/kde4/packages/kdebindings/debian/libsmokekde4.install 2008-07-25 16:33:18 UTC (rev 11726)
@@ -0,0 +1,12 @@
+usr/lib/libsmokekde.so.2
+usr/lib/libsmokekde.so.2.0.0
+usr/lib/libsmokekhtml.so.2
+usr/lib/libsmokekhtml.so.2.0.0
+usr/lib/libsmokektexteditor.so.2
+usr/lib/libsmokektexteditor.so.2.0.0
+usr/lib/libsmokesolid.so.2
+usr/lib/libsmokesolid.so.2.0.0
+usr/lib/libsmokesoprano.so.2
+usr/lib/libsmokesoprano.so.2.0.0
+usr/lib/libsmokenepomuk.so.2.0.0
+usr/lib/libsmokenepomuk.so.2
Added: branches/kde4/packages/kdebindings/debian/libsmokeokular-dev.install
===================================================================
--- branches/kde4/packages/kdebindings/debian/libsmokeokular-dev.install (rev 0)
+++ branches/kde4/packages/kdebindings/debian/libsmokeokular-dev.install 2008-07-25 16:33:18 UTC (rev 11726)
@@ -0,0 +1,2 @@
+usr/lib/libsmokeokular.so
+usr/include/smoke/okular_smoke.h
Added: branches/kde4/packages/kdebindings/debian/libsmokeokular.install
===================================================================
--- branches/kde4/packages/kdebindings/debian/libsmokeokular.install (rev 0)
+++ branches/kde4/packages/kdebindings/debian/libsmokeokular.install 2008-07-25 16:33:18 UTC (rev 11726)
@@ -0,0 +1,2 @@
+usr/lib/libsmokeokular.so.2.0.0
+usr/lib/libsmokeokular.so.2
Added: branches/kde4/packages/kdebindings/debian/libsmokeplasma-dev.install
===================================================================
--- branches/kde4/packages/kdebindings/debian/libsmokeplasma-dev.install (rev 0)
+++ branches/kde4/packages/kdebindings/debian/libsmokeplasma-dev.install 2008-07-25 16:33:18 UTC (rev 11726)
@@ -0,0 +1,2 @@
+./usr/lib/libsmokeplasma.so
+./usr/include/smoke/plasma_smoke.h
Added: branches/kde4/packages/kdebindings/debian/libsmokeplasma.install
===================================================================
--- branches/kde4/packages/kdebindings/debian/libsmokeplasma.install (rev 0)
+++ branches/kde4/packages/kdebindings/debian/libsmokeplasma.install 2008-07-25 16:33:18 UTC (rev 11726)
@@ -0,0 +1,2 @@
+usr/lib/libsmokeplasma.so.2.0.0
+usr/lib/libsmokeplasma.so.2
Added: branches/kde4/packages/kdebindings/debian/libsmokeqt4-dev.install
===================================================================
--- branches/kde4/packages/kdebindings/debian/libsmokeqt4-dev.install (rev 0)
+++ branches/kde4/packages/kdebindings/debian/libsmokeqt4-dev.install 2008-07-25 16:33:18 UTC (rev 11726)
@@ -0,0 +1,8 @@
+./usr/lib/libsmokephonon.so
+./usr/lib/libsmokeqt.so
+./usr/lib/libsmokeqtuitools.so
+./usr/lib/libsmokeqtwebkit.so
+./usr/include/smoke/phonon_smoke.h
+./usr/include/smoke/qt_smoke.h
+./usr/include/smoke/qtuitools_smoke.h
+./usr/include/smoke/qtwebkit_smoke.h
Added: branches/kde4/packages/kdebindings/debian/libsmokeqt4.install
===================================================================
--- branches/kde4/packages/kdebindings/debian/libsmokeqt4.install (rev 0)
+++ branches/kde4/packages/kdebindings/debian/libsmokeqt4.install 2008-07-25 16:33:18 UTC (rev 11726)
@@ -0,0 +1,8 @@
+usr/lib/libsmokephonon.so.2
+usr/lib/libsmokephonon.so.2.0.0
+usr/lib/libsmokeqt.so.2
+usr/lib/libsmokeqt.so.2.0.0
+usr/lib/libsmokeqtuitools.so.2
+usr/lib/libsmokeqtuitools.so.2.0.0
+usr/lib/libsmokeqtwebkit.so.2
+usr/lib/libsmokeqtwebkit.so.2.0.0
Modified: branches/kde4/packages/kdebindings/debian/not-installed
===================================================================
--- branches/kde4/packages/kdebindings/debian/not-installed 2008-07-25 07:18:40 UTC (rev 11725)
+++ branches/kde4/packages/kdebindings/debian/not-installed 2008-07-25 16:33:18 UTC (rev 11726)
@@ -2,24 +2,7 @@
./usr/share/kde4/apps/pykde4/pykdeuic4.py
#no dev stuff yet
-./usr/lib/libsmokekde.so
-./usr/lib/libsmokekhtml.so
-./usr/lib/libsmokektexteditor.so
-./usr/lib/libsmokephonon.so
-./usr/lib/libsmokeqt.so
-./usr/lib/libsmokeqtuitools.so
-./usr/lib/libsmokeqtwebkit.so
-./usr/lib/libsmokesolid.so
-./usr/lib/libsmokesoprano.so
-./usr/include/qtruby/marshall.h
-./usr/include/qtruby/marshall_basetypes.h
-./usr/include/qtruby/marshall_complex.h
-./usr/include/qtruby/marshall_macros.h
-./usr/include/qtruby/marshall_primitives.h
-./usr/include/qtruby/marshall_types.h
-./usr/include/qtruby/qtruby.h
-./usr/include/qtruby/smokeruby.h
./usr/include/qyoto/emitsignal.h
./usr/include/qyoto/invokeslot.h
./usr/include/qyoto/marshall.h
@@ -33,13 +16,6 @@
./usr/include/qyoto/virtualmethodcall.h
./usr/include/qyoto/virtualmethodreturnvalue.h
./usr/include/smoke.h
-./usr/include/smoke/kde_smoke.h
-./usr/include/smoke/khtml_smoke.h
-./usr/include/smoke/ktexteditor_smoke.h
-./usr/include/smoke/phonon_smoke.h
-./usr/include/smoke/qt_smoke.h
-./usr/include/smoke/qtuitools_smoke.h
-./usr/include/smoke/qtwebkit_smoke.h
-./usr/include/smoke/solid_smoke.h
-./usr/include/smoke/soprano_smoke.h
+./usr/share/applications/kde4/dbpedia_references.desktop
+./usr/share/kde4/apps/dbpedia_references/dbpedia_references.rb
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-07-25 07:18:40 UTC (rev 11725)
+++ branches/kde4/packages/kdebindings/debian/patches/01_python_modules_dont_link_against_libpython.diff 2008-07-25 16:33:18 UTC (rev 11726)
@@ -2,25 +2,29 @@
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
-@@ -96,7 +96,6 @@
- DEPENDS ${_abs_module_sip}
+@@ -106,7 +106,6 @@
)
+
ADD_LIBRARY(${_logical_name} SHARED ${_sip_output_files} )
- TARGET_LINK_LIBRARIES(${_logical_name} ${PYTHON_LIBRARY})
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
-@@ -53,6 +53,9 @@
+@@ -59,6 +59,9 @@
ADD_DEFINITIONS(-D_REENTRANT -DQT_NO_DEBUG -DQT_CORE_LIB -DQT_GUI_LIB)
+# Do not use --no-undefined for python modules.
+STRING(REPLACE -Wl,--no-undefined "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
+
- ADD_SIP_PYTHON_MODULE(PyKDE4.kdecore sip/kdecore/kdecoremod.sip ${KDE4_KDECORE_LIBS} ${KDE4_KPTY_LIBS})
- ADD_SIP_PYTHON_MODULE(PyKDE4.solid sip/solid/solidmod.sip ${KDE4_SOLID_LIBS})
- ADD_SIP_PYTHON_MODULE(PyKDE4.kdeui sip/kdeui/kdeuimod.sip ${KDE4_KDEUI_LIBS})
+ ADD_SIP_PYTHON_MODULE(PyKDE4.kdecore sip/kdecore/kdecoremod.sip ${KDE4_KDECORE_LIBS} ${KDE4_KPTY_LIBS} ${QT_QTNETWORK_LIBRARY})
+ ADD_SIP_PYTHON_MODULE(PyKDE4.solid sip/solid/solidmod.sip ${KDE4_SOLID_LIBS} ${QT_QTCORE_LIBRARY})
+ ADD_SIP_PYTHON_MODULE(PyKDE4.kdeui sip/kdeui/kdeuimod.sip ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY})
Modified: branches/kde4/packages/kdebindings/debian/patches/03_disable_python-nepomuk_the_hard_way.diff
===================================================================
--- branches/kde4/packages/kdebindings/debian/patches/03_disable_python-nepomuk_the_hard_way.diff 2008-07-25 07:18:40 UTC (rev 11725)
+++ branches/kde4/packages/kdebindings/debian/patches/03_disable_python-nepomuk_the_hard_way.diff 2008-07-25 16:33:18 UTC (rev 11726)
@@ -13,7 +13,7 @@
MACRO_OPTIONAL_FIND_PACKAGE(KdepimLibs)
MACRO_LOG_FEATURE(KDEPIMLIBS_FOUND "Kdepimlibs" "KDE pim Libraries" "kdepimlibs" FALSE "" "Required for Akonadi Python bindings.")
-@@ -91,10 +91,10 @@
+@@ -90,10 +90,10 @@
SET(PYKDE_MODULES "${PYKDE_MODULES} soprano")
ENDIF(Soprano_FOUND)
Deleted: branches/kde4/packages/kdebindings/debian/patches/04_disable_csharp_tutorials.diff
Added: branches/kde4/packages/kdebindings/debian/patches/04_fix_ruby_requires.diff
===================================================================
--- branches/kde4/packages/kdebindings/debian/patches/04_fix_ruby_requires.diff (rev 0)
+++ branches/kde4/packages/kdebindings/debian/patches/04_fix_ruby_requires.diff 2008-07-25 16:33:18 UTC (rev 11726)
@@ -0,0 +1,1856 @@
+Index: b/ruby/korundum/examples/RubberDoc.rb
+===================================================================
+--- a/ruby/korundum/examples/RubberDoc.rb
++++ b/ruby/korundum/examples/RubberDoc.rb
+@@ -1,6 +1,6 @@
+ #!/usr/bin/env ruby
+
+-require 'Korundum'
++require 'korundum4'
+
+ 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 @@
+ # -- gg.
+ # AK - ported to ruby
+
+-require 'Korundum'
++require 'korundum4'
+
+ 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 @@
+ copyright holder.
+ =end
+
+-require 'Korundum'
++require 'korundum4'
+ 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 @@
+ copyright holder.
+ =end
+
+-require 'Korundum'
++require 'korundum4'
+ 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 @@
+ copyright holder.
+ =end
+
+-require 'Korundum'
++require 'korundum4'
+
+ 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 @@
+
+ =end
+
+-require 'Korundum'
++require 'korundum4'
+ 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 @@
+ #!/usr/bin/env ruby
+
+-require 'Korundum'
++require 'korundum4'
+ 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 @@
+ copyright holder.
+ =end
+
+-require 'Korundum'
++require 'korundum4'
+
+ 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 @@
+ ***************************************************************************/
+ =end
+
+-require 'Qt'
++require 'Qt4'
+
+ 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 @@
+ copyright holder.
+ =end
+
+-require 'Korundum'
++require 'korundum4'
+
+ =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 @@
+ =end
+
+
+-require 'Korundum'
++require 'korundum4'
+
+ 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 @@
+ =end
+
+
+-require 'Korundum'
++require 'korundum4'
+
+
+
+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 @@
+ =end
+
+
+-require 'Korundum'
++require 'korundum4'
+
+ 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 @@
+ copyright holder.
+ =end
+
+-require 'Korundum'
++require 'korundum4'
+
+
+ =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 @@
+ copyright holder.
+ =end
+
+-require 'Korundum'
++require 'korundum4'
+
+ # 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 @@
+ copyright holder.
+ =end
+
+-require 'Korundum'
++require 'korundum4'
+
+ 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 @@
+ =end
+
+
+-require 'Korundum'
++require 'korundum4'
+
+ 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 @@
+ =end
+
+
+-require 'Korundum'
++require 'korundum4'
+
+
+
+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 @@
+ =end
+
+
+-require 'Korundum'
++require 'korundum4'
+
+ 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 @@
+ copyright holder.
+ =end
+
+-require 'Korundum'
++require 'korundum4'
+
+
+
+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 @@
+ copyright holder.
+ =end
+
+-require 'Korundum'
++require 'korundum4'
+
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+
+ # This is the EventFilter example from Chapter 16 of 'Programming with Qt'
+
+-require 'Qt'
++require 'Qt4'
+
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ #!/usr/bin/env ruby
+
+-require 'Qt'
++require 'Qt4'
+
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ # window knows how to redraw itself.
+ #
+
+-require 'Qt'
++require 'Qt4'
+
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ # http://www.ruby-lang.org/en/LICENSE.txt.
+ #
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ # http://www.ruby-lang.org/en/LICENSE.txt.
+ #
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ # http://www.ruby-lang.org/en/LICENSE.txt.
+ #
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ #
+
+ require 'singleton'
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ # http://www.ruby-lang.org/en/LICENSE.txt.
+ #
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ #!/usr/bin/env ruby
+ $VERBOSE = true; $:.unshift File.dirname($0)
+
+-require 'Qt'
++require 'Qt4'
+
+ 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 @@
+-require 'Qt'
++require 'Qt4'
+
+ 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 @@
+-require 'Qt'
++require 'Qt4'
+
+ 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 @@
+ #!/usr/bin/env ruby
+ $VERBOSE = true; $:.unshift File.dirname($0)
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ include Math
+-require 'Qt'
++require 'Qt4'
+
+ 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 @@
+-require 'Qt'
++require 'Qt4'
+
+ 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 @@
+ #!/usr/bin/env ruby
+ $VERBOSE = true; $:.unshift File.dirname($0)
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ include Math
+-require 'Qt'
++require 'Qt4'
+
+ 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 @@
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ #!/usr/bin/env ruby
+ $VERBOSE = true; $:.unshift File.dirname($0)
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+-require 'Qt'
++require 'Qt4'
+
+ 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 @@
+ #!/usr/bin/env ruby
+ $VERBOSE = true; $:.unshift File.dirname($0)
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ #!/usr/bin/env ruby
+ $VERBOSE = true; $:.unshift File.dirname($0)
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ #!/usr/bin/env ruby
+ $VERBOSE = true; $:.unshift File.dirname($0)
+
+-require 'Qt';
++require 'Qt4';
+
+ 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 @@
+ #!/usr/bin/env ruby
+ $VERBOSE = true; $:.unshift File.dirname($0)
+
+-require 'Qt'
++require 'Qt4'
+
+ 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 @@
+ #!/usr/bin/env ruby
+ $VERBOSE = true; $:.unshift File.dirname($0)
+
+-require 'Qt'
++require 'Qt4'
+
+ 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 @@
+ #!/usr/bin/env ruby
+ $VERBOSE = true; $:.unshift File.dirname($0)
+
+-require 'Qt'
++require 'Qt4'
+
+ 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 @@
+ #!/usr/bin/env ruby
+ $VERBOSE = true; $:.unshift File.dirname($0)
+
+-require 'Qt'
++require 'Qt4'
+
+ 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 @@
+ #!/usr/bin/ruby -w
+-require 'Qt'
++require 'Qt4'
+
+ 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 @@
+ #!/usr/bin/env ruby
+ $VERBOSE = true; $:.unshift File.dirname($0)
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+-require 'Qt'
++require 'Qt4'
+
+ 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 @@
+-require 'Qt'
++require 'Qt4'
+
+ 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 @@
+ #!/usr/bin/env ruby
+ $VERBOSE = true; $:.unshift File.dirname($0)
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+-require 'Qt'
++require 'Qt4'
+
+ 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 @@
+-require 'Qt'
++require 'Qt4'
+
+ 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 @@
+ #!/usr/bin/env ruby
+ $VERBOSE = true; $:.unshift File.dirname($0)
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+
+ # 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 @@
+ #!/usr/bin/env ruby
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+-require 'Qt'
++require 'Qt4'
+
+ 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 @@
+ #!/usr/bin/env ruby
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ #!/usr/bin/env ruby
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+
+ =end
+
+-require 'Qt'
++require 'Qt4'
+
+ #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 @@
+
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+-require 'Qt'
++require 'Qt4'
+
+ 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 @@
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ ** Translated to QtRuby by Richard Dale
+ =end
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ # http://www.ruby-lang.org/en/LICENSE.txt.
+ #
+
+-require 'Qt'
++require 'Qt4'
+ 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 @@
+ #!/usr/bin/ruby -w
+
+-require 'Qt'
++require 'Qt4'
+ require 'rexml/document'
+
+ require '../base/rui.rb'
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-07-25 07:18:40 UTC (rev 11725)
+++ branches/kde4/packages/kdebindings/debian/patches/97_fix_target_link_libraries.diff 2008-07-25 16:33:18 UTC (rev 11726)
@@ -7,71 +7,7 @@
add_library(smokeqtuitools SHARED ${smokeqtuitools_LIB_SRCS})
-target_link_libraries(smokeqtuitools smokeqt ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTUITOOLS_LIBRARY})
-+target_link_libraries(smokeqtuitools smokeqt ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTUITOOLS_LIBRARY} ${QT_QTGUI_LIBRARY})
++target_link_libraries(smokeqtuitools smokeqt ${QT_QTCORE_LIBRARY} ${QT_QTUITOOLS_LIBRARY} ${QT_QTGUI_LIBRARY})
set_target_properties(smokeqtuitools PROPERTIES VERSION 2.0.0 SOVERSION 2 )
-Index: b/smoke/kde/CMakeLists.txt
-===================================================================
---- a/smoke/kde/CMakeLists.txt
-+++ b/smoke/kde/CMakeLists.txt
-@@ -113,6 +113,7 @@
- ${KDE4_KNEWSTUFF2_LIBS}
- ${KDE4_KPTY_LIBS}
- ${KDE4_KUTILS_LIBS}
-+ ${KDE4_KPARTS_LIBS}
- smokeqt )
-
- set_target_properties(smokekde PROPERTIES VERSION 2.0.0 SOVERSION 2 )
-Index: b/python/krosspython/CMakeLists.txt
-===================================================================
---- a/python/krosspython/CMakeLists.txt
-+++ b/python/krosspython/CMakeLists.txt
-@@ -44,7 +44,7 @@
- # -ldl seems to be needed (on Linux at least).
- # see http://lists.kde.org/?l=koffice-devel&m=116333261328694&w=2
- # and http://websvn.kde.org/branches/work/kwin_composite/CMakeLists.txt?rev=603677&r1=603384&r2=603677
--target_link_libraries(krosspython ${QT_QTCORE_LIBRARY} ${KDE4_KPTY_LIBS} ${KDE4_KROSSCORE_LIBS} ${PYTHON_LIBRARIES} ${CMAKE_DL_LIBS})
-+target_link_libraries(krosspython ${QT_QTCORE_LIBRARY} ${KDE4_KPTY_LIBS} ${KDE4_KROSSCORE_LIBS} ${PYTHON_LIBRARIES} ${CMAKE_DL_LIBS} ${QT_QTGUI_LIBRARY})
-
- install(TARGETS krosspython DESTINATION ${PLUGIN_INSTALL_DIR})
-
-Index: b/ruby/krossruby/CMakeLists.txt
-===================================================================
---- a/ruby/krossruby/CMakeLists.txt
-+++ b/ruby/krossruby/CMakeLists.txt
-@@ -11,5 +11,5 @@
- )
-
- kde4_add_plugin(krossruby ${krossruby_PART_SRCS})
--target_link_libraries(krossruby ${QT_QTCORE_LIBRARY} ${KDE4_KROSSCORE_LIBS} ${RUBY_LIBRARY})
-+target_link_libraries(krossruby ${QT_QTCORE_LIBRARY} ${KDE4_KROSSCORE_LIBS} ${RUBY_LIBRARY} ${QT_QTGUI_LIBRARY})
- install(TARGETS krossruby DESTINATION ${PLUGIN_INSTALL_DIR})
-Index: b/python/pykde4/CMakeLists.txt
-===================================================================
---- a/python/pykde4/CMakeLists.txt
-+++ b/python/pykde4/CMakeLists.txt
-@@ -70,16 +70,16 @@
- ADD_DEFINITIONS(-D_REENTRANT -DQT_NO_DEBUG -DQT_CORE_LIB -DQT_GUI_LIB)
-
-
--ADD_SIP_PYTHON_MODULE(PyKDE4.kdecore sip/kdecore/kdecoremod.sip ${KDE4_KDECORE_LIBS} ${KDE4_KPTY_LIBS})
--ADD_SIP_PYTHON_MODULE(PyKDE4.solid sip/solid/solidmod.sip ${KDE4_SOLID_LIBS})
--ADD_SIP_PYTHON_MODULE(PyKDE4.kdeui sip/kdeui/kdeuimod.sip ${KDE4_KDEUI_LIBS})
-+ADD_SIP_PYTHON_MODULE(PyKDE4.kdecore sip/kdecore/kdecoremod.sip ${KDE4_KDECORE_LIBS} ${KDE4_KPTY_LIBS} ${QT_QTNETWORK_LIBRARY})
-+ADD_SIP_PYTHON_MODULE(PyKDE4.solid sip/solid/solidmod.sip ${KDE4_SOLID_LIBS} ${QT_QTCORE_LIBRARY})
-+ADD_SIP_PYTHON_MODULE(PyKDE4.kdeui sip/kdeui/kdeuimod.sip ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY})
- ADD_SIP_PYTHON_MODULE(PyKDE4.kio sip/kio/kiomod.sip ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS})
--ADD_SIP_PYTHON_MODULE(PyKDE4.kutils sip/kutils/kutilsmod.sip ${KDE4_KUTILS_LIBS})
-+ADD_SIP_PYTHON_MODULE(PyKDE4.kutils sip/kutils/kutilsmod.sip ${KDE4_KUTILS_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${KDE4_KDEUI_LIBS})
- ADD_SIP_PYTHON_MODULE(PyKDE4.kparts sip/kparts/kpartsmod.sip ${KDE4_KPARTS_LIBS})
--ADD_SIP_PYTHON_MODULE(PyKDE4.ktexteditor sip/ktexteditor/ktexteditormod.sip ${KDE4_KTEXTEDITOR_LIBS})
-+ADD_SIP_PYTHON_MODULE(PyKDE4.ktexteditor sip/ktexteditor/ktexteditormod.sip ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
- ADD_SIP_PYTHON_MODULE(PyKDE4.khtml sip/khtml/khtmlmod.sip ${KDE4_KHTML_LIBS})
--ADD_SIP_PYTHON_MODULE(PyKDE4.knewstuff sip/knewstuff/knewstuffmod.sip ${KDE4_KNEWSTUFF2_LIBS})
--ADD_SIP_PYTHON_MODULE(PyKDE4.dnssd sip/dnssd/dnssdmod.sip ${KDE4_KDNSSD_LIBS})
-+ADD_SIP_PYTHON_MODULE(PyKDE4.knewstuff sip/knewstuff/knewstuffmod.sip ${KDE4_KNEWSTUFF2_LIBS} ${QT_QTCORE_LIBRARY})
-+ADD_SIP_PYTHON_MODULE(PyKDE4.dnssd sip/dnssd/dnssdmod.sip ${KDE4_KDNSSD_LIBS} ${QT_QTCORE_LIBRARY})
- ADD_SIP_PYTHON_MODULE(PyKDE4.phonon sip/phonon/phononmod.sip ${PHONON_LIBS} ${QT_QTDBUS_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
- SET(PYKDE_MODULES "kdecore solid kdeui kio kutils kparts ktexteditor dnssd phonon ")
-
Added: branches/kde4/packages/kdebindings/debian/patches/99_enable_okular_plasma.diff
===================================================================
--- branches/kde4/packages/kdebindings/debian/patches/99_enable_okular_plasma.diff (rev 0)
+++ branches/kde4/packages/kdebindings/debian/patches/99_enable_okular_plasma.diff 2008-07-25 16:33:18 UTC (rev 11726)
@@ -0,0 +1,28 @@
+Index: b/CMakeLists.txt
+===================================================================
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -19,6 +19,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
+===================================================================
+--- a/csharp/CMakeLists.txt
++++ b/csharp/CMakeLists.txt
+@@ -97,8 +97,8 @@
+ endif(KDEPIMLIBS_FOUND AND Akonadi_FOUND)
+
+ IF(PLASMA_FOUND)
+- SET(PLASMA_SHARP_ENABLED "yes")
+- ADD_SUBDIRECTORY(plasma)
++ # SET(PLASMA_SHARP_ENABLED "yes")
++ # ADD_SUBDIRECTORY(plasma)
+ ENDIF(PLASMA_FOUND)
+
+ ENDIF (GMCS_EXECUTABLE AND GACUTIL_EXECUTABLE AND MONO_CECIL_FOUND)
Deleted: branches/kde4/packages/kdebindings/debian/patches/bindings_branch.diff
Modified: branches/kde4/packages/kdebindings/debian/patches/series
===================================================================
--- branches/kde4/packages/kdebindings/debian/patches/series 2008-07-25 07:18:40 UTC (rev 11725)
+++ branches/kde4/packages/kdebindings/debian/patches/series 2008-07-25 16:33:18 UTC (rev 11726)
@@ -1,6 +1,6 @@
-bindings_branch.diff
01_python_modules_dont_link_against_libpython.diff
02_include_default_settings_in_python_cmakelist.diff
03_disable_python-nepomuk_the_hard_way.diff
-04_disable_csharp_tutorials.diff
+04_fix_ruby_requires.diff
97_fix_target_link_libraries.diff
+99_enable_okular_plasma.diff
Added: branches/kde4/packages/kdebindings/debian/rbkconfig_compiler4.1
===================================================================
--- branches/kde4/packages/kdebindings/debian/rbkconfig_compiler4.1 (rev 0)
+++ branches/kde4/packages/kdebindings/debian/rbkconfig_compiler4.1 2008-07-25 16:33:18 UTC (rev 11726)
@@ -0,0 +1,36 @@
+.TH RBRCC "1" "October 2008" "KDE4 version 4.1"
+.SH NAME
+rbkconfig_compiler4 \- KDE config resource compiler
+
+.SH SYNOPSIS
+.B rbkconfig_compiler4
+[options]
+.I inputs
+file.kcfg
+file.kcfgc
+
+.SH DESCRIPTION
+
+.B rbkconfig_compiler4
+compiles KDE config resources into ruby code.
+
+.SH OPTIONS
+.TP
+.BI -L, --license
+Displays software license
+.TP
+.BI -d, --directory <directory>
+Directory to generate files in. By default it is set to the current directory.
+.TP
+.BI -h, --help
+Display option summary
+
+.SH AUTHOR
+.B rbrcc
+is based on the
+.B rcc
+program from the Qt distribution.
+
+This manual page was written by David
+Palacio for the Debian project, but may be used by others.
+Based on Vincent Fourmond work on QtRuby.
Added: branches/kde4/packages/kdebindings/debian/rbqtapi.1
===================================================================
--- branches/kde4/packages/kdebindings/debian/rbqtapi.1 (rev 0)
+++ branches/kde4/packages/kdebindings/debian/rbqtapi.1 2008-07-25 16:33:18 UTC (rev 11726)
@@ -0,0 +1,51 @@
+.TH RBQTAPI "1" "October 2006" "Qt4-qtruby version 1.4.6"
+.SH NAME
+rbqtapi \- a qtruby introspection tool
+
+.SH SYNOPSIS
+.B rbqtapi
+[options]
+.I [\-r re] [class]
+
+.SH DESCRIPTION
+
+.B rbqtapi
+can be used to check which Qt functions are known to
+qt4-qtruby. Without arguments, it lists all the function known. An
+argument is interpreted as a class name whose methods are
+displayed. You can also specify a regular expression to search for
+functions with the
+.B \-r
+option.
+
+.SH OPTIONS
+.TP
+.BI \-r \ re
+find all functions matching regular expression/keyword
+.IR re .
+
+.TP
+.B \-i
+together with
+.BR \-r ,
+performs a case insensitive search.
+
+.TP
+.B \-p
+display also inherited methods for
+.IR class .
+
+.TP
+.B \-v
+print qtruby and Qt versions
+
+.TP
+.B \-h
+prints a short help message.
+
+.SH AUTHOR
+.B rbqtapi
+was written by Germain Garand.
+
+This manual page was written by Vincent Fourmond for the Debian
+project, but may be used by others.
Added: branches/kde4/packages/kdebindings/debian/rbrcc.1
===================================================================
--- branches/kde4/packages/kdebindings/debian/rbrcc.1 (rev 0)
+++ branches/kde4/packages/kdebindings/debian/rbrcc.1 2008-07-25 16:33:18 UTC (rev 11726)
@@ -0,0 +1,48 @@
+.TH RBRCC "1" "October 2006" "Qt4-qtruby version 1.4.7"
+.SH NAME
+rbrcc \- Qt/Ruby resource compiler
+
+.SH SYNOPSIS
+.B rbrcc
+[options]
+.I inputs
+
+.SH DESCRIPTION
+
+.B rbrcc
+compiles resource files (.qrc) into ruby code.
+
+.SH OPTIONS
+.TP
+.BI -o \ file
+Write output to file rather than stdout
+.TP
+.BI -name \ name
+Create an external initialization method with name
+.TP
+.BI -threshold \ level
+Threshold to consider compressing files
+.TP
+.BI -compress \ level
+Compress input files by level
+.TP
+.BI -root \ path
+Prefix resource access path with root path
+.TP
+.BI -no-compress
+Disable all compression
+.TP
+.BI -version
+Display version
+.TP
+.BI -help
+Display option summary
+
+.SH AUTHOR
+.B rbrcc
+is based on the
+.B rcc
+program from the Qt distribution.
+
+This manual page was written by Vincent
+Fourmond for the Debian project, but may be used by others.
Added: branches/kde4/packages/kdebindings/debian/rbuic4.1
===================================================================
--- branches/kde4/packages/kdebindings/debian/rbuic4.1 (rev 0)
+++ branches/kde4/packages/kdebindings/debian/rbuic4.1 2008-07-25 16:33:18 UTC (rev 11726)
@@ -0,0 +1,52 @@
+.TH RBUIC4 "1" "October 2006" "Qt4-qtruby version 1.4.7"
+.SH NAME
+rbuic4 \- Qt/Ruby user interface compiler.
+
+.SH SYNOPSIS
+.B rbuic4
+[options]
+.I uifile
+
+.SH DESCRIPTION
+
+.B rbuic4
+compiles user interface files (.ui) into ruby code.
+
+.SH OPTIONS
+
+.TP
+.B -h, -help
+display a short help and exit
+.TP
+.B -v, -version
+display version
+.TP
+.B -d, -dependencies
+display the dependencies
+.TP
+.BI -o \ file
+place the output into
+.I file
+.TP
+.BI -tr func
+use
+.I func()
+for i18n
+.TP
+.B -p, -no-protection
+disable header protection (most probably useless for Ruby)
+.TP
+.BI -g \ name
+change generator
+.TP
+.B -x
+generate extra code to test the class
+
+.SH AUTHOR
+.B rbuic4
+is based on the
+.B uic
+program from the Qt distribution.
+
+This manual page was written by Vincent
+Fourmond for the Debian project, but may be used by others.
Modified: branches/kde4/packages/kdebindings/debian/rules
===================================================================
--- branches/kde4/packages/kdebindings/debian/rules 2008-07-25 07:18:40 UTC (rev 11725)
+++ branches/kde4/packages/kdebindings/debian/rules 2008-07-25 16:33:18 UTC (rev 11726)
@@ -34,6 +34,8 @@
-DENABLE_PYKDE4=OFF\
-DENABLE_SOPRANO_SMOKE=ON \
-DENABLE_KHTML_SHARP=ON \
+ -DENABLE_NEPOMUK_SMOKE=ON \
+ -DENABLE_NEPOMUK_RUBY=ON \
-DCUSTOM_RUBY_SITE_LIB_DIR=/usr/lib/ruby/1.8/ \
-DCUSTOM_RUBY_SITE_ARCH_DIR=/usr/lib/ruby/1.8/$(RUBY_SITEARCH)
More information about the pkg-kde-commits
mailing list