[DRE-commits] [ruby-passenger] 01/02: Fix building the documentation.

[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 699b01562dc71a38bbe8867d613eede355d31f68
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sat Nov 30 19:12:06 2013 +0100

    Fix building the documentation.
    
    * Fix building the documentation. (Closes: #680357)
      - Build-depend on ruby-mizuho.
---
 debian/changelog                  | 7 +++++++
 debian/control                    | 2 +-
 debian/ruby-passenger-doc.docs    | 1 -
 debian/ruby-passenger-doc.install | 2 ++
 debian/rules                      | 3 +++
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 34e72fa..c629f37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-passenger (4.0.25-2) UNRELEASED; urgency=low
+
+  * Fix building the documentation. (Closes: #680357)
+    - Build-depend on ruby-mizuho.
+
+ -- Felix Geyer <fgeyer at debian.org>  Fri, 29 Nov 2013 17:41:02 +0100
+
 ruby-passenger (4.0.25-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 936c860..03038ac 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Filipe Lautert <filipe at debian.org>, Micah Anderson <micah at debian.org>
  Felix Geyer <fgeyer at debian.org>
 Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.12~), apache2 (>= 2.4),
  apache2-dev (>= 2.4), libapr1-dev, doxygen, asciidoc (>= 8.2), graphviz, rake,
- source-highlight, libcurl4-openssl-dev, libev-dev, dh-autoreconf
+ source-highlight, libcurl4-openssl-dev, libev-dev, dh-autoreconf, ruby-mizuho
 Standards-Version: 3.9.4
 Homepage: http://www.modrails.com/
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-passenger.git
diff --git a/debian/ruby-passenger-doc.docs b/debian/ruby-passenger-doc.docs
deleted file mode 100644
index cff36af..0000000
--- a/debian/ruby-passenger-doc.docs
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/share/doc/passenger/
diff --git a/debian/ruby-passenger-doc.install b/debian/ruby-passenger-doc.install
new file mode 100644
index 0000000..b3e22fc
--- /dev/null
+++ b/debian/ruby-passenger-doc.install
@@ -0,0 +1,2 @@
+usr/share/doc/passenger/*.html usr/share/doc/ruby-passenger-doc
+usr/share/doc/passenger/images usr/share/doc/ruby-passenger-doc
diff --git a/debian/rules b/debian/rules
index 3ca8be5..1639577 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,9 @@ export EXTRA_LDFLAGS=$(LDFLAGS)
 
 export USE_VENDORED_LIBEV=false
 
+# needed to generate docs
+export LC_ALL=C.UTF-8
+
 %:
 	dh $@ --buildsystem=ruby --with ruby,apache2,autoreconf
 

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