[DRE-commits] [SCM] redmine.git branch, master, updated. debian/1.3.3+dfsg1-2-42-gede3bc9

[Jérémy Lal]

The following commit has been merged in the master branch:
commit f6fe7a23aef9df325c7764d1baf954dd261b4ac2
Author: Jérémy Lal <kapouer at melix.org>
Date:   Tue May 15 00:44:27 2012 +0200

    Create and install bundler files.

diff --git a/debian/install b/debian/install
index 2e3c7c4..e9d5839 100644
--- a/debian/install
+++ b/debian/install
@@ -6,7 +6,8 @@ extra usr/share/redmine
 lib usr/share/redmine
 public usr/share/redmine
 Rakefile usr/share/redmine
-Gemfile usr/share/redmine
+Gemfile* usr/share/redmine
+.bundle usr/share/redmine
 script usr/share/redmine
 test usr/share/redmine
 vendor/plugins/* usr/share/redmine/vendor/plugins
diff --git a/debian/rules b/debian/rules
index 77a8e04..a2481c2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,6 +46,9 @@ binary-install/redmine::
 	mv $(buildfontsdir)/*.rb debian/redmine/usr/share/redmine/vendor/plugins/rfpdf/lib/fonts/
 
 build:
+	# call bundler
+	bundle install --local --without test
+	# build fonts
 	mkdir -p $(buildfontsdir)
 	$(ttf2ufmbin) /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf $(buildfontsdir)/dejavusans
 	$(ttf2ufmbin) /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf $(buildfontsdir)/dejavusansb
@@ -66,3 +69,5 @@ build:
 
 clean::
 	rm -rf $(buildfontsdir)
+	rm -f Gemfile.lock
+	rm -rf .bundle

-- 
redmine.git