[DRE-commits] [SCM] ruby-markaby.git branch, master, updated. upstream/0.7.2-11-g57dbfd8

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 6e94a9577781077b2cb5e2d96b9dce8b2c8c14b4
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Fri Aug 26 22:21:23 2011 +0200

    moving VERSION and patching markaby.rb to read it correctly

diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..4e1b3ef
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,2 @@
+lib/markaby/VERSION
+
diff --git a/debian/patches/01_fix_VERSION.diff b/debian/patches/01_fix_VERSION.diff
new file mode 100644
index 0000000..0b873b2
--- /dev/null
+++ b/debian/patches/01_fix_VERSION.diff
@@ -0,0 +1,15 @@
+Description: hardcode version in markaby.rb
+Author: Cédric Boutillier <cedric.boutillier at gmail.com>
+Last-Update: 2011-08-26
+
+--- a/lib/markaby.rb
++++ b/lib/markaby.rb
+@@ -19,7 +19,7 @@
+ # * Markaby::Template: a class for hooking Markaby into Rails as a
+ #   proper templating language.
+ module Markaby
+-  version_file = File.expand_path(File.dirname(__FILE__) + "/../VERSION")
++  version_file = File.expand_path(File.dirname(__FILE__) + "/markaby/VERSION")
+   VERSION      = File.read(version_file).strip
+ 
+   class InvalidXhtmlError < StandardError; end
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7c8d52a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_fix_VERSION.diff
diff --git a/debian/rules b/debian/rules
index 7e410cb..3bea345 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,3 +19,7 @@ export DH_RUBY_IGNORE_TESTS=ruby1.9.1
 
 override_dh_installchangelogs:
 	dh_installchangelogs CHANGELOG.rdoc
+
+override_dh_auto_build:
+	cp VERSION lib/markaby/
+	dh_auto_build

-- 
ruby-markaby.git