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

[fourmond at alioth.debian.org]

Author: fourmond
Date: 2008-04-29 19:17:19 +0000 (Tue, 29 Apr 2008)
New Revision: 2697

Added:
   packages/libqt4-ruby/trunk/debian/patches/50-rbqtapi-ruby1.8.dpatch
Removed:
   packages/libqt4-ruby/trunk/debian/patches/51-rbqtapi.dpatch
Modified:
   packages/libqt4-ruby/trunk/debian/changelog
   packages/libqt4-ruby/trunk/debian/control
   packages/libqt4-ruby/trunk/debian/patches/00list
Log:
[libqt4-ruby] Two bug fixes

Modified: packages/libqt4-ruby/trunk/debian/changelog
===================================================================
--- packages/libqt4-ruby/trunk/debian/changelog	2008-04-28 21:33:33 UTC (rev 2696)
+++ packages/libqt4-ruby/trunk/debian/changelog	2008-04-29 19:17:19 UTC (rev 2697)
@@ -1,8 +1,13 @@
-libqt4-ruby (1.4.9-12) UNRELEASED; urgency=low
+libqt4-ruby (1.4.9-12) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Build-dep on libgl1-mesa-dev and libglu1-mesa-dev, to compensate
+    for the fact that they moved from Depends to Recommends within
+    libqt4-dev (closes: #478519)
+  * Remove obnoxious ruby Depends for libqt4-ruby1.8 (closes: #478493)
+  * 50-rbqtapi-ruby1.8 patch to change the interpreter to ruby1.8 for
+    rbqtapi.
 
- -- Vincent Fourmond <fourmond at debian.org>  Mon, 28 Apr 2008 23:31:08 +0200
+ -- Vincent Fourmond <fourmond at debian.org>  Tue, 29 Apr 2008 20:37:51 +0200
 
 libqt4-ruby (1.4.9-11) unstable; urgency=low
 

Modified: packages/libqt4-ruby/trunk/debian/control
===================================================================
--- packages/libqt4-ruby/trunk/debian/control	2008-04-28 21:33:33 UTC (rev 2696)
+++ packages/libqt4-ruby/trunk/debian/control	2008-04-29 19:17:19 UTC (rev 2697)
@@ -4,7 +4,8 @@
 Maintainer: Vincent Fourmond <fourmond at debian.org>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 5), dpatch,
- libqt4-dev (>= 4.3), ruby1.8-dev, ruby, ruby1.8, cmake (> 2.4.7)
+ libqt4-dev (>= 4.3), ruby1.8-dev, ruby, ruby1.8, cmake (> 2.4.7),
+ libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev
 Standards-Version: 3.7.3
 Homepage: http://developer.kde.org/language-bindings/ruby/index.html
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ruby-extras/packages/libqt4-ruby/trunk
@@ -21,7 +22,7 @@
 
 Package: libqt4-ruby1.8
 Architecture: any
-Depends: libsmokeqt4-1 (>= ${binary:Version}), ruby, ruby1.8, 
+Depends: libsmokeqt4-1 (>= ${binary:Version}), ruby1.8, 
 	 libruby1.8, ${shlibs:Depends}
 Suggests: qt4-doc
 Description: ruby bindings for the Qt4 GUI library

Modified: packages/libqt4-ruby/trunk/debian/patches/00list
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/00list	2008-04-28 21:33:33 UTC (rev 2696)
+++ packages/libqt4-ruby/trunk/debian/patches/00list	2008-04-29 19:17:19 UTC (rev 2697)
@@ -5,5 +5,6 @@
 30-qt_enum
 35-fix-class-std-segfault
 40-fix-gcc-snapshot
+50-rbqtapi-ruby1.8
 97-soname
 99-smoke-qt4

Added: packages/libqt4-ruby/trunk/debian/patches/50-rbqtapi-ruby1.8.dpatch
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/50-rbqtapi-ruby1.8.dpatch	                        (rev 0)
+++ packages/libqt4-ruby/trunk/debian/patches/50-rbqtapi-ruby1.8.dpatch	2008-04-29 19:17:19 UTC (rev 2697)
@@ -0,0 +1,16 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50-rbqtapi-ruby1.8.dpatch by  <fourmond at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+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: packages/libqt4-ruby/trunk/debian/patches/50-rbqtapi-ruby1.8.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Deleted: packages/libqt4-ruby/trunk/debian/patches/51-rbqtapi.dpatch
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/51-rbqtapi.dpatch	2008-04-28 21:33:33 UTC (rev 2696)
+++ packages/libqt4-ruby/trunk/debian/patches/51-rbqtapi.dpatch	2008-04-29 19:17:19 UTC (rev 2697)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 51-rbqtapi.dpatch by  <fourmond at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Swicth to using Qt4 by default in rbqtapi
-
- at DPATCH@
-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	2007-10-28 09:30:56.000000000 +0100
-@@ -8,7 +8,7 @@
- 
- case File.basename $0
- when "rbqtapi"
--   require 'Qt'
-+   require 'Qt4'                # Modified to select Qt4 by default
- when "rbqt3api"
-    require 'Qt3'
- when "rbqt4api"