[DRE-commits] [sup-mail] 01/03: Do not install xapian from source

[zeha at debian.org]

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

zeha pushed a commit to branch master
in repository sup-mail.

commit 63fa5fa8be0b1ac61f6e195f83dd926de7d6146e
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Thu Jul 7 16:23:29 2016 +0200

    Do not install xapian from source
    
    Closes: #816486
---
 .../0002-Do-not-install-xapian-from-source.patch   | 28 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 29 insertions(+)

diff --git a/debian/patches/0002-Do-not-install-xapian-from-source.patch b/debian/patches/0002-Do-not-install-xapian-from-source.patch
new file mode 100644
index 0000000..b53e0e1
--- /dev/null
+++ b/debian/patches/0002-Do-not-install-xapian-from-source.patch
@@ -0,0 +1,28 @@
+From: Christian Hofstaedtler <zeha at debian.org>
+Date: Thu, 7 Jul 2016 16:23:03 +0200
+Subject: Do not install xapian from source
+
+---
+ sup.gemspec | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/sup.gemspec b/sup.gemspec
+index b514d36..feb1e63 100644
+--- a/sup.gemspec
++++ b/sup.gemspec
+@@ -40,15 +40,6 @@ SUP: please note that our old mailing lists have been shut down,
+ 
+   s.required_ruby_version = '>= 2.0.0'
+ 
+-  # this is here to support skipping the xapian-ruby installation on OpenBSD
+-  # because the xapian-ruby gem doesn't install on OpenBSD, you must install
+-  # xapian-core and xapian-bindings manually on OpenBSD
+-  # see https://github.com/sup-heliotrope/sup/wiki/Installation%3A-OpenBSD
+-  # and https://en.wikibooks.org/wiki/Ruby_Programming/RubyGems#How_to_install_different_versions_of_gems_depending_on_which_version_of_ruby_the_installee_is_using
+-  s.extensions = %w[ext/mkrf_conf_xapian.rb]
+-
+-  ## remember to update the xapian dependency in
+-  ## ext/mkrf_conf_xapian.rb and Gemfile.
+ 
+   s.add_runtime_dependency "ncursesw", "~> 1.4.0"
+   s.add_runtime_dependency "rmail-sup", "~> 1.0.1"
diff --git a/debian/patches/series b/debian/patches/series
index 777fe35..b1e1cb6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Use-Debianized-sup-mail-command-in-Bash-completion.patch
+0002-Do-not-install-xapian-from-source.patch

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