[DRE-commits] [SCM] redmine.git branch, master-experimental, updated. debian/1.1.3-1-58-g9d859cc

[Jérémy Lal]

The following commit has been merged in the master-experimental branch:
commit be8cd52f610ef90bd0df469d326cffcd63e6fdd6
Author: Jérémy Lal <kapouer at melix.org>
Date:   Tue Aug 23 15:23:16 2011 +0200

    Use and depend on ruby-coderay package.

diff --git a/debian/control b/debian/control
index a03c189..5500378 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Homepage: http://www.redmine.org
 Package: redmine
 Architecture: all
 Pre-Depends: debconf
-Depends: ruby1.8, ruby-rails-2.3 | rails, dbconfig-common, redmine-sqlite | redmine-mysql | redmine-pgsql, ${misc:Depends}
+Depends: ruby1.8, ruby-rails-2.3 | rails, dbconfig-common, redmine-sqlite | redmine-mysql | redmine-pgsql, ruby-coderay, ${misc:Depends}
 Breaks: redmine-plugin-botsfilter (<=1.02-1)
 Suggests: libsvn-ruby (>= 1.3), ruby-rmagick, libopenid-ruby
 Description: flexible project management web application
diff --git a/debian/install b/debian/install
index 8a678c5..5b96ef6 100644
--- a/debian/install
+++ b/debian/install
@@ -9,5 +9,5 @@ Rakefile usr/share/redmine
 script usr/share/redmine
 test usr/share/redmine
 vendor/plugins usr/share/redmine/vendor
-vendor/gems usr/share/redmine/vendor
+vendor/gems/rubytree-0.5.2 usr/share/redmine/vendor/gems
 debian/conf/*.template usr/share/redmine/templates
diff --git a/debian/rules b/debian/rules
index df9de4a..6ae8341 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,8 +39,6 @@ binary-install/redmine::
 	chmod a+x debian/redmine/usr/share/redmine/lib/faster_csv.rb
 	chmod a+x debian/redmine/usr/share/redmine/vendor/gems/rubytree-0.5.2/test/test_binarytree.rb
 	chmod a+x debian/redmine/usr/share/redmine/vendor/gems/rubytree-0.5.2/test/test_tree.rb
-	chmod a+x debian/redmine/usr/share/redmine/vendor/gems/coderay-0.9.7/bin/coderay
-	chmod a+x debian/redmine/usr/share/redmine/vendor/gems/coderay-0.9.7/bin/coderay_stylesheet
 
 	# some files are marked executable, fix them
 	chmod a-x debian/redmine/usr/share/redmine/vendor/plugins/rfpdf/logo_example.png

-- 
redmine.git