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

Vincent Fourmond fourmond-guest at alioth.debian.org
Mon Jan 1 18:46:32 CET 2007 

Author: fourmond-guest
Date: 2007-01-01 18:46:32 +0100 (Mon, 01 Jan 2007)
New Revision: 1243

Added:
   packages-wip/libqt4-ruby/trunk/debian/NEWS
   packages-wip/libqt4-ruby/trunk/debian/Qt.rb
   packages-wip/libqt4-ruby/trunk/debian/libqt4-ruby1.8.links
   packages-wip/libqt4-ruby/trunk/debian/patches/98-soname.dpatch
Modified:
   packages-wip/libqt4-ruby/trunk/debian/changelog
   packages-wip/libqt4-ruby/trunk/debian/control
   packages-wip/libqt4-ruby/trunk/debian/control.in
   packages-wip/libqt4-ruby/trunk/debian/patches/00list
   packages-wip/libqt4-ruby/trunk/debian/patches/15-fix-install.dpatch
   packages-wip/libqt4-ruby/trunk/debian/rules
Log:
libqt4-ruby: Packaging is finished, only rpath lintian warnings left.

Added: packages-wip/libqt4-ruby/trunk/debian/NEWS
===================================================================
--- packages-wip/libqt4-ruby/trunk/debian/NEWS	2006-12-31 16:46:42 UTC (rev 1242)
+++ packages-wip/libqt4-ruby/trunk/debian/NEWS	2007-01-01 17:46:32 UTC (rev 1243)
@@ -0,0 +1,7 @@
+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.
+
+ -- Vincent Fourmond <vincent.fourmond at 9online.fr>  Mon,  1 Jan 2007 18:21:58 +0100

Added: packages-wip/libqt4-ruby/trunk/debian/Qt.rb
===================================================================
--- packages-wip/libqt4-ruby/trunk/debian/Qt.rb	2006-12-31 16:46:42 UTC (rev 1242)
+++ packages-wip/libqt4-ruby/trunk/debian/Qt.rb	2007-01-01 17:46:32 UTC (rev 1243)
@@ -0,0 +1,5 @@
+# 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-wip/libqt4-ruby/trunk/debian/changelog
===================================================================
--- packages-wip/libqt4-ruby/trunk/debian/changelog	2006-12-31 16:46:42 UTC (rev 1242)
+++ packages-wip/libqt4-ruby/trunk/debian/changelog	2007-01-01 17:46:32 UTC (rev 1243)
@@ -7,8 +7,10 @@
   * 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)
 
- -- Vincent Fourmond <vincent.fourmond at 9online.fr>  Sun, 31 Dec 2006 17:44:19 +0100
+ -- Vincent Fourmond <vincent.fourmond at 9online.fr>  Mon,  1 Jan 2007 18:16:49 +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-31 16:46:42 UTC (rev 1242)
+++ packages-wip/libqt4-ruby/trunk/debian/control	2007-01-01 17:46:32 UTC (rev 1243)
@@ -29,7 +29,17 @@
 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
+Description: Smoke library for Qt4
+ This is the Smoke library for Qt4, on which bindings for different
  languages (ruby, python, perl...) can be based.
 
+Package: libsmokeqt4-dev
+Architecture: any
+Section: libdevel
+Depends: libsmokeqt4-1 (= ${Source-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. 
+ .
+ This package contains files needed for development with the
+ Smoke Qt4 library.

Modified: packages-wip/libqt4-ruby/trunk/debian/control.in
===================================================================
--- packages-wip/libqt4-ruby/trunk/debian/control.in	2006-12-31 16:46:42 UTC (rev 1242)
+++ packages-wip/libqt4-ruby/trunk/debian/control.in	2007-01-01 17:46:32 UTC (rev 1243)
@@ -34,3 +34,13 @@
  This is the smoke library for Qt4, on which bindings for different
  languages (ruby, python, perl...) can be based.
 
+Package: libsmokeqt4-dev
+Architecture: any
+Section: libdevel
+Depends: libsmokeqt4-1 (= ${Source-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. 
+ .
+ This package contains files needed for development with the
+ Smoke Qt4 library.

Added: packages-wip/libqt4-ruby/trunk/debian/libqt4-ruby1.8.links
===================================================================
--- packages-wip/libqt4-ruby/trunk/debian/libqt4-ruby1.8.links	2006-12-31 16:46:42 UTC (rev 1242)
+++ packages-wip/libqt4-ruby/trunk/debian/libqt4-ruby1.8.links	2007-01-01 17:46:32 UTC (rev 1243)
@@ -0,0 +1 @@
+usr/share/man/man1/rbqtapi.1.gz usr/share/man/man1/rbqt4api.1.gz

Modified: packages-wip/libqt4-ruby/trunk/debian/patches/00list
===================================================================
--- packages-wip/libqt4-ruby/trunk/debian/patches/00list	2006-12-31 16:46:42 UTC (rev 1242)
+++ packages-wip/libqt4-ruby/trunk/debian/patches/00list	2007-01-01 17:46:32 UTC (rev 1243)
@@ -3,4 +3,5 @@
 15-fix-install
 20-visibility
 30-qt_enum
+98-soname
 99-smoke-qt4

Modified: packages-wip/libqt4-ruby/trunk/debian/patches/15-fix-install.dpatch
===================================================================
--- packages-wip/libqt4-ruby/trunk/debian/patches/15-fix-install.dpatch	2006-12-31 16:46:42 UTC (rev 1242)
+++ packages-wip/libqt4-ruby/trunk/debian/patches/15-fix-install.dpatch	2007-01-01 17:46:32 UTC (rev 1243)
@@ -5,9 +5,23 @@
 ## DP: Remove the symlink stuff, as it make the installation fail miserably
 
 @DPATCH@
+diff -urNad libqt4-ruby-1.4.7~/qtruby/bin/Makefile.am libqt4-ruby-1.4.7/qtruby/bin/Makefile.am
+--- libqt4-ruby-1.4.7~/qtruby/bin/Makefile.am	2006-10-30 17:52:46.000000000 +0100
++++ libqt4-ruby-1.4.7/qtruby/bin/Makefile.am	2007-01-01 17:19:00.000000000 +0100
+@@ -9,8 +9,8 @@
+ bin_SCRIPTS = rbqtapi rbqtsh
+ 
+ install-exec-local:
+-	@-rm -f $(DESTDIR)$(bindir)/rbqt3api
+-	@$(LN_S) rbqtapi $(DESTDIR)$(bindir)/rbqt3api
++#  	@-rm -f $(DESTDIR)$(bindir)/rbqt3api
++# 	@$(LN_S) rbqtapi $(DESTDIR)$(bindir)/rbqt3api
+ 	@-rm -f $(DESTDIR)$(bindir)/rbqt4api
+ 	@$(LN_S) rbqtapi $(DESTDIR)$(bindir)/rbqt4api
+ 
 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
++++ libqt4-ruby-1.4.7/qtruby/rubylib/qtruby/lib/Makefile.am	2007-01-01 17:17:54.000000000 +0100
 @@ -4,6 +4,4 @@
  rubylib_DATA = Qt4.rb Qt3.rb
  

Added: packages-wip/libqt4-ruby/trunk/debian/patches/98-soname.dpatch
===================================================================
--- packages-wip/libqt4-ruby/trunk/debian/patches/98-soname.dpatch	2006-12-31 16:46:42 UTC (rev 1242)
+++ packages-wip/libqt4-ruby/trunk/debian/patches/98-soname.dpatch	2007-01-01 17:46:32 UTC (rev 1243)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 98-soname.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~/smoke/qt/Makefile.am libqt4-ruby-1.4.7/smoke/qt/Makefile.am
+--- libqt4-ruby-1.4.7~/smoke/qt/Makefile.am	2006-10-30 17:53:20.000000000 +0100
++++ libqt4-ruby-1.4.7/smoke/qt/Makefile.am	2007-01-01 13:17:31.000000000 +0100
+@@ -7,7 +7,7 @@
+ EXTRA_DIST=generate.pl.in qtguess.pl.in qt_smoke.h Makefile.am
+ 
+ # the library search path. 
+-libsmokeqt_la_LDFLAGS = -version-info 2:0:0 -no-undefined $(all_libraries) $(GLINC)
++libsmokeqt_la_LDFLAGS = -version-info 3:4:2 -no-undefined $(all_libraries) $(GLINC)
+ 
+ # the libraries to link against.
+ libsmokeqt_la_LIBADD   = $(LIB_QTCORE) $(LIB_QTGUI) $(LIB_QTNETWORK) \


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

Modified: packages-wip/libqt4-ruby/trunk/debian/rules
===================================================================
--- packages-wip/libqt4-ruby/trunk/debian/rules	2006-12-31 16:46:42 UTC (rev 1242)
+++ packages-wip/libqt4-ruby/trunk/debian/rules	2007-01-01 17:46:32 UTC (rev 1243)
@@ -23,8 +23,8 @@
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ARCHDIR=`ruby -r rbconfig -e "puts Config::CONFIG['archdir']"` 
 
-
 CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -99,13 +99,21 @@
 	dh_installdirs -s
 
 # First, install smoke:
-	cd smoke; $(MAKE) install DESTDIR=$(CURDIR)/debian/libsmokeqt4-1
+	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
-# Remove rbqtsh as is fails for now
+# 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

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