[Pkg-cairo-dock-devel] Bug#745926: cairo-dock-plug-ins: diff for NMU version 3.3.2-3.1

[Christian Hofstaedtler]

tags 745926 + patch
tags 745926 + pending
thanks

Dear maintainer,

I've prepared an NMU for cairo-dock-plug-ins (versioned as 3.3.2-3.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Regards.
diff -Nru cairo-dock-plug-ins-3.3.2/debian/changelog cairo-dock-plug-ins-3.3.2/debian/changelog
--- cairo-dock-plug-ins-3.3.2/debian/changelog	2013-11-18 06:25:15.000000000 +0100
+++ cairo-dock-plug-ins-3.3.2/debian/changelog	2014-04-26 17:57:23.000000000 +0200
@@ -1,3 +1,11 @@
+cairo-dock-plug-ins (3.3.2-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Build for the default Ruby version, instead of hardcoding any.
+     (Closes: #745926)
+
+ -- Christian Hofstaedtler <zeha at debian.org>  Sat, 26 Apr 2014 17:56:53 +0200
+
 cairo-dock-plug-ins (3.3.2-3) unstable; urgency=low
 
   * Update debian/rules.
diff -Nru cairo-dock-plug-ins-3.3.2/debian/control cairo-dock-plug-ins-3.3.2/debian/control
--- cairo-dock-plug-ins-3.3.2/debian/control	2013-11-18 00:18:42.000000000 +0100
+++ cairo-dock-plug-ins-3.3.2/debian/control	2014-04-26 17:52:42.000000000 +0200
@@ -43,8 +43,8 @@
  mono-gmcs [amd64 armel i386 kfreebsd-any powerpc s390x],
  python,
  python3,
- ruby1.9.1,
- ruby1.9.1-dev,
+ ruby,
+ ruby-dev,
  valac,
  x11proto-xf86vidmode-dev
 Standards-Version: 3.9.4
diff -Nru cairo-dock-plug-ins-3.3.2/debian/patches/ruby-vendor-dir.patch cairo-dock-plug-ins-3.3.2/debian/patches/ruby-vendor-dir.patch
--- cairo-dock-plug-ins-3.3.2/debian/patches/ruby-vendor-dir.patch	1970-01-01 01:00:00.000000000 +0100
+++ cairo-dock-plug-ins-3.3.2/debian/patches/ruby-vendor-dir.patch	2014-04-26 18:06:23.000000000 +0200
@@ -0,0 +1,24 @@
+Index: cairo-dock-plug-ins-3.3.2/CMakeLists.txt
+===================================================================
+--- cairo-dock-plug-ins-3.3.2.orig/CMakeLists.txt	2013-10-29 11:27:30.000000000 +0100
++++ cairo-dock-plug-ins-3.3.2/CMakeLists.txt	2014-04-26 18:06:15.528495946 +0200
+@@ -533,7 +533,7 @@ if (enable-ruby-interface)
+ 	message (STATUS " * Ruby:")
+ 	# find_package(Ruby) found libs of ruby-dev but we only need a directory where we can install ruby libs.
+ 	find_program (RUBY_EXECUTABLE ruby)
+-	EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubylibdir']"
++	EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['vendordir']"
+ 		OUTPUT_VARIABLE RUBY_LIB_DIR)
+ 	message (STATUS "   Ruby library dir: ${RUBY_LIB_DIR}")
+ 	if ("${RUBY_LIB_DIR}" STREQUAL "" OR "${RUBY_LIB_DIR}" STREQUAL "nil")
+@@ -542,10 +542,6 @@ if (enable-ruby-interface)
+ 		set (PROGRAMS_MISSING "${PROGRAMS_MISSING} ruby")
+ 		set (with_ruby no)
+ 	else()
+-		# /usr/lib/ruby/1.8 or /usr/lib/ruby/1.9.1
+-		string (REGEX REPLACE "lib/ruby/[0-9].[0-9]?.+" "" RUBY_LIB_DIR_INSTALL "${RUBY_LIB_DIR}")
+-		string (REGEX REPLACE "${RUBY_LIB_DIR_INSTALL}" "" RUBY_LIB_DIR_INSTALL "${RUBY_LIB_DIR}")
+-		set (RUBY_LIB_DIR "${CMAKE_INSTALL_PREFIX}/${RUBY_LIB_DIR_INSTALL}")
+ 		message (STATUS "   will be installed in: ${RUBY_LIB_DIR}")
+ 		set (RUBY_FOUND "TRUE")
+ 		set (with_ruby yes)
diff -Nru cairo-dock-plug-ins-3.3.2/debian/patches/series cairo-dock-plug-ins-3.3.2/debian/patches/series
--- cairo-dock-plug-ins-3.3.2/debian/patches/series	2013-10-25 18:25:39.000000000 +0200
+++ cairo-dock-plug-ins-3.3.2/debian/patches/series	2014-04-26 17:55:04.000000000 +0200
@@ -1,2 +1,3 @@
 0001-Fix-typo-about-SystemMonitor-Mail-dnd2share-Stack-GV.patch
 0001-Fix-MATCH-as-FreeBSD.patch
+ruby-vendor-dir.patch
diff -Nru cairo-dock-plug-ins-3.3.2/debian/rules cairo-dock-plug-ins-3.3.2/debian/rules
--- cairo-dock-plug-ins-3.3.2/debian/rules	2013-11-18 06:24:47.000000000 +0100
+++ cairo-dock-plug-ins-3.3.2/debian/rules	2014-04-26 17:56:50.000000000 +0200
@@ -20,10 +20,6 @@
 CLI_ARCH=zamd64z zarmelz zi386z zkfreebsd-i386z \
 		 zkfreebsd-amd64z zpowerpcz zs390xz
 
-install/ruby-cdapplet::
-	install -m 644 -D debian/tmp/usr/lib/ruby/1.9.1/CDApplet.rb \
-		debian/tmp/usr/lib/ruby/vendor_ruby/1.9.1/CDApplet.rb
-
 common-binary-predeb-arch::
 ifneq (,$(findstring z$(DEB_HOST_ARCH)z, $(CLI_ARCH)))
 	dh_clifixperms