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

Vincent Fourmond fourmond-guest at alioth.debian.org
Tue Jan 16 12:19:36 CET 2007 

Author: fourmond-guest
Date: 2007-01-16 12:19:35 +0100 (Tue, 16 Jan 2007)
New Revision: 1276

Added:
   packages-wip/libqt4-ruby/trunk/debian/patches/31-constants-warning.dpatch
   packages-wip/libqt4-ruby/trunk/debian/rbrcc.1
   packages-wip/libqt4-ruby/trunk/debian/rbuic4.1
Modified:
   packages-wip/libqt4-ruby/trunk/debian/changelog
   packages-wip/libqt4-ruby/trunk/debian/control.in
   packages-wip/libqt4-ruby/trunk/debian/libqt4-ruby1.8.manpages
   packages-wip/libqt4-ruby/trunk/debian/patches/00list
   packages-wip/libqt4-ruby/trunk/debian/patches/30-qt_enum.dpatch
   packages-wip/libqt4-ruby/trunk/debian/rules
Log:
libqt4-ruby1.8 now also include development tools, fixed a small bug in one of the patches, new patch fix some bugs

Modified: packages-wip/libqt4-ruby/trunk/debian/changelog
===================================================================
--- packages-wip/libqt4-ruby/trunk/debian/changelog	2007-01-16 11:14:11 UTC (rev 1275)
+++ packages-wip/libqt4-ruby/trunk/debian/changelog	2007-01-16 11:19:35 UTC (rev 1276)
@@ -1,16 +1,19 @@
-libqt4-ruby (1.4.7-1) UNRELEASED; urgency=low
+libqt4-ruby (1.4.7-1) unstable; urgency=low
 
   * Fix source package name to match Debian Ruby policy conventions
   * New upstream release with many bug fixes and enhancements
   * Fix 02-qtruby-makefile to adapt to new names
   * Added the pkg-ruby-extras Uploaders list
   * 15-fix-install to fix annoying symlinks
-  * Switch to recent automake
   * Adapt 30-qt_enum to new files layout
   * Patch 98-soname to fix soname of the library
   * Added a Qt.rb transition file (now the library is provided by Qt4.rb)
+  * Included rbuic4 and rbrcc that got lost somehow (Closes: #406449)
+  * Wrote small manpages for both
+  * Fix bug in QVariant translation frome QDate/QDateTime
+  * Fixed 30-qt_enum that was breaking function lookup in certain cases.
 
- -- Vincent Fourmond <vincent.fourmond at 9online.fr>  Mon,  1 Jan 2007 18:16:49 +0100
+ -- Vincent Fourmond <vincent.fourmond at 9online.fr>  Tue, 16 Jan 2007 12:00:00 +0100
 
 qt4-qtruby (1.4.6-2) unstable; urgency=low
 

Modified: packages-wip/libqt4-ruby/trunk/debian/control.in
===================================================================
--- packages-wip/libqt4-ruby/trunk/debian/control.in	2007-01-16 11:14:11 UTC (rev 1275)
+++ packages-wip/libqt4-ruby/trunk/debian/control.in	2007-01-16 11:19:35 UTC (rev 1276)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Vincent Fourmond <vincent.fourmond at 9online.fr>
 Build-Depends: debhelper (>= 5), autotools-dev, dpatch,
- libqt4-dev, automake, libtool, ruby1.8-dev, ruby, ruby1.8,
+ libqt4-dev, automake1.7, libtool, ruby1.8-dev, ruby, ruby1.8,
  ruby-pkg-tools
 Uploaders: @RUBY_EXTRAS_TEAM@
 Standards-Version: 3.7.2

Modified: packages-wip/libqt4-ruby/trunk/debian/libqt4-ruby1.8.manpages
===================================================================
--- packages-wip/libqt4-ruby/trunk/debian/libqt4-ruby1.8.manpages	2007-01-16 11:14:11 UTC (rev 1275)
+++ packages-wip/libqt4-ruby/trunk/debian/libqt4-ruby1.8.manpages	2007-01-16 11:19:35 UTC (rev 1276)
@@ -1,2 +1,4 @@
 debian/rbqtapi.1
-debian/qtrubyinit.1
\ No newline at end of file
+debian/qtrubyinit.1
+debian/rbuic4.1
+debian/rbrcc.1
\ No newline at end of file

Modified: packages-wip/libqt4-ruby/trunk/debian/patches/00list
===================================================================
--- packages-wip/libqt4-ruby/trunk/debian/patches/00list	2007-01-16 11:14:11 UTC (rev 1275)
+++ packages-wip/libqt4-ruby/trunk/debian/patches/00list	2007-01-16 11:19:35 UTC (rev 1276)
@@ -3,5 +3,6 @@
 15-fix-install
 20-visibility
 30-qt_enum
+31-constants-warning
 98-soname
 99-smoke-qt4

Modified: packages-wip/libqt4-ruby/trunk/debian/patches/30-qt_enum.dpatch
===================================================================
--- packages-wip/libqt4-ruby/trunk/debian/patches/30-qt_enum.dpatch	2007-01-16 11:14:11 UTC (rev 1275)
+++ packages-wip/libqt4-ruby/trunk/debian/patches/30-qt_enum.dpatch	2007-01-16 11:19:35 UTC (rev 1276)
@@ -5,25 +5,19 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad qt4-qtruby-1.4.6~/qtruby/rubylib/qtruby/lib/Qt/qtruby4.rb qt4-qtruby-1.4.6/qtruby/rubylib/qtruby/lib/Qt/qtruby4.rb
---- qt4-qtruby-1.4.6~/qtruby/rubylib/qtruby/lib/Qt/qtruby4.rb	2006-10-11 00:41:54.000000000 +0200
-+++ qt4-qtruby-1.4.6/qtruby/rubylib/qtruby/lib/Qt/qtruby4.rb	2006-10-11 00:45:13.000000000 +0200
-@@ -1654,12 +1654,15 @@
- 				t = typename.sub(/^const\s+/, '')
- 				t.sub!(/[&*]$/, '')
- 				if argtype == t
--					return 1
-+					return 2
+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
  				elsif classIsa(argtype, t)
  					return 0
 +                                
  				elsif isEnum(argtype) and 
 -						(t =~ /int|qint32|uint|quint32|long|ulong/ or isEnum(t))
--					return 0
 +						(t =~ /int|qint32|uint|quint32|long|ulong/) # We cast only to int, not to another enum type.
-+					return 1 # We prefer to cast
-+# 				elsif isEnum(argtype) and isEnum(t))
-+# 					return 1
++					return 1 # We prefer to cast to int than to an enum of different type
++				elsif isEnum(argtype) and isEnum(t)
+ 					return 0
  				end
  			end
- 			return -99

Added: packages-wip/libqt4-ruby/trunk/debian/patches/31-constants-warning.dpatch
===================================================================
--- packages-wip/libqt4-ruby/trunk/debian/patches/31-constants-warning.dpatch	2007-01-16 11:14:11 UTC (rev 1275)
+++ packages-wip/libqt4-ruby/trunk/debian/patches/31-constants-warning.dpatch	2007-01-16 11:19:35 UTC (rev 1276)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 31-constants-warning.dpatch by  <vincent.fourmond at 9online.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at 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
+@@ -1425,6 +1425,8 @@
+ 	class Variant < Qt::Base
+ 		String = 10
+ 		Time = 15
++                DateTime = 16
++                Date = 14
+ 
+ 		def to_a
+ 			return toStringList()


Property changes on: packages-wip/libqt4-ruby/trunk/debian/patches/31-constants-warning.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Copied: packages-wip/libqt4-ruby/trunk/debian/rbrcc.1 (from rev 1233, packages-wip/libqt4-ruby/trunk/debian/rbqtapi.1)
===================================================================
--- packages-wip/libqt4-ruby/trunk/debian/rbqtapi.1	2006-12-23 01:49:11 UTC (rev 1233)
+++ packages-wip/libqt4-ruby/trunk/debian/rbrcc.1	2007-01-16 11:19:35 UTC (rev 1276)
@@ -0,0 +1,48 @@
+.TH RBRCC "1" "October 2006" "Qt4-qtruby version 1.4.7" 
+.SH NAME
+rbrcc \- Qt/Ruby resource compiler
+
+.SH SYNOPSIS
+.B rbrcc
+[options]
+.I inputs
+
+.SH DESCRIPTION
+
+.B rbrcc
+compiles resource files (.qrc) into ruby code.
+
+.SH OPTIONS
+.TP
+.BI -o \ file           
+Write output to file rather than stdout
+.TP
+.BI -name \ name        
+Create an external initialization method with name
+.TP
+.BI -threshold \ level  
+Threshold to consider compressing files
+.TP
+.BI -compress \ level   
+Compress input files by level
+.TP
+.BI -root \ path
+Prefix resource access path with root path
+.TP
+.BI -no-compress
+Disable all compression
+.TP
+.BI -version
+Display version
+.TP
+.BI -help
+Display option summary
+
+.SH AUTHOR
+.B rbrcc
+is based on the 
+.B rcc 
+program from the Qt distribution. 
+
+This manual page was written by Vincent
+Fourmond for the Debian project, but may be used by others.

Added: packages-wip/libqt4-ruby/trunk/debian/rbuic4.1
===================================================================
--- packages-wip/libqt4-ruby/trunk/debian/rbuic4.1	2007-01-16 11:14:11 UTC (rev 1275)
+++ packages-wip/libqt4-ruby/trunk/debian/rbuic4.1	2007-01-16 11:19:35 UTC (rev 1276)
@@ -0,0 +1,52 @@
+.TH RBUIC4 "1" "October 2006" "Qt4-qtruby version 1.4.7" 
+.SH NAME
+rbuic4 \- Qt/Ruby user interface compiler.
+
+.SH SYNOPSIS
+.B rbuic4
+[options]
+.I uifile
+
+.SH DESCRIPTION
+
+.B rbuic4
+compiles user interface files (.ui) into ruby code.
+
+.SH OPTIONS
+
+.TP
+.B -h, -help
+display a short help and exit
+.TP
+.B  -v, -version              
+display version
+.TP
+.B  -d, -dependencies         
+display the dependencies
+.TP
+.BI -o \ file
+place the output into 
+.I file
+.TP
+.BI -tr func                
+use 
+.I func() 
+for i18n
+.TP
+.B  -p, -no-protection        
+disable header protection (most probably useless for Ruby)
+.TP
+.BI -g \ name                 
+change generator
+.TP
+.B -x                        
+generate extra code to test the class
+
+.SH AUTHOR
+.B rbuic4
+is based on the 
+.B uic
+program from the Qt distribution. 
+
+This manual page was written by Vincent
+Fourmond for the Debian project, but may be used by others.

Modified: packages-wip/libqt4-ruby/trunk/debian/rules
===================================================================
--- packages-wip/libqt4-ruby/trunk/debian/rules	2007-01-16 11:14:11 UTC (rev 1275)
+++ packages-wip/libqt4-ruby/trunk/debian/rules	2007-01-16 11:19:35 UTC (rev 1276)
@@ -35,8 +35,8 @@
 
 config.status: patch-stamp 
 	dh_testdir
-	aclocal
-	automake
+	aclocal-1.7
+	automake-1.7
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
 # 	cd qtruby/rubylib/qtruby; touch Makefile.am; make Makefile;
 # 	touch $@
@@ -55,7 +55,9 @@
 
 build-arch: build-arch-stamp
 build-arch-stamp:  config.status
-	$(MAKE) 
+	$(MAKE)
+	cd qtruby/rubylib/designer/rbrcc; $(MAKE)
+	cd qtruby/rubylib/designer/rbuic; $(MAKE)
 	touch $@
 
 build-indep: build-indep-stamp
@@ -109,6 +111,9 @@
 	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 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

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