[DRE-commits] r1617 - in packages/libqt4-ruby/trunk/debian: . patches tests

[fourmond at alioth.debian.org]

Author: fourmond
Date: 2007-05-22 20:28:50 +0000 (Tue, 22 May 2007)
New Revision: 1617

Added:
   packages/libqt4-ruby/trunk/debian/tests/
   packages/libqt4-ruby/trunk/debian/tests/README
   packages/libqt4-ruby/trunk/debian/tests/test_checkarg.rb
Modified:
   packages/libqt4-ruby/trunk/debian/changelog
   packages/libqt4-ruby/trunk/debian/patches/30-qt_enum.dpatch
   packages/libqt4-ruby/trunk/debian/rules
Log:
libqt4-ruby: fix two serious bugs

Modified: packages/libqt4-ruby/trunk/debian/changelog
===================================================================
--- packages/libqt4-ruby/trunk/debian/changelog	2007-05-22 20:23:46 UTC (rev 1616)
+++ packages/libqt4-ruby/trunk/debian/changelog	2007-05-22 20:28:50 UTC (rev 1617)
@@ -1,8 +1,14 @@
-libqt4-ruby (1.4.7-4) UNRELEASED; urgency=low
+libqt4-ruby (1.4.7-4) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Add a .so symlink in the -dev package (Closes: #425466) - thanks to
+    Sune Vuorela <reportbug at pusling.com> for reporting.
+  * Fixed the enum problem in checkarg (Closes: #425389), hopefully
+    not introducing new bugs ;-). Thanks to Bernhard Valenti 
+    <bernhard.valenti at gmx.net> for reporting.
+  * Added a debian/test directory desgined as informal tests that
+    I didn't break anything.
 
- -- Vincent Fourmond <fourmond at debian.org>  Thu, 03 May 2007 23:51:55 +0200
+ -- Vincent Fourmond <fourmond at debian.org>  Tue, 22 May 2007 22:11:21 +0200
 
 libqt4-ruby (1.4.7-3) unstable; urgency=low
 

Modified: packages/libqt4-ruby/trunk/debian/patches/30-qt_enum.dpatch
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/30-qt_enum.dpatch	2007-05-22 20:23:46 UTC (rev 1616)
+++ packages/libqt4-ruby/trunk/debian/patches/30-qt_enum.dpatch	2007-05-22 20:28:50 UTC (rev 1617)
@@ -1,15 +1,19 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## 30-qt_enum.dpatch by  <vincent.fourmond at 9online.fr>
 ##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: A patch to fix the argument choosing so enums are treated in a
+## DP: much better way.
 
 @DPATCH@
 diff -urNad libqt4-ruby-1.4.7~/qtruby/rubylib/qtruby/lib/Qt/qtruby4.rb libqt4-ruby-1.4.7/qtruby/rubylib/qtruby/lib/Qt/qtruby4.rb
 --- libqt4-ruby-1.4.7~/qtruby/rubylib/qtruby/lib/Qt/qtruby4.rb	2006-10-30 17:52:51.000000000 +0100
-+++ libqt4-ruby-1.4.7/qtruby/rubylib/qtruby/lib/Qt/qtruby4.rb	2007-01-16 11:57:23.000000000 +0100
-@@ -1881,8 +1883,11 @@
- 					return 1
++++ libqt4-ruby-1.4.7/qtruby/rubylib/qtruby/lib/Qt/qtruby4.rb	2007-05-22 22:09:25.000000000 +0200
+@@ -1878,11 +1880,14 @@
+ 				t = typename.sub(/^const\s+/, '')
+ 				t.sub!(/[&*]$/, '')
+ 				if argtype == t
+-					return 1
++					return 2
  				elsif classIsa(argtype, t)
  					return 0
 +                                

Modified: packages/libqt4-ruby/trunk/debian/rules
===================================================================
--- packages/libqt4-ruby/trunk/debian/rules	2007-05-22 20:23:46 UTC (rev 1616)
+++ packages/libqt4-ruby/trunk/debian/rules	2007-05-22 20:28:50 UTC (rev 1617)
@@ -109,7 +109,7 @@
 	cd $(CURDIR)/debian/libsmokeqt4-1/usr/; rm -Rf include
 # Smoke development files
 	cd smoke; $(MAKE) install DESTDIR=$(CURDIR)/debian/libsmokeqt4-dev
-	cd $(CURDIR)/debian/libsmokeqt4-dev/usr/lib; rm *.so*
+	cd $(CURDIR)/debian/libsmokeqt4-dev/usr/lib; rm *.so.*
 # Then, install the Qtruby stuff:
 	cd qtruby/rubylib/qtruby; $(MAKE) install DESTDIR=$(CURDIR)/debian/libqt4-ruby1.8 \
 	'RUBY_SITEARCHDIR=$$(RUBY_ARCHDIR)' 'RUBY_SITEDIR=$$(RUBY_LIBDIR)/ruby/1.8'

Added: packages/libqt4-ruby/trunk/debian/tests/README
===================================================================
--- packages/libqt4-ruby/trunk/debian/tests/README	                        (rev 0)
+++ packages/libqt4-ruby/trunk/debian/tests/README	2007-05-22 20:28:50 UTC (rev 1617)
@@ -0,0 +1,3 @@
+This is a directory of informal tests which are essentially destined to me
+(Vincent Fourmond <fourmond at debian.org>) to make sure that by tweaking
+some things I don't break others.
\ No newline at end of file

Added: packages/libqt4-ruby/trunk/debian/tests/test_checkarg.rb
===================================================================
--- packages/libqt4-ruby/trunk/debian/tests/test_checkarg.rb	                        (rev 0)
+++ packages/libqt4-ruby/trunk/debian/tests/test_checkarg.rb	2007-05-22 20:28:50 UTC (rev 1617)
@@ -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)
+