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

fourmond at alioth.debian.org fourmond at alioth.debian.org
Sat Jun 30 12:10:06 UTC 2007 

Author: fourmond
Date: 2007-06-30 12:10:06 +0000 (Sat, 30 Jun 2007)
New Revision: 1738

Modified:
   packages/libqt4-ruby/trunk/debian/NEWS
   packages/libqt4-ruby/trunk/debian/changelog
   packages/libqt4-ruby/trunk/debian/control
   packages/libqt4-ruby/trunk/debian/libqt4-ruby1.8.manpages
   packages/libqt4-ruby/trunk/debian/patches/00list
   packages/libqt4-ruby/trunk/debian/patches/30-qt_enum.dpatch
   packages/libqt4-ruby/trunk/debian/patches/31-constants-warning.dpatch
   packages/libqt4-ruby/trunk/debian/patches/97-soname.dpatch
   packages/libqt4-ruby/trunk/debian/rules
Log:
New upstream ready for upload

Modified: packages/libqt4-ruby/trunk/debian/NEWS
===================================================================
--- packages/libqt4-ruby/trunk/debian/NEWS	2007-06-29 11:11:07 UTC (rev 1737)
+++ packages/libqt4-ruby/trunk/debian/NEWS	2007-06-30 12:10:06 UTC (rev 1738)
@@ -1,3 +1,10 @@
+libqt4-ruby (1.4.9-1) unstable; urgency=low
+
+  The upstream 1.4.9 doesn't ship anymore with qt4rubyinit, so don't
+  look for it !  
+
+ -- Vincent Fourmond <fourmond at debian.org>  Sat, 30 Jun 2007 13:42:53 +0200
+
 libqt4-ruby (1.4.7-3) unstable; urgency=low
 
   qtrubyinit has been renamed to qt4rubyinit to avoid conflicts

Modified: packages/libqt4-ruby/trunk/debian/changelog
===================================================================
--- packages/libqt4-ruby/trunk/debian/changelog	2007-06-29 11:11:07 UTC (rev 1737)
+++ packages/libqt4-ruby/trunk/debian/changelog	2007-06-30 12:10:06 UTC (rev 1738)
@@ -1,9 +1,14 @@
-libqt4-ruby (1.4.9-1) UNRELEASED; urgency=low
+libqt4-ruby (1.4.9-1) unstable; urgency=low
 
-  * NOT RELEASED YET
-  * 
+  * New upstream release
+  * Updated to the new cmake-based build system
+  * Disabled many patches that don't make sense anymore; basically,
+    only 99-smokeqt4 and 30-qtenum are kept.
+  * Bumping libsmokeqt4 soversion to 1.3.0 - the smoke interface didn't seem
+    to change.
+  * Removing qt4rubyinit manpage as the binary isn't available anymore.
 
- -- Vincent Fourmond <fourmond at debian.org>  Thu, 28 Jun 2007 00:44:18 +0200
+ -- Vincent Fourmond <fourmond at debian.org>  Sat, 30 Jun 2007 07:59:15 +0200
 
 libqt4-ruby (1.4.7-4) unstable; urgency=low
 

Modified: packages/libqt4-ruby/trunk/debian/control
===================================================================
--- packages/libqt4-ruby/trunk/debian/control	2007-06-29 11:11:07 UTC (rev 1737)
+++ packages/libqt4-ruby/trunk/debian/control	2007-06-30 12:10:06 UTC (rev 1738)
@@ -19,6 +19,7 @@
 Package: libqt4-ruby1.8
 Architecture: any
 Depends: libsmokeqt4-1, ruby, ruby1.8, libruby1.8
+Suggests: qt4-doc
 Description: ruby bindings for the Qt4 GUI library
  Smoke-based ruby bindings for Qt4, the Trolltech GUI library.
  .
@@ -33,12 +34,12 @@
  languages (ruby, python, perl...) can be based.
 
 Package: libsmokeqt4-dev
-Architecture: all
+Architecture: any
 Section: libdevel
 Depends: libsmokeqt4-1 (= ${binary:Version})
 Description: Smoke library for Qt4
  This is the Smoke library for Qt4, on which bindings for different
- languages (ruby, python, perl...) can be based. 
+ languages (ruby, python, perl...) can be based.
  .
  This package contains files needed for development with the
  Smoke Qt4 library.

Modified: packages/libqt4-ruby/trunk/debian/libqt4-ruby1.8.manpages
===================================================================
--- packages/libqt4-ruby/trunk/debian/libqt4-ruby1.8.manpages	2007-06-29 11:11:07 UTC (rev 1737)
+++ packages/libqt4-ruby/trunk/debian/libqt4-ruby1.8.manpages	2007-06-30 12:10:06 UTC (rev 1738)
@@ -1,4 +1,3 @@
 debian/rbqtapi.1
-debian/qt4rubyinit.1
 debian/rbuic4.1
 debian/rbrcc.1

Modified: packages/libqt4-ruby/trunk/debian/patches/00list
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/00list	2007-06-29 11:11:07 UTC (rev 1737)
+++ packages/libqt4-ruby/trunk/debian/patches/00list	2007-06-30 12:10:06 UTC (rev 1738)
@@ -4,7 +4,7 @@
 # 10-kalyptus
 # 15-fix-install
 # 20-visibility
-# 30-qt_enum
+30-qt_enum
 # 31-constants-warning
 97-soname
 99-smoke-qt4

Modified: packages/libqt4-ruby/trunk/debian/patches/30-qt_enum.dpatch
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/30-qt_enum.dpatch	2007-06-29 11:11:07 UTC (rev 1737)
+++ packages/libqt4-ruby/trunk/debian/patches/30-qt_enum.dpatch	2007-06-30 12:10:06 UTC (rev 1738)
@@ -5,10 +5,10 @@
 ## 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-05-22 22:09:25.000000000 +0200
-@@ -1878,11 +1880,14 @@
+diff -urNad libqt4-ruby-1.4.9~/ruby/qtruby/src/lib/Qt/qtruby4.rb libqt4-ruby-1.4.9/ruby/qtruby/src/lib/Qt/qtruby4.rb
+--- libqt4-ruby-1.4.9~/ruby/qtruby/src/lib/Qt/qtruby4.rb	2007-06-18 16:06:41.000000000 +0200
++++ libqt4-ruby-1.4.9/ruby/qtruby/src/lib/Qt/qtruby4.rb	2007-06-30 07:49:57.000000000 +0200
+@@ -2174,11 +2174,14 @@
  				t = typename.sub(/^const\s+/, '')
  				t.sub!(/[&*]$/, '')
  				if argtype == t

Modified: packages/libqt4-ruby/trunk/debian/patches/31-constants-warning.dpatch
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/31-constants-warning.dpatch	2007-06-29 11:11:07 UTC (rev 1737)
+++ packages/libqt4-ruby/trunk/debian/patches/31-constants-warning.dpatch	2007-06-30 12:10:06 UTC (rev 1738)
@@ -5,9 +5,9 @@
 ## DP: No description.
 
 @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	2007-01-16 12:03:53.000000000 +0100
-+++ libqt4-ruby-1.4.7/qtruby/rubylib/qtruby/lib/Qt/qtruby4.rb	2007-01-16 12:04:28.000000000 +0100
+diff -urNad libqt4-ruby-1.4.7~/ruby/qtruby/src/lib/Qt/qtruby4.rb libqt4-ruby-1.4.7/ruby/qtruby/src/lib/Qt/qtruby4.rb
+--- libqt4-ruby-1.4.7~/ruby/qtruby/src/lib/Qt/qtruby4.rb	2007-01-16 12:03:53.000000000 +0100
++++ libqt4-ruby-1.4.7/ruby/qtruby/src/lib/Qt/qtruby4.rb	2007-01-16 12:04:28.000000000 +0100
 @@ -1425,6 +1425,8 @@
  	class Variant < Qt::Base
  		String = 10

Modified: packages/libqt4-ruby/trunk/debian/patches/97-soname.dpatch
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/97-soname.dpatch	2007-06-29 11:11:07 UTC (rev 1737)
+++ packages/libqt4-ruby/trunk/debian/patches/97-soname.dpatch	2007-06-30 12:10:06 UTC (rev 1738)
@@ -13,7 +13,7 @@
                                ${Qwt5_Qt4_LIBRARY} )
  
 -set_target_properties(smokeqt PROPERTIES VERSION 2.0.0 SOVERSION 2 )
-+set_target_properties(smokeqt PROPERTIES SOVERSION 1.3.0)
++set_target_properties(smokeqt PROPERTIES VERSION 1.3.0 SOVERSION 1 )
  
  install(TARGETS smokeqt DESTINATION ${CMAKE_INSTALL_PREFIX}/lib )
  

Modified: packages/libqt4-ruby/trunk/debian/rules
===================================================================
--- packages/libqt4-ruby/trunk/debian/rules	2007-06-29 11:11:07 UTC (rev 1737)
+++ packages/libqt4-ruby/trunk/debian/rules	2007-06-30 12:10:06 UTC (rev 1738)
@@ -76,7 +76,8 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP#
-	-$(MAKE) distclean
+# Doesn't seem to always work...
+	-$(MAKE) clean
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
 endif
@@ -108,24 +109,13 @@
 	dh_installdirs -s
 
 	$(MAKE) install 
-# First, install smoke:
-# 	cd smoke; $(MAKE) install-strip DESTDIR=$(CURDIR)/debian/libsmokeqt4-1
-# 	cd $(CURDIR)/debian/libsmokeqt4-1/usr/lib; rm *.la *.so
-# 	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.*
-# 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'
-# 	cd qtruby/bin; $(MAKE) install DESTDIR=$(CURDIR)/debian/libqt4-ruby1.8
-# 	cd qtruby/rubylib/designer/rbrcc; $(MAKE) install DESTDIR=$(CURDIR)/debian/libqt4-ruby1.8
-# 	cd qtruby/rubylib/designer/rbuic; $(MAKE) install DESTDIR=$(CURDIR)/debian/libqt4-ruby1.8
+# Remove files conflicting with libqt0-ruby.
+	rm $(CURDIR)/debian/tmp/usr/lib/ruby/1.8/Qt.rb
 
 # Remove rbqtsh as it fails for now
-#	cd $(CURDIR)/debian/libqt4-ruby1.8/usr/bin; rm -f rbqtsh; mv qtrubyinit qt4rubyinit
-#	cd $(CURDIR)/debian/libqt4-ruby1.8/$(ARCHDIR); rm *.la *.so *.so.0; mv *.so.* qtruby4.so
 	dh_install -s --list-missing --sourcedir=debian/tmp 
+	cd $(CURDIR)/debian/libqt4-ruby1.8/usr/bin; rm -f rbqtsh;
+
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep
 # in another 'make' thread.

More information about the Pkg-ruby-extras-commits mailing list