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

fourmond at alioth.debian.org fourmond at alioth.debian.org
Fri Jun 29 11:11:07 UTC 2007 

Author: fourmond
Date: 2007-06-29 11:11:07 +0000 (Fri, 29 Jun 2007)
New Revision: 1737

Added:
   packages/libqt4-ruby/trunk/debian/libqt4-ruby1.8.install
   packages/libqt4-ruby/trunk/debian/libsmokeqt4-1.install
   packages/libqt4-ruby/trunk/debian/libsmokeqt4-dev.install
Modified:
   packages/libqt4-ruby/trunk/debian/control
   packages/libqt4-ruby/trunk/debian/patches/10-fix-ruby-install-path.dpatch
   packages/libqt4-ruby/trunk/debian/patches/97-soname.dpatch
   packages/libqt4-ruby/trunk/debian/rules
Log:
libqt4-ruby: finished the adaptation to the new build system - just a few more glitches, and it is ready for upload

Modified: packages/libqt4-ruby/trunk/debian/control
===================================================================
--- packages/libqt4-ruby/trunk/debian/control	2007-06-28 20:35:43 UTC (rev 1736)
+++ packages/libqt4-ruby/trunk/debian/control	2007-06-29 11:11:07 UTC (rev 1737)
@@ -33,7 +33,7 @@
  languages (ruby, python, perl...) can be based.
 
 Package: libsmokeqt4-dev
-Architecture: any
+Architecture: all
 Section: libdevel
 Depends: libsmokeqt4-1 (= ${binary:Version})
 Description: Smoke library for Qt4

Added: packages/libqt4-ruby/trunk/debian/libqt4-ruby1.8.install
===================================================================
--- packages/libqt4-ruby/trunk/debian/libqt4-ruby1.8.install	                        (rev 0)
+++ packages/libqt4-ruby/trunk/debian/libqt4-ruby1.8.install	2007-06-29 11:11:07 UTC (rev 1737)
@@ -0,0 +1,2 @@
+usr/bin
+usr/lib/ruby

Added: packages/libqt4-ruby/trunk/debian/libsmokeqt4-1.install
===================================================================
--- packages/libqt4-ruby/trunk/debian/libsmokeqt4-1.install	                        (rev 0)
+++ packages/libqt4-ruby/trunk/debian/libsmokeqt4-1.install	2007-06-29 11:11:07 UTC (rev 1737)
@@ -0,0 +1 @@
+usr/lib/libsmokeqt4.so.*
\ No newline at end of file

Added: packages/libqt4-ruby/trunk/debian/libsmokeqt4-dev.install
===================================================================
--- packages/libqt4-ruby/trunk/debian/libsmokeqt4-dev.install	                        (rev 0)
+++ packages/libqt4-ruby/trunk/debian/libsmokeqt4-dev.install	2007-06-29 11:11:07 UTC (rev 1737)
@@ -0,0 +1 @@
+usr/lib/*.so

Modified: packages/libqt4-ruby/trunk/debian/patches/10-fix-ruby-install-path.dpatch
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/10-fix-ruby-install-path.dpatch	2007-06-28 20:35:43 UTC (rev 1736)
+++ packages/libqt4-ruby/trunk/debian/patches/10-fix-ruby-install-path.dpatch	2007-06-29 11:11:07 UTC (rev 1737)
@@ -8,13 +8,13 @@
 @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
++++ libqt4-ruby-1.4.9/ruby/qtruby/rails_support/CMakeLists.txt	2007-06-29 12:07:21.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 )
++install( FILES active_item_model.rb  active_table_model.rb DESTINATION ${DESTDIR}/${RUBY_RUBY_LIB_PATH}/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
++++ libqt4-ruby-1.4.9/ruby/qtruby/src/CMakeLists.txt	2007-06-29 12:04:50.000000000 +0200
 @@ -31,7 +31,7 @@
  
  set_target_properties(qtruby4 PROPERTIES VERSION 0.0.0 SOVERSION 0 PREFIX "")
@@ -26,23 +26,23 @@
      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
++++ libqt4-ruby-1.4.9/ruby/qtruby/src/lib/CMakeLists.txt	2007-06-29 12:05:44.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} )
++install( FILES  Qt.rb Qt4.rb Qt3.rb DESTINATION ${DESTDIR}/${RUBY_RUBY_LIB_PATH} )
  
  #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
++++ libqt4-ruby-1.4.9/ruby/qtruby/src/lib/Qt/CMakeLists.txt	2007-06-29 12:07:54.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 )
++install( FILES  qtruby4.rb DESTINATION ${DESTDIR}/${RUBY_RUBY_LIB_PATH}/Qt )
  
  
  

Modified: packages/libqt4-ruby/trunk/debian/patches/97-soname.dpatch
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/97-soname.dpatch	2007-06-28 20:35:43 UTC (rev 1736)
+++ packages/libqt4-ruby/trunk/debian/patches/97-soname.dpatch	2007-06-29 11:11:07 UTC (rev 1737)
@@ -7,13 +7,13 @@
 @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
++++ libqt4-ruby-1.4.9/smoke/qt/CMakeLists.txt	2007-06-29 12:12:34.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 )
++set_target_properties(smokeqt PROPERTIES SOVERSION 1.3.0)
  
  install(TARGETS smokeqt DESTINATION ${CMAKE_INSTALL_PREFIX}/lib )
  

Modified: packages/libqt4-ruby/trunk/debian/rules
===================================================================
--- packages/libqt4-ruby/trunk/debian/rules	2007-06-28 20:35:43 UTC (rev 1736)
+++ packages/libqt4-ruby/trunk/debian/rules	2007-06-29 11:11:07 UTC (rev 1737)
@@ -96,7 +96,10 @@
 	# debian/<package>-doc.
 	#INSTALLDOC#
 
-	dh_install -i
+	dh_install -i --list-missing --sourcedir=debian/tmp 
+# Manually install the smoke.h header
+	mkdir -p debian/libsmokeqt4-dev/usr/include
+	cp smoke/smoke.h debian/libsmokeqt4-dev/usr/include
 
 install-arch:
 	dh_testdir
@@ -122,7 +125,7 @@
 # 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
+	dh_install -s --list-missing --sourcedir=debian/tmp 
 # 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