[DRE-commits] [SCM] ruby-sphinx.git branch, master, updated. upstream/0.9.10.2122-3-g17c92e8

[Vlad Shakhov]

The following commit has been merged in the master branch:
commit 17c92e85a79658136c624ac66347138d9d7a177c
Author: Vlad Shakhov <v.shakhov at sam-solutions.net>
Date:   Mon Jun 25 17:02:00 2012 +0300

    fix VERSION.yml path

diff --git a/debian/changelog b/debian/changelog
index 6bb5f46..965c1f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ruby-sphinx (0.9.10.2122-2) unstable; urgency=low
+
+  * debian/patches/001_version_yml.patch: [Fix VERSION.yml lookup]
+
+ -- Vlad Shakhov <v.shakhov at sam-solutions.net>  Mon, 25 Jun 2012 16:50:10 +0300
+
 ruby-sphinx (0.9.10.2122-1) unstable; urgency=low
 
   * Initial release
diff --git a/debian/control b/debian/control
index 05511ee..b725e6e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Vlad Shakhov <v.shakhov at sam-solutions.net>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.13~), ruby-systemtimer
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.13~), ruby-systemtimer, ruby-rspec
 Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-sphinx.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-sphinx.git;a=summary
diff --git a/debian/patches/001_version_yml.patch b/debian/patches/001_version_yml.patch
new file mode 100644
index 0000000..5b17c75
--- /dev/null
+++ b/debian/patches/001_version_yml.patch
@@ -0,0 +1,16 @@
+## Description: Normalize placement of VERSION.yml file
+## Origin/Author: Vlad Shakhov <v.shakhov at sam-solutions.net>
+## Bug: bug URL
+diff --git a/lib/sphinx.rb b/lib/sphinx.rb
+index 8ffab81..8b3cdac 100644
+--- a/lib/sphinx.rb
++++ b/lib/sphinx.rb
+@@ -12,7 +12,7 @@
+ #
+ module Sphinx
+   VERSION = begin
+-    config = YAML.load(File.read(File.dirname(__FILE__) + '/../VERSION.yml'))
++    config = YAML.load(File.read(File.dirname(__FILE__) + '/sphinx/VERSION.yml'))
+     "#{config[:major]}.#{config[:minor]}.#{config[:patch]}.#{config[:build]}"
+   end
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..804fff8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+001_version_yml.patch
diff --git a/debian/ruby-sphinx.install b/debian/ruby-sphinx.install
new file mode 100644
index 0000000..23e04bf
--- /dev/null
+++ b/debian/ruby-sphinx.install
@@ -0,0 +1 @@
+VERSION.yml /usr/lib/ruby/vendor_ruby/sphinx/

-- 
ruby-sphinx.git