[DRE-commits] [SCM] redmine.git branch, master-experimental, updated. debian/1.4.4+dfsg1-1-35-g042f641

[Ondřej Surý]

The following commit has been merged in the master-experimental branch:
commit f5c229fb78868323e858ff57a08aa28621d06980
Author: Ondřej Surý <ondrej at sury.org>
Date:   Sun Oct 14 21:36:05 2012 +0200

    Update plugins directory from vendor/plugins to lib/plugins

diff --git a/debian/install b/debian/install
index 330a9eb..63bc97e 100644
--- a/debian/install
+++ b/debian/install
@@ -10,7 +10,7 @@ Gemfile usr/share/redmine
 Gemfile.lock usr/share/redmine
 script usr/share/redmine
 test usr/share/redmine
-vendor/plugins/* usr/share/redmine/vendor/plugins
+lib/plugins/* usr/share/redmine/lib/plugins
 debian/conf/*.template usr/share/redmine/templates
 buildfonts/*.z usr/share/redmine/vendor/plugins/rfpdf/lib/fonts
 buildfonts/*.rb usr/share/redmine/vendor/plugins/rfpdf/lib/fonts
diff --git a/debian/rules b/debian/rules
index 080674a..45b2dda 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 
 buildfontsdir = buildfonts
 ttf2ufmbin = LANG=en_EN.utf8 ttf2ufm -W 0 -a -F
-makefontunibin = cd $(buildfontsdir) && /usr/bin/php $(CURDIR)/vendor/plugins/rfpdf/lib/fonts/ttf2ufm/makefontuni_ruby.php
+makefontunibin = cd $(buildfontsdir) && /usr/bin/php $(CURDIR)/lib/plugins/rfpdf/lib/fonts/ttf2ufm/makefontuni_ruby.php
 
 binary-install/redmine::
 	# Clean up the "extra" license files with typos :)
@@ -30,20 +30,20 @@ binary-install/redmine::
 
 	# Mark scripts as executable until upstream fixes their .tar.gz archive build
 	chmod a+x debian/redmine/usr/share/redmine/extra/mail_handler/rdm-mailhandler.rb
-	chmod a+x debian/redmine/usr/share/redmine/vendor/plugins/rfpdf/lib/fpdf/makefont.rb
-	chmod a+x debian/redmine/usr/share/redmine/vendor/plugins/rfpdf/test/test_helper.rb
+	chmod a+x debian/redmine/usr/share/redmine/lib/plugins/rfpdf/lib/fpdf/makefont.rb
+	chmod a+x debian/redmine/usr/share/redmine/lib/plugins/rfpdf/test/test_helper.rb
 
 	# some files are marked executable, fix them
-	chmod a-x debian/redmine/usr/share/redmine/vendor/plugins/rfpdf/logo_example.png
-	chmod a-x debian/redmine/usr/share/redmine/vendor/plugins/rfpdf/utf8test.txt
-	chmod a-x debian/redmine/usr/share/redmine/vendor/plugins/rfpdf/lib/tcpdf.rb
-	chmod a-x debian/redmine/usr/share/redmine/vendor/plugins/rfpdf/lib/config/lang/eng.rb
-	chmod a-x debian/redmine/usr/share/redmine/vendor/plugins/rfpdf/lib/fonts/ttf2ufm/makefontuni_ruby.php
-	chmod a-x debian/redmine/usr/share/redmine/vendor/plugins/rfpdf/lib/fonts/ttf2ufm/README.TXT
+	chmod a-x debian/redmine/usr/share/redmine/lib/plugins/rfpdf/logo_example.png
+	chmod a-x debian/redmine/usr/share/redmine/lib/plugins/rfpdf/utf8test.txt
+	chmod a-x debian/redmine/usr/share/redmine/lib/plugins/rfpdf/lib/tcpdf.rb
+	chmod a-x debian/redmine/usr/share/redmine/lib/plugins/rfpdf/lib/config/lang/eng.rb
+	chmod a-x debian/redmine/usr/share/redmine/lib/plugins/rfpdf/lib/fonts/ttf2ufm/makefontuni_ruby.php
+	chmod a-x debian/redmine/usr/share/redmine/lib/plugins/rfpdf/lib/fonts/ttf2ufm/README.TXT
 
 	# install font files
-	mv $(buildfontsdir)/*.z debian/redmine/usr/share/redmine/vendor/plugins/rfpdf/lib/fonts/
-	mv $(buildfontsdir)/*.rb debian/redmine/usr/share/redmine/vendor/plugins/rfpdf/lib/fonts/
+	mv $(buildfontsdir)/*.z debian/redmine/usr/share/redmine/lib/plugins/rfpdf/lib/fonts/
+	mv $(buildfontsdir)/*.rb debian/redmine/usr/share/redmine/lib/plugins/rfpdf/lib/fonts/
 
 build:
 	# call bundler

-- 
redmine.git