[DRE-commits] [ruby-passenger] 01/02: Don't build the embedded jsoncpp source as it's not actually used.

[Felix Geyer]

This is an automated email from the git hooks/post-receive script.

fgeyer pushed a commit to branch master
in repository ruby-passenger.

commit 57f61ea3fedb8c57ad1070367b34e1cb2329aff2
Author: Felix Geyer <fgeyer at debian.org>
Date:   Tue Aug 6 23:08:26 2013 +0200

    Don't build the embedded jsoncpp source as it's not actually used.
---
 debian/changelog                |    2 ++
 debian/patches/no_jsoncpp.patch |   19 +++++++++++++++++++
 debian/patches/series           |    1 +
 3 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 916a23d..e1b3a24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ ruby-passenger (4.0.10-1) UNRELEASED; urgency=low
   * Fix the watch file.
   * Use dh-autoreconf.
   * Bump Standards-Version to 3.9.4, no changes needed.
+  * Don't build the embedded jsoncpp source as it's not actually used.
+    - Add no_jsoncpp.patch.
 
  -- Felix Geyer <fgeyer at debian.org>  Mon, 05 Aug 2013 20:31:08 +0200
 
diff --git a/debian/patches/no_jsoncpp.patch b/debian/patches/no_jsoncpp.patch
new file mode 100644
index 0000000..952be12
--- /dev/null
+++ b/debian/patches/no_jsoncpp.patch
@@ -0,0 +1,19 @@
+Description: Remove embedded jsoncpp, only used in tests that aren't built.
+Author: Felix Geyer <fgeyer at debian.org>
+
+--- ruby-passenger-4.0.10.orig/lib/phusion_passenger/common_library.rb
++++ ruby-passenger-4.0.10/lib/phusion_passenger/common_library.rb
+@@ -431,13 +431,6 @@ COMMON_LIBRARY = CommonLibraryBuilder.ne
+ 			Utils/fib.h
+ 			Utils/fibpriv.h
+ 		)
+-	define_component 'Utils/jsoncpp.o',
+-		:source   => 'Utils/jsoncpp.cpp',
+-		:category => :other,
+-		:deps     => %w(
+-			Utils/json.h
+-			Utils/json-forwards.h
+-		)
+ 
+ 	#'BCrypt.o' => %w(
+ 	#	BCrypt.cpp
diff --git a/debian/patches/series b/debian/patches/series
index 7a4b3dc..98027a8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix_install_path.patch
+no_jsoncpp.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-passenger.git