[DRE-commits] r1736 - in packages/libqt4-ruby/trunk/debian: . patches
fourmond at alioth.debian.org
fourmond at alioth.debian.org
Thu Jun 28 20:35:44 UTC 2007
Author: fourmond
Date: 2007-06-28 20:35:43 +0000 (Thu, 28 Jun 2007)
New Revision: 1736
Added:
packages/libqt4-ruby/trunk/debian/patches/10-fix-ruby-install-path.dpatch
packages/libqt4-ruby/trunk/debian/patches/97-soname.dpatch
Modified:
packages/libqt4-ruby/trunk/debian/changelog
packages/libqt4-ruby/trunk/debian/control
packages/libqt4-ruby/trunk/debian/patches/00list
packages/libqt4-ruby/trunk/debian/rules
Log:
First steps to adapt to the new upstream building system based on cmake -- still a lot of work left
Modified: packages/libqt4-ruby/trunk/debian/changelog
===================================================================
--- packages/libqt4-ruby/trunk/debian/changelog 2007-06-28 11:53:19 UTC (rev 1735)
+++ packages/libqt4-ruby/trunk/debian/changelog 2007-06-28 20:35:43 UTC (rev 1736)
@@ -1,8 +1,9 @@
-libqt4-ruby (1.4.7-5) UNRELEASED; urgency=low
+libqt4-ruby (1.4.9-1) UNRELEASED; urgency=low
* NOT RELEASED YET
+ *
- -- Vincent Fourmond <fourmond at debian.org> Thu, 28 Jun 2007 00:43:03 +0200
+ -- Vincent Fourmond <fourmond at debian.org> Thu, 28 Jun 2007 00:44:18 +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-28 11:53:19 UTC (rev 1735)
+++ packages/libqt4-ruby/trunk/debian/control 2007-06-28 20:35:43 UTC (rev 1736)
@@ -3,9 +3,8 @@
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
+Build-Depends: debhelper (>= 5), dpatch,
+ libqt4-dev (>= 4.3), ruby1.8-dev, ruby, ruby1.8, ruby-pkg-tools, cmake (> 2.4.6)
Standards-Version: 3.7.2
Package: libqt4-ruby
@@ -36,7 +35,7 @@
Package: libsmokeqt4-dev
Architecture: any
Section: libdevel
-Depends: libsmokeqt4-1 (= ${Source-Version})
+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.
Modified: packages/libqt4-ruby/trunk/debian/patches/00list
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/00list 2007-06-28 11:53:19 UTC (rev 1735)
+++ packages/libqt4-ruby/trunk/debian/patches/00list 2007-06-28 20:35:43 UTC (rev 1736)
@@ -1,9 +1,10 @@
-01-fix-rpath
-02-qtruby-makefile
+# 01-fix-rpath
+# 02-qtruby-makefile
+10-fix-ruby-install-path
# 10-kalyptus
-15-fix-install
-20-visibility
-30-qt_enum
-31-constants-warning
-98-soname
+# 15-fix-install
+# 20-visibility
+# 30-qt_enum
+# 31-constants-warning
+97-soname
99-smoke-qt4
Added: packages/libqt4-ruby/trunk/debian/patches/10-fix-ruby-install-path.dpatch
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/10-fix-ruby-install-path.dpatch (rev 0)
+++ packages/libqt4-ruby/trunk/debian/patches/10-fix-ruby-install-path.dpatch 2007-06-28 20:35:43 UTC (rev 1736)
@@ -0,0 +1,48 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10-fix-ruby-install-path.dpatch by <fourmond at debian.org>
+##
+## DP: cmake ruby detection seems unable to cope with nonstandard
+## DP: installation path. It is therefore necessary to modify the
+## DP: CMakeLists.txt
+
+ at DPATCH@
+diff -urNad libqt4-ruby-1.4.9~/ruby/qtruby/rails_support/CMakeLists.txt libqt4-ruby-1.4.9/ruby/qtruby/rails_support/CMakeLists.txt
+--- libqt4-ruby-1.4.9~/ruby/qtruby/rails_support/CMakeLists.txt 2007-04-17 17:22:55.000000000 +0200
++++ libqt4-ruby-1.4.9/ruby/qtruby/rails_support/CMakeLists.txt 2007-06-28 22:26:54.000000000 +0200
+@@ -1 +1 @@
+-install( FILES active_item_model.rb active_table_model.rb DESTINATION ${RUBY_SITE_LIB_DIR}/Qt )
++install( FILES active_item_model.rb active_table_model.rb DESTINATION ${DESTDIR}/${RUBY_LIB_DIR}/Qt )
+diff -urNad libqt4-ruby-1.4.9~/ruby/qtruby/src/CMakeLists.txt libqt4-ruby-1.4.9/ruby/qtruby/src/CMakeLists.txt
+--- libqt4-ruby-1.4.9~/ruby/qtruby/src/CMakeLists.txt 2007-04-20 13:02:49.000000000 +0200
++++ libqt4-ruby-1.4.9/ruby/qtruby/src/CMakeLists.txt 2007-06-28 22:26:09.000000000 +0200
+@@ -31,7 +31,7 @@
+
+ set_target_properties(qtruby4 PROPERTIES VERSION 0.0.0 SOVERSION 0 PREFIX "")
+
+-install(TARGETS qtruby4 DESTINATION ${RUBY_SITE_ARCH_DIR} )
++install(TARGETS qtruby4 DESTINATION ${DESTDIR}/${RUBY_ARCH_DIR} )
+
+ if (Q_WS_MAC)
+ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${RUBY_SITE_ARCH_DIR}/qtruby4.so\" \"${RUBY_SITE_ARCH_DIR}/qtruby4.bundle\" )" )
+diff -urNad libqt4-ruby-1.4.9~/ruby/qtruby/src/lib/CMakeLists.txt libqt4-ruby-1.4.9/ruby/qtruby/src/lib/CMakeLists.txt
+--- libqt4-ruby-1.4.9~/ruby/qtruby/src/lib/CMakeLists.txt 2007-04-12 19:04:54.000000000 +0200
++++ libqt4-ruby-1.4.9/ruby/qtruby/src/lib/CMakeLists.txt 2007-06-28 22:26:09.000000000 +0200
+@@ -1,7 +1,7 @@
+
+ add_subdirectory( Qt )
+
+-install( FILES Qt.rb Qt4.rb Qt3.rb DESTINATION ${RUBY_SITE_LIB_DIR} )
++install( FILES Qt.rb Qt4.rb Qt3.rb DESTINATION ${DESTDIR}/${RUBY_LIB_DIR} )
+
+ #original Makefile.am contents follow:
+
+diff -urNad libqt4-ruby-1.4.9~/ruby/qtruby/src/lib/Qt/CMakeLists.txt libqt4-ruby-1.4.9/ruby/qtruby/src/lib/Qt/CMakeLists.txt
+--- libqt4-ruby-1.4.9~/ruby/qtruby/src/lib/Qt/CMakeLists.txt 2007-04-12 19:04:54.000000000 +0200
++++ libqt4-ruby-1.4.9/ruby/qtruby/src/lib/Qt/CMakeLists.txt 2007-06-28 22:26:09.000000000 +0200
+@@ -1,5 +1,5 @@
+
+-install( FILES qtruby4.rb DESTINATION ${RUBY_SITE_LIB_DIR}/Qt )
++install( FILES qtruby4.rb DESTINATION ${DESTDIR}/${RUBY_LIB_DIR}/Qt )
+
+
+
Property changes on: packages/libqt4-ruby/trunk/debian/patches/10-fix-ruby-install-path.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: packages/libqt4-ruby/trunk/debian/patches/97-soname.dpatch
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/97-soname.dpatch (rev 0)
+++ packages/libqt4-ruby/trunk/debian/patches/97-soname.dpatch 2007-06-28 20:35:43 UTC (rev 1736)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 97-soname.dpatch by <fourmond at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad libqt4-ruby-1.4.9~/smoke/qt/CMakeLists.txt libqt4-ruby-1.4.9/smoke/qt/CMakeLists.txt
+--- libqt4-ruby-1.4.9~/smoke/qt/CMakeLists.txt 2007-06-20 13:14:26.000000000 +0200
++++ libqt4-ruby-1.4.9/smoke/qt/CMakeLists.txt 2007-06-28 00:59:20.000000000 +0200
+@@ -123,7 +123,7 @@
+ ${QSCINTILLA_LIBRARIES}
+ ${Qwt5_Qt4_LIBRARY} )
+
+-set_target_properties(smokeqt PROPERTIES VERSION 2.0.0 SOVERSION 2 )
++set_target_properties(smokeqt PROPERTIES VERSION 2.0.0 SOVERSION 1 )
+
+ install(TARGETS smokeqt DESTINATION ${CMAKE_INSTALL_PREFIX}/lib )
+
Property changes on: packages/libqt4-ruby/trunk/debian/patches/97-soname.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/libqt4-ruby/trunk/debian/rules
===================================================================
--- packages/libqt4-ruby/trunk/debian/rules 2007-06-28 11:53:19 UTC (rev 1735)
+++ packages/libqt4-ruby/trunk/debian/rules 2007-06-28 20:35:43 UTC (rev 1736)
@@ -24,8 +24,12 @@
# 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']"`
+RUBY_ARCHDIR=`ruby -r rbconfig -e "puts Config::CONFIG['archdir']"`
+RUBY_LIBDIR=`ruby -r rbconfig -e "puts Config::CONFIG['rubylibdir']"`
+CMAKE_DEFS=-DCMAKE_INSTALL_PREFIX=$(CURDIR)/debian/tmp/usr \
+ -DDESTDIR:PATH=$(CURDIR)/debian/tmp
+
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -36,13 +40,10 @@
config.status: patch-stamp
dh_testdir
- aclocal-1.7
- automake-1.7
-# libtoolize -f
- autoconf
- ./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"
+# ./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 $@
+ cmake $(CMAKE_DEFS) .
patch: patch-stamp
@@ -59,8 +60,8 @@
build-arch: build-arch-stamp
build-arch-stamp: config.status
$(MAKE)
- cd qtruby/rubylib/designer/rbrcc; $(MAKE)
- cd qtruby/rubylib/designer/rbuic; $(MAKE)
+# cd qtruby/rubylib/designer/rbrcc; $(MAKE)
+# cd qtruby/rubylib/designer/rbuic; $(MAKE)
touch $@
build-indep: build-indep-stamp
@@ -103,23 +104,24 @@
dh_clean -k -s
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
+# 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.*
+# 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
+# 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; mv qtrubyinit qt4rubyinit
- cd $(CURDIR)/debian/libqt4-ruby1.8/$(ARCHDIR); rm *.la *.so *.so.0; mv *.so.* qtruby4.so
+# 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
# 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