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

Vincent Fourmond fourmond-guest at alioth.debian.org
Sun Dec 31 17:46:43 CET 2006 

Author: fourmond-guest
Date: 2006-12-31 17:46:42 +0100 (Sun, 31 Dec 2006)
New Revision: 1242

Added:
   packages-wip/libqt4-ruby/trunk/debian/control.in
   packages-wip/libqt4-ruby/trunk/debian/patches/15-fix-install.dpatch
Modified:
   packages-wip/libqt4-ruby/trunk/debian/changelog
   packages-wip/libqt4-ruby/trunk/debian/control
   packages-wip/libqt4-ruby/trunk/debian/patches/00list
   packages-wip/libqt4-ruby/trunk/debian/patches/02-qtruby-makefile.dpatch
   packages-wip/libqt4-ruby/trunk/debian/patches/30-qt_enum.dpatch
   packages-wip/libqt4-ruby/trunk/debian/rules
Log:
libqt4-ruby: new upstream release, few fixes

Modified: packages-wip/libqt4-ruby/trunk/debian/changelog
===================================================================
--- packages-wip/libqt4-ruby/trunk/debian/changelog	2006-12-28 22:28:11 UTC (rev 1241)
+++ packages-wip/libqt4-ruby/trunk/debian/changelog	2006-12-31 16:46:42 UTC (rev 1242)
@@ -1,8 +1,14 @@
-libqt4-ruby (1.4.6-3) UNRELEASED; urgency=low
+libqt4-ruby (1.4.7-1) UNRELEASED; 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
 
- -- Vincent Fourmond <vincent.fourmond at 9online.fr>  Sat, 23 Dec 2006 02:31:32 +0100
+ -- Vincent Fourmond <vincent.fourmond at 9online.fr>  Sun, 31 Dec 2006 17:44:19 +0100
 
 qt4-qtruby (1.4.6-2) unstable; urgency=low
 

Modified: packages-wip/libqt4-ruby/trunk/debian/control
===================================================================
--- packages-wip/libqt4-ruby/trunk/debian/control	2006-12-28 22:28:11 UTC (rev 1241)
+++ packages-wip/libqt4-ruby/trunk/debian/control	2006-12-31 16:46:42 UTC (rev 1242)
@@ -3,7 +3,8 @@
 Priority: optional
 Maintainer: Vincent Fourmond <vincent.fourmond at 9online.fr>
 Build-Depends: debhelper (>= 5), autotools-dev, dpatch,
- libqt4-dev, automake1.7, libtool, ruby1.8-dev, ruby, ruby1.8
+ libqt4-dev, automake, libtool, ruby1.8-dev, ruby, ruby1.8,
+ ruby-pkg-tools
 Standards-Version: 3.7.2
 
 Package: libqt4-ruby

Copied: packages-wip/libqt4-ruby/trunk/debian/control.in (from rev 1233, packages-wip/libqt4-ruby/trunk/debian/control)
===================================================================
--- packages-wip/libqt4-ruby/trunk/debian/control	2006-12-23 01:49:11 UTC (rev 1233)
+++ packages-wip/libqt4-ruby/trunk/debian/control.in	2006-12-31 16:46:42 UTC (rev 1242)
@@ -0,0 +1,36 @@
+Source: libqt4-ruby
+Section: interpreters
+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,
+ ruby-pkg-tools
+Uploaders: @RUBY_EXTRAS_TEAM@
+Standards-Version: 3.7.2
+
+Package: libqt4-ruby
+Architecture: all
+Depends: libqt4-ruby1.8
+Description: ruby bindings for the Qt4 GUI library
+ Ruby bindings for Qt4.
+ .
+ This is a dependency package to point to the current version
+ of ruby.
+
+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
+ Ruby bindings for Qt4.
+ .
+ Provides the bindings for ruby 1.8
+
+Package: libsmokeqt4-1
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: smoke library for Qt4
+ This is the smoke library for Qt4, on which bindings for different
+ languages (ruby, python, perl...) can be based.
+

Modified: packages-wip/libqt4-ruby/trunk/debian/patches/00list
===================================================================
--- packages-wip/libqt4-ruby/trunk/debian/patches/00list	2006-12-28 22:28:11 UTC (rev 1241)
+++ packages-wip/libqt4-ruby/trunk/debian/patches/00list	2006-12-31 16:46:42 UTC (rev 1242)
@@ -1,5 +1,6 @@
 02-qtruby-makefile
-10-kalyptus
+# 10-kalyptus
+15-fix-install
 20-visibility
 30-qt_enum
 99-smoke-qt4

Modified: packages-wip/libqt4-ruby/trunk/debian/patches/02-qtruby-makefile.dpatch
===================================================================
--- packages-wip/libqt4-ruby/trunk/debian/patches/02-qtruby-makefile.dpatch	2006-12-28 22:28:11 UTC (rev 1241)
+++ packages-wip/libqt4-ruby/trunk/debian/patches/02-qtruby-makefile.dpatch	2006-12-31 16:46:42 UTC (rev 1242)
@@ -5,26 +5,25 @@
 ## DP: Added library dependency on ruby's lib.
 
 @DPATCH@
-diff -urNad qt4-qtruby-1.4.5~/qtruby/rubylib/qtruby/Makefile.am qt4-qtruby-1.4.5/qtruby/rubylib/qtruby/Makefile.am
---- qt4-qtruby-1.4.5~/qtruby/rubylib/qtruby/Makefile.am	2006-07-18 13:31:28.000000000 +0200
-+++ qt4-qtruby-1.4.5/qtruby/rubylib/qtruby/Makefile.am	2006-07-18 13:48:14.000000000 +0200
+diff -urNad libqt4-ruby-1.4.7~/qtruby/rubylib/qtruby/Makefile.am libqt4-ruby-1.4.7/qtruby/rubylib/qtruby/Makefile.am
+--- libqt4-ruby-1.4.7~/qtruby/rubylib/qtruby/Makefile.am	2006-10-30 17:52:52.000000000 +0100
++++ libqt4-ruby-1.4.7/qtruby/rubylib/qtruby/Makefile.am	2006-12-31 16:25:14.000000000 +0100
 @@ -9,10 +9,11 @@
  
  rubylibdir = $(RUBY_SITEARCHDIR)
- rubylib_LTLIBRARIES = qtruby.la
--qtruby_la_SOURCES = 
-+qtruby_la_SOURCES = dummy.cpp
- qtruby_la_LDFLAGS = -module $(all_libraries) -version-info 0:0:0
--qtruby_la_LIBADD = libqtrubyinternal.la $(LIB_QTCORE) $(LIB_QTGUI) $(LIB_QTNETWORK) \
-+qtruby_la_LIBADD =  libqtrubyinternal.la $(LIB_QTCORE) $(LIB_QTGUI) $(LIB_QTNETWORK) \
+ rubylib_LTLIBRARIES = qtruby4.la
+-qtruby4_la_SOURCES = 
++qtruby4_la_SOURCES = dummy.cpp
+ qtruby4_la_LDFLAGS = -module $(all_libraries) -version-info 0:0:0
+ qtruby4_la_LIBADD = libqtrubyinternal.la $(LIB_QTCORE) $(LIB_QTGUI) $(LIB_QTNETWORK) \
  						$(LIB_QTOPENGL) $(LIB_QTSQL) $(LIB_QTCORE) $(LIB_QTXML) \
 - 						$(top_builddir)/smoke/qt/libsmokeqt.la
-+						$(top_builddir)/smoke/qt/libsmokeqt.la \
-+                                                $(RUBY_LIBRUBYARG) -L$(RUBY_LIBDIR)
++ 						$(top_builddir)/smoke/qt/libsmokeqt.la \
++						$(RUBY_LIBRUBYARG) -L$(RUBY_LIBDIR)
  
  SUBDIRS = lib 
-diff -urNad qt4-qtruby-1.4.5~/qtruby/rubylib/qtruby/dummy.cpp qt4-qtruby-1.4.5/qtruby/rubylib/qtruby/dummy.cpp
---- qt4-qtruby-1.4.5~/qtruby/rubylib/qtruby/dummy.cpp	1970-01-01 01:00:00.000000000 +0100
-+++ qt4-qtruby-1.4.5/qtruby/rubylib/qtruby/dummy.cpp	2006-07-18 13:47:49.000000000 +0200
+diff -urNad libqt4-ruby-1.4.7~/qtruby/rubylib/qtruby/dummy.cpp libqt4-ruby-1.4.7/qtruby/rubylib/qtruby/dummy.cpp
+--- libqt4-ruby-1.4.7~/qtruby/rubylib/qtruby/dummy.cpp	1970-01-01 01:00:00.000000000 +0100
++++ libqt4-ruby-1.4.7/qtruby/rubylib/qtruby/dummy.cpp	2006-12-31 16:25:14.000000000 +0100
 @@ -0,0 +1 @@
 +/* Dummy file to force automake to treat Qt.so as a C++ library - and not a C one */

Added: packages-wip/libqt4-ruby/trunk/debian/patches/15-fix-install.dpatch
===================================================================
--- packages-wip/libqt4-ruby/trunk/debian/patches/15-fix-install.dpatch	2006-12-28 22:28:11 UTC (rev 1241)
+++ packages-wip/libqt4-ruby/trunk/debian/patches/15-fix-install.dpatch	2006-12-31 16:46:42 UTC (rev 1242)
@@ -0,0 +1,17 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 15-fix-install.dpatch by  <vincent.fourmond at 9online.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove the symlink stuff, as it make the installation fail miserably
+
+ at DPATCH@
+diff -urNad libqt4-ruby-1.4.7~/qtruby/rubylib/qtruby/lib/Makefile.am libqt4-ruby-1.4.7/qtruby/rubylib/qtruby/lib/Makefile.am
+--- libqt4-ruby-1.4.7~/qtruby/rubylib/qtruby/lib/Makefile.am	2006-10-30 17:52:51.000000000 +0100
++++ libqt4-ruby-1.4.7/qtruby/rubylib/qtruby/lib/Makefile.am	2006-12-31 17:04:13.000000000 +0100
+@@ -4,6 +4,4 @@
+ rubylib_DATA = Qt4.rb Qt3.rb
+ 
+ install-data-local:
+-	@-rm -f $(RUBY_SITEDIR)/Qt.rb
+-	@$(LN_S) $(RUBY_SITEDIR)/Qt4.rb $(RUBY_SITEDIR)/Qt.rb
+ 


Property changes on: packages-wip/libqt4-ruby/trunk/debian/patches/15-fix-install.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: packages-wip/libqt4-ruby/trunk/debian/patches/30-qt_enum.dpatch
===================================================================
--- packages-wip/libqt4-ruby/trunk/debian/patches/30-qt_enum.dpatch	2006-12-28 22:28:11 UTC (rev 1241)
+++ packages-wip/libqt4-ruby/trunk/debian/patches/30-qt_enum.dpatch	2006-12-31 16:46:42 UTC (rev 1242)
@@ -5,9 +5,9 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad qt4-qtruby-1.4.6~/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb qt4-qtruby-1.4.6/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb
---- qt4-qtruby-1.4.6~/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb	2006-10-11 00:41:54.000000000 +0200
-+++ qt4-qtruby-1.4.6/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb	2006-10-11 00:45:13.000000000 +0200
+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!(/[&*]$/, '')

Modified: packages-wip/libqt4-ruby/trunk/debian/rules
===================================================================
--- packages-wip/libqt4-ruby/trunk/debian/rules	2006-12-28 22:28:11 UTC (rev 1241)
+++ packages-wip/libqt4-ruby/trunk/debian/rules	2006-12-31 16:46:42 UTC (rev 1242)
@@ -13,6 +13,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# Include the uploader rule:
+include /usr/share/ruby-pkg-tools/1/rules/uploaders.mk
+
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
@@ -32,15 +35,17 @@
 
 config.status: patch-stamp 
 	dh_testdir
-	aclocal-1.7
+	aclocal
+	automake
 	./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 $@
+# 	cd qtruby/rubylib/qtruby; touch Makefile.am; make Makefile;
+# 	touch $@
 
 patch: patch-stamp
 
 patch-stamp:
 	dpatch apply-all
+	touch $@
 unpatch:
 	dpatch deapply-all
 	rm -rf patch-stamp debian/patched
@@ -59,7 +64,7 @@
 # Nothing for the build-indep part, for now.
 	touch $@
 
-clean:  clean-patched unpatch
+clean::  clean-patched unpatch
 
 clean-patched:
 	dh_testdir

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