rev 12628 - in branches/kde4/packages/kdebindings/debian: . patches tests

Vincent Fourmond fourmond at alioth.debian.org
Tue Nov 11 12:46:41 UTC 2008 

Author: fourmond
Date: 2008-11-11 12:46:41 +0000 (Tue, 11 Nov 2008)
New Revision: 12628

Added:
   branches/kde4/packages/kdebindings/debian/patches/05_rbqtapi_ruby1.8.diff
   branches/kde4/packages/kdebindings/debian/tests/
   branches/kde4/packages/kdebindings/debian/tests/test_checkarg.rb
Modified:
   branches/kde4/packages/kdebindings/debian/changelog
   branches/kde4/packages/kdebindings/debian/control
   branches/kde4/packages/kdebindings/debian/patches/series
Log:
[kdebindings] Various improvements, including the possibility to actually install ruby bindings + one test from the old libqt4-ruby package

Modified: branches/kde4/packages/kdebindings/debian/changelog
===================================================================
--- branches/kde4/packages/kdebindings/debian/changelog	2008-11-11 12:16:09 UTC (rev 12627)
+++ branches/kde4/packages/kdebindings/debian/changelog	2008-11-11 12:46:41 UTC (rev 12628)
@@ -1,3 +1,17 @@
+kdebindings (4:4.1.3-2) UNRELEASED experimental; urgency=low
+
+  [ Vincent Fourmond ]
+  * Moving libqt4-ruby{,1.8} to section interpreters where they
+    currently are (to avoid override disparities)
+  * Dropping a whole bunch of useless manual libsmokeqt4 dependencies
+    that prevent the packages from being installed. (closes: #505274)
+  * libqt4-ruby, libkde4-ruby, libplasma-ruby, libokular-ruby are arch:all
+  * Copying test files from old libqt4-ruby package
+  * 05_rbqtapi_ruby1.8.diff: rbqtapi must use ruby 1.8 rather than ruby
+  * Various minor Description improvements
+
+ -- Vincent Fourmond <fourmond at debian.org>  Tue, 11 Nov 2008 12:12:34 +0100
+
 kdebindings (4:4.1.3-1) experimental; urgency=low
 
   * First upload of the kde4 kdebindings

Modified: branches/kde4/packages/kdebindings/debian/control
===================================================================
--- branches/kde4/packages/kdebindings/debian/control	2008-11-11 12:16:09 UTC (rev 12627)
+++ branches/kde4/packages/kdebindings/debian/control	2008-11-11 12:46:41 UTC (rev 12628)
@@ -5,7 +5,7 @@
 Build-Depends: debhelper (>= 6.0.7~), cmake (>= 2.4.5), quilt,
  kdelibs5-dev (>= 4:4.1.3), libphonon-dev, libqt4-opengl-dev,
  python, python-all-dev, sip4, python-sip4-dev, python-qt4-dev,
- ruby1.8-dev,ruby1.8 , python-central,
+ ruby1.8-dev, ruby1.8 , python-central,
  mono-gac [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390],
  mono-gmcs [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390], libmono-dev [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390],
  cdbs, 
@@ -33,7 +33,7 @@
 
 Package: libsmokekde4-2
 Section: libs
-Depends: ${shlibs:Depends}, libsmokeqt4-2 (= ${binary:Version})
+Depends: ${shlibs:Depends}
 Architecture: any
 Description: KDE smoke libraries
  smoke libraries are part of the bindings used for Qt and KDE. This package i
@@ -46,7 +46,7 @@
 
 Package: libsmokeokular2
 Section: libs
-Depends: ${shlibs:Depends}, libsmokekde4-2 (= ${binary:Version})
+Depends: ${shlibs:Depends}
 Architecture: any
 Description: Okular smoke bindings
  smoke libraries are part of the bindings used for Qt and KDE. This package 
@@ -59,7 +59,7 @@
 
 Package: libsmokeplasma2
 Section: libs
-Depends: libsmokekde4-2 (= ${binary:Version}), ${shlibs:Depends}
+Depends: ${shlibs:Depends}
 Architecture: any
 Description: KDE plasma smoke library
  smoke libraries are part of the bindings used for Qt and KDE. This package 
@@ -87,13 +87,13 @@
 Section: libs
 Depends: ${shlibs:Depends}
 Architecture: any
-Description: shared library for Qt4 ruby bindings
- This is part of KDE Bindings module
+Description: internal library for Qt4 ruby bindings
+ This is an internal library part of KDE Bindings module
 
 Package: libqt4-ruby
-Section: libs
+Section: interpreters
 Depends: libqt4-ruby1.8
-Architecture: any
+Architecture: all
 Description: Qt4 ruby bindings
  This package installs the Qt4 bindings for the
  default ruby version.
@@ -101,11 +101,11 @@
  This is part of KDE Bindings module
 
 Package: libqt4-ruby1.8
-Section: libs
-Depends: ${shlibs:Depends}, libsmokeqt4, ruby
+Section: interpreters
+Depends: ${shlibs:Depends}, ruby1.8
 Architecture: any
 Description: Qt4 bindings for ruby
- This packages contains Qt4 ruby bindings for the ruby1.8 version.
+ This packages contains Qt4 ruby bindings for Ruby 1.8.
  .
  This is part of KDE Bindings module
 
@@ -113,7 +113,7 @@
 Package: libkde4-ruby
 Section: libs
 Depends: libkde4-ruby1.8
-Architecture: any
+Architecture: all
 Description: KDE ruby bindings
  This package installs the ruby bindings for
  the default ruby interpreter.
@@ -122,19 +122,19 @@
 
 Package: libkde4-ruby1.8
 Section: libs
-Depends: ${shlibs:Depends}, libqt4-ruby1.8 (= ${binary:Version}), libsmokekde4-2 (= ${binary:Version})
+Depends: ${shlibs:Depends}, libqt4-ruby1.8 (= ${binary:Version})
 Architecture: any
 Description: kde4 bindings for ruby
- KDE bindings for ruby
+ KDE bindings for ruby 1.8
  .
  This is part of KDE Bindings module
 
 Package: libokular-ruby
 Section: libs
 Depends: libokular-ruby1.8
-Architecture: any
+Architecture: all
 Description: Okular ruby bindings
- Defaults to ruby 1.8
+ Binding for the default ruby version
  .
  This is part of KDE Bindings module
 
@@ -143,25 +143,26 @@
 Depends: ${shlibs:Depends}, libkde4-ruby1.8
 Architecture: any
 Description: Okular ruby bindings
+ Bindings for okular for Ruby 1.8
  .
  This is part of KDE Bindings module
 
 Package: libplasma-ruby
 Section: libs
 Depends: libplasma-ruby1.8
-Architecture: any
+Architecture: all
 Description: KDE plasma ruby bindings
  This package allows you to create desktop widgets in the Ruby language. 
- Get ruby 1.8.
  .
  This is part of KDE Bindings module
 
 Package: libplasma-ruby1.8
 Section: libs
-Depends: libsmokeplasma2 (= ${binary:Version}), ${shlibs:Depends}
+Depends: ${shlibs:Depends}
 Architecture: any
 Description: KDE plasma ruby1.8 bindings
- This package allows you to create desktop widgets in the Ruby language
+ This package allows you to create desktop widgets in the Ruby language.
+ Bindings for Ruby version 1.8.
  .
  This is part of KDE Bindings module
 

Added: branches/kde4/packages/kdebindings/debian/patches/05_rbqtapi_ruby1.8.diff
===================================================================
--- branches/kde4/packages/kdebindings/debian/patches/05_rbqtapi_ruby1.8.diff	                        (rev 0)
+++ branches/kde4/packages/kdebindings/debian/patches/05_rbqtapi_ruby1.8.diff	2008-11-11 12:46:41 UTC (rev 12628)
@@ -0,0 +1,9 @@
+diff -urNad libqt4-ruby-1.4.9~/ruby/qtruby/bin/rbqtapi libqt4-ruby-1.4.9/ruby/qtruby/bin/rbqtapi
+--- libqt4-ruby-1.4.9~/ruby/qtruby/bin/rbqtapi	2007-04-20 15:03:22.000000000 +0200
++++ libqt4-ruby-1.4.9/ruby/qtruby/bin/rbqtapi	2008-04-29 20:37:31.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/env ruby1.8
+ 
+ # Note: this program is part of qtruby and makes use of its internal functions.
+ #       You should not rely on those in your own programs.


Property changes on: branches/kde4/packages/kdebindings/debian/patches/05_rbqtapi_ruby1.8.diff
___________________________________________________________________
Name: svn:executable
   + *

Modified: branches/kde4/packages/kdebindings/debian/patches/series
===================================================================
--- branches/kde4/packages/kdebindings/debian/patches/series	2008-11-11 12:16:09 UTC (rev 12627)
+++ branches/kde4/packages/kdebindings/debian/patches/series	2008-11-11 12:46:41 UTC (rev 12628)
@@ -2,5 +2,6 @@
 02_include_default_settings_in_python_cmakelist.diff
 03_csharp_dont_use_qyotoshared_directly.diff
 04_fix_ruby_requires.diff
+05_rbqtapi_ruby1.8.diff
 97_fix_target_link_libraries.diff
 99_enable_okular_plasma.diff

Added: branches/kde4/packages/kdebindings/debian/tests/test_checkarg.rb
===================================================================
--- branches/kde4/packages/kdebindings/debian/tests/test_checkarg.rb	                        (rev 0)
+++ branches/kde4/packages/kdebindings/debian/tests/test_checkarg.rb	2008-11-11 12:46:41 UTC (rev 12628)
@@ -0,0 +1,16 @@
+# This file is copyright 2007 Vincent Fourmond, to be used, copied and
+# distributed under the terms of the General Public License version 2 or
+# any later version published by the Free Software Funds.
+require 'Qt4'
+
+a = Qt::Application.new(ARGV)
+
+# We need that only when it fails.
+# Qt.debug_level = Qt::DebugLevel::High 
+
+accel = Qt::KeySequence.new(Qt::Key_Up)
+p accel
+
+Qt::MessageBox::question(nil, 'Quit', 'Do you really want to quit? Any 
+unsaved changes will be lost!', Qt::MessageBox::Ok, Qt::MessageBox::Cancel)
+

More information about the pkg-kde-commits mailing list