[DRE-commits] r1513 - packages/libqt4-ruby/trunk/debian

[Vincent Fourmond]

Author: fourmond
Date: 2007-05-02 19:13:25 +0000 (Wed, 02 May 2007)
New Revision: 1513

Removed:
   packages/libqt4-ruby/trunk/debian/Qt.rb
Modified:
   packages/libqt4-ruby/trunk/debian/NEWS
   packages/libqt4-ruby/trunk/debian/changelog
   packages/libqt4-ruby/trunk/debian/control
   packages/libqt4-ruby/trunk/debian/rules
Log:
Added the team adress; does not conflict anymore with Qt3 bindings

Modified: packages/libqt4-ruby/trunk/debian/NEWS
===================================================================
--- packages/libqt4-ruby/trunk/debian/NEWS	2007-04-25 22:18:25 UTC (rev 1512)
+++ packages/libqt4-ruby/trunk/debian/NEWS	2007-05-02 19:13:25 UTC (rev 1513)
@@ -1,7 +1,15 @@
+libqt4-ruby (1.4.7-2) unstable; urgency=low
+
+The transition Qt.rb file has been removed to allow side by side
+installation of Qt3 and Qt4 ruby bindings. Please update all code
+using Qt.rb to now use Qt4.rb.
+
+ -- Vincent Fourmond <fourmond at debian.org>  Wed, 02 May 2007 20:23:21 +0200
+
 libqt4-ruby (1.4.7-1) unstable; urgency=low
 
-  * For compatibility with the Qt3 extension, upstream has renamed
-    Qt.rb Qt4.rb. A transition Qt.rb is provided, but you are strongly
-    encouraged to migrate old code.
+For compatibility with the Qt3 extension, upstream has renamed
+Qt.rb Qt4.rb. A transition Qt.rb is provided, but you are strongly
+encouraged to migrate old code.
 
  -- Vincent Fourmond <vincent.fourmond at 9online.fr>  Mon,  1 Jan 2007 18:21:58 +0100

Deleted: packages/libqt4-ruby/trunk/debian/Qt.rb
===================================================================
--- packages/libqt4-ruby/trunk/debian/Qt.rb	2007-04-25 22:18:25 UTC (rev 1512)
+++ packages/libqt4-ruby/trunk/debian/Qt.rb	2007-05-02 19:13:25 UTC (rev 1513)
@@ -1,5 +0,0 @@
-# Transition file for libqt4-ruby. Written by Vincent Fourmond
-# for the Debian project. This file is public domain.
-
-warn 'The Qt.rb file will be removed in the future. Use Qt4.rb instead'
-require 'Qt4.rb'

Modified: packages/libqt4-ruby/trunk/debian/changelog
===================================================================
--- packages/libqt4-ruby/trunk/debian/changelog	2007-04-25 22:18:25 UTC (rev 1512)
+++ packages/libqt4-ruby/trunk/debian/changelog	2007-05-02 19:13:25 UTC (rev 1513)
@@ -1,8 +1,10 @@
-libqt4-ruby (1.4.7-2) UNRELEASED; urgency=low
+libqt4-ruby (1.4.7-2) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Added the Debian Ruby Extras Maintainers team address
+  * Removed the temporary Qt.rb: no longer conflicts with Qt3 ruby
+    bindings (Closes: #407073)
 
- -- Vincent Fourmond <fourmond at debian.org>  Mon, 19 Mar 2007 21:23:18 +0100
+ -- Vincent Fourmond <fourmond at debian.org>  Wed, 02 May 2007 20:21:54 +0200
 
 libqt4-ruby (1.4.7-1) unstable; urgency=low
 

Modified: packages/libqt4-ruby/trunk/debian/control
===================================================================
--- packages/libqt4-ruby/trunk/debian/control	2007-04-25 22:18:25 UTC (rev 1512)
+++ packages/libqt4-ruby/trunk/debian/control	2007-05-02 19:13:25 UTC (rev 1513)
@@ -2,6 +2,7 @@
 Section: interpreters
 Priority: optional
 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), autotools-dev, dpatch,
  libqt4-dev, automake1.7, autoconf, libtool, ruby1.8-dev, ruby, ruby1.8,
  ruby-pkg-tools
@@ -19,7 +20,6 @@
 Package: libqt4-ruby1.8
 Architecture: any
 Depends: libsmokeqt4-1, ruby, ruby1.8, libruby1.8
-Conflicts: libqt0-ruby1.8
 Description: ruby bindings for the Qt4 GUI library
  Smoke-based ruby bindings for Qt4, the Trolltech GUI library.
  .

Modified: packages/libqt4-ruby/trunk/debian/rules
===================================================================
--- packages/libqt4-ruby/trunk/debian/rules	2007-04-25 22:18:25 UTC (rev 1512)
+++ packages/libqt4-ruby/trunk/debian/rules	2007-05-02 19:13:25 UTC (rev 1513)
@@ -120,8 +120,6 @@
 # Remove rbqtsh as it fails for now
 	cd $(CURDIR)/debian/libqt4-ruby1.8/usr/bin; rm -f rbqtsh
 	cd $(CURDIR)/debian/libqt4-ruby1.8/$(ARCHDIR); rm *.la *.so *.so.0; mv *.so.* qtruby4.so
-# Add dummy transition file
-	cp $(CURDIR)/debian/Qt.rb $(CURDIR)/debian/libqt4-ruby1.8/usr/lib/ruby/1.8
 	dh_install -s
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep