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

fourmond at alioth.debian.org fourmond at alioth.debian.org
Wed Jul 25 14:17:21 UTC 2007


Author: fourmond
Date: 2007-07-25 14:17:20 +0000 (Wed, 25 Jul 2007)
New Revision: 1796

Added:
   packages/libqt4-ruby/trunk/debian/libqt4-ruby1.8.examples
   packages/libqt4-ruby/trunk/debian/patches/25-fix-hppa-build.dpatch
Modified:
   packages/libqt4-ruby/trunk/debian/changelog
   packages/libqt4-ruby/trunk/debian/control
   packages/libqt4-ruby/trunk/debian/patches/10-fix-ruby-install-path.dpatch
   packages/libqt4-ruby/trunk/debian/patches/99-smoke-qt4.dpatch
   packages/libqt4-ruby/trunk/debian/rules
Log:
Fix serious problem with recent cmake

Modified: packages/libqt4-ruby/trunk/debian/changelog
===================================================================
--- packages/libqt4-ruby/trunk/debian/changelog	2007-07-24 23:51:47 UTC (rev 1795)
+++ packages/libqt4-ruby/trunk/debian/changelog	2007-07-25 14:17:20 UTC (rev 1796)
@@ -1,8 +1,12 @@
-libqt4-ruby (1.4.9-4) UNRELEASED; urgency=low
+libqt4-ruby (1.4.9-4) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Tweaked the CMakeLists.txt for recent cmake, as the latter
+    simply forgets to install the binary library in certain cases...
+    (Closes: #434633)
+  * Removed build-dep on ruby-pkg-tools, as I really don't use them.
+  * Disabled the dirty workaround for HPPA, as it does not work
 
- -- Vincent Fourmond <fourmond at debian.org>  Wed, 25 Jul 2007 01:51:30 +0200
+ -- Vincent Fourmond <fourmond at debian.org>  Wed, 25 Jul 2007 16:10:34 +0200
 
 libqt4-ruby (1.4.9-3) unstable; urgency=low
 

Modified: packages/libqt4-ruby/trunk/debian/control
===================================================================
--- packages/libqt4-ruby/trunk/debian/control	2007-07-24 23:51:47 UTC (rev 1795)
+++ packages/libqt4-ruby/trunk/debian/control	2007-07-25 14:17:20 UTC (rev 1796)
@@ -4,7 +4,7 @@
 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), dpatch,
- libqt4-dev (>= 4.3), ruby1.8-dev, ruby, ruby1.8, ruby-pkg-tools, cmake (> 2.4.6)
+ libqt4-dev (>= 4.3), ruby1.8-dev, ruby, ruby1.8, cmake (> 2.4.7)
 Standards-Version: 3.7.2
 
 Package: libqt4-ruby

Added: packages/libqt4-ruby/trunk/debian/libqt4-ruby1.8.examples
===================================================================
--- packages/libqt4-ruby/trunk/debian/libqt4-ruby1.8.examples	                        (rev 0)
+++ packages/libqt4-ruby/trunk/debian/libqt4-ruby1.8.examples	2007-07-25 14:17:20 UTC (rev 1796)
@@ -0,0 +1 @@
+# ruby/qtruby/examples/*

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-07-24 23:51:47 UTC (rev 1795)
+++ packages/libqt4-ruby/trunk/debian/patches/10-fix-ruby-install-path.dpatch	2007-07-25 14:17:20 UTC (rev 1796)
@@ -8,16 +8,19 @@
 @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-29 12:07:21.000000000 +0200
++++ libqt4-ruby-1.4.9/ruby/qtruby/rails_support/CMakeLists.txt	2007-07-25 15:58:42.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_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-29 12:04:50.000000000 +0200
-@@ -31,7 +31,7 @@
++++ libqt4-ruby-1.4.9/ruby/qtruby/src/CMakeLists.txt	2007-07-25 15:59:07.000000000 +0200
+@@ -29,9 +29,9 @@
+ add_library(qtrubyinternal STATIC ${qtruby_LIB_SRCS})
+ target_link_libraries(qtrubyinternal ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} ${QT_QTNETWORK_LIBRARY} smokekde)
  
- set_target_properties(qtruby4 PROPERTIES VERSION 0.0.0 SOVERSION 0 PREFIX "")
+-set_target_properties(qtruby4 PROPERTIES VERSION 0.0.0 SOVERSION 0 PREFIX "")
++set_target_properties(qtruby4 PROPERTIES PREFIX "")
  
 -install(TARGETS qtruby4  DESTINATION ${RUBY_SITE_ARCH_DIR} )
 +install(TARGETS qtruby4  DESTINATION ${DESTDIR}/${RUBY_ARCH_DIR} )
@@ -26,7 +29,7 @@
      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-29 12:05:44.000000000 +0200
++++ libqt4-ruby-1.4.9/ruby/qtruby/src/lib/CMakeLists.txt	2007-07-25 15:58:42.000000000 +0200
 @@ -1,7 +1,7 @@
  
  add_subdirectory( Qt )
@@ -38,7 +41,7 @@
  
 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-29 12:07:54.000000000 +0200
++++ libqt4-ruby-1.4.9/ruby/qtruby/src/lib/Qt/CMakeLists.txt	2007-07-25 15:58:42.000000000 +0200
 @@ -1,5 +1,5 @@
  
 -install( FILES  qtruby4.rb DESTINATION ${RUBY_SITE_LIB_DIR}/Qt )

Added: packages/libqt4-ruby/trunk/debian/patches/25-fix-hppa-build.dpatch
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/25-fix-hppa-build.dpatch	                        (rev 0)
+++ packages/libqt4-ruby/trunk/debian/patches/25-fix-hppa-build.dpatch	2007-07-25 14:17:20 UTC (rev 1796)
@@ -0,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 25-fix-hppa-build.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~/CMakeLists.txt libqt4-ruby-1.4.9/CMakeLists.txt
+--- libqt4-ruby-1.4.9~/CMakeLists.txt	2007-06-19 15:25:37.000000000 +0200
++++ libqt4-ruby-1.4.9/CMakeLists.txt	2007-07-25 15:12:06.000000000 +0200
+@@ -18,9 +18,16 @@
+ FIND_PACKAGE(Perl REQUIRED)
+ FIND_PACKAGE (Qt4 REQUIRED)
+ 
++EXECUTE_PROCESS(COMMAND uname -m OUTPUT_VARIABLE ARCH)
++
+ add_definitions (${QT_DEFINITIONS}  -DHAVE_CONFIG_H=1)
++IF(ARCH MATCHES parisc)
++  ADD_DEFINITIONS(-ffunction-sections)
++ENDIF(ARCH MATCHES parisc)
+ include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${QT_INCLUDES} )
+ 
++
++
+ FIND_PACKAGE (RUBY REQUIRED)
+ FIND_PACKAGE (OpenGL REQUIRED)
+ 


Property changes on: packages/libqt4-ruby/trunk/debian/patches/25-fix-hppa-build.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: packages/libqt4-ruby/trunk/debian/patches/99-smoke-qt4.dpatch
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/99-smoke-qt4.dpatch	2007-07-24 23:51:47 UTC (rev 1795)
+++ packages/libqt4-ruby/trunk/debian/patches/99-smoke-qt4.dpatch	2007-07-25 14:17:20 UTC (rev 1796)
@@ -2,11 +2,17 @@
 
 case "$1" in 
     "-patch")
-	find . '!' -regex '.*debian.*' -a -type f -exec perl -pi -e "s/smokeqt4?/smokeqt4/g" '{}' \;
+	find . '!' -regex '.*debian.*' \
+	    -a '!' -regex '.*(cpp|pm|pl|png)$' \
+	    -a '!' -regex '.*examples*' \
+	    -a -type f -exec perl -pi -e "s/smokeqt4?/smokeqt4/g" '{}' \;
 	;;
     "-unpatch")
-	find . '!' -regex '.*debian.*' -a -type f -exec perl -pi -e "s/smokeqt4?/smokeqt/g" '{}' \;
+	find . '!' -regex '.*debian.*' \
+	    -a '!' -regex '.*(cpp|pm|pl|png)$' \
+	    -a '!' -regex '.*examples*' \
+	    -a -type f -exec perl -pi -e "s/smokeqt4?/smokeqt/g" '{}' \;
 	;;
     *)
 	;;
-esac
\ No newline at end of file
+esac

Modified: packages/libqt4-ruby/trunk/debian/rules
===================================================================
--- packages/libqt4-ruby/trunk/debian/rules	2007-07-24 23:51:47 UTC (rev 1795)
+++ packages/libqt4-ruby/trunk/debian/rules	2007-07-25 14:17:20 UTC (rev 1796)
@@ -60,7 +60,8 @@
 build-arch: build-arch-stamp
 build-arch-stamp:  config.status
 # The following is a dirty fix for a bug with cmake on HPPA
-	$(MAKE) || $(MAKE)
+	$(MAKE) # || $(MAKE)
+# disabled, as it does not work more anyway.
 #	cd qtruby/rubylib/designer/rbrcc; $(MAKE)
 #	cd qtruby/rubylib/designer/rbuic; $(MAKE)
 	touch $@
@@ -124,7 +125,7 @@
 	dh_testroot
 	dh_installchangelogs ChangeLog
 	dh_installdocs
-	dh_installexamples
+#	dh_installexamples
 	dh_installman
 	dh_link
 	dh_strip




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