[DRE-commits] r5682 - in trunk/redmine/debian: . patches

Sun Jul 18 21:27:25 UTC 2010

Author: kapouer-guest
Date: 2010-07-18 21:27:25 +0000 (Sun, 18 Jul 2010)
New Revision: 5682

Added:
   trunk/redmine/debian/patches/0018-remove-shebang.patch
Modified:
   trunk/redmine/debian/README.Debian
   trunk/redmine/debian/changelog
   trunk/redmine/debian/copyright
   trunk/redmine/debian/patches/0009-Allows-environment-variables-to-setup-debian-paths.patch
   trunk/redmine/debian/patches/series
   trunk/redmine/debian/rules
Log:
Upstream update to 1.0.0

* New upstream release : upstream considers it is a Release
  Canditate. Expect an update soon.
* Refreshed quilt patches
* Coderay plugin has been updated : update debian/rules and
  patch one of its files to remove an unnecessary shebang.
* README.Debian : add more info about launching with webrick.
  (Closes: #589033)

Modified: trunk/redmine/debian/README.Debian
===================================================================

--- trunk/redmine/debian/README.Debian	2010-07-14 17:07:56 UTC (rev 5681)
+++ trunk/redmine/debian/README.Debian	2010-07-18 21:27:25 UTC (rev 5682)
@@ -52,7 +52,7 @@
  When done, remove /usr/share/redmine/tmp
  NOTICE :
  - Running without sudoing to www-data will change permissions on some files, e.g.
-   /var/log/redmine files. Fix it or reinstall the redmine package if you did so.
+ /var/log/redmine files. Fix it or reinstall the redmine package if you did so.
  - The tmp/ directory is needed when launching webrick, although nothing but empty directories
    will be created in it.
 

Modified: trunk/redmine/debian/changelog
===================================================================
--- trunk/redmine/debian/changelog	2010-07-14 17:07:56 UTC (rev 5681)
+++ trunk/redmine/debian/changelog	2010-07-18 21:27:25 UTC (rev 5682)
@@ -1,9 +1,14 @@
-redmine (0.9.6-2) UNRELEASED; urgency=low
+redmine (1.0.0-1) unstable; urgency=low
 
+  * New upstream release : upstream considers it is a Release
+    Canditate. Expect an update soon.
+  * Refreshed quilt patches
+  * Coderay plugin has been updated : update debian/rules and
+    patch one of its files to remove an unnecessary shebang.
   * README.Debian : add more info about launching with webrick.
     (Closes: #589033)
 
- -- Jérémy Lal <kapouer at melix.org>  Wed, 14 Jul 2010 14:58:57 +0200
+ -- Jérémy Lal <kapouer at melix.org>  Sun, 18 Jul 2010 23:13:46 +0200
 
 redmine (0.9.6-1) unstable; urgency=low
 

Modified: trunk/redmine/debian/copyright
===================================================================
--- trunk/redmine/debian/copyright	2010-07-14 17:07:56 UTC (rev 5681)
+++ trunk/redmine/debian/copyright	2010-07-18 21:27:25 UTC (rev 5682)
@@ -131,8 +131,8 @@
 Copyright: (c) 2006, 2007 Anupam Sengupta
 License: BSD
 
-Files: vendor/plugins/coderay-0.7.6.227
-Copyright: 2006 murphy (Kornelius Kalnbach) <murphy rubychan de>
+Files: vendor/plugins/coderay-0.9.2
+Copyright: 2006-2010 murphy (Kornelius Kalnbach) <murphy rubychan de>
 License: LGPL-2.1
  On Debian systems, the complete text of the GNU Lesser General
  Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.

Modified: trunk/redmine/debian/patches/0009-Allows-environment-variables-to-setup-debian-paths.patch
===================================================================
--- trunk/redmine/debian/patches/0009-Allows-environment-variables-to-setup-debian-paths.patch	2010-07-14 17:07:56 UTC (rev 5681)
+++ trunk/redmine/debian/patches/0009-Allows-environment-variables-to-setup-debian-paths.patch	2010-07-18 21:27:25 UTC (rev 5682)
@@ -49,7 +49,7 @@
 +
    # Enable page/fragment caching by setting a file-based store
    # (remember to create the caching directory and make it readable to the application)
-   # config.action_controller.fragment_cache_store = :file_store, "#{RAILS_ROOT}/cache"
+   # config.action_controller.cache_store = :file_store, "#{RAILS_ROOT}/tmp/cache"
 +
 +  # the file cache store
 +  config.cache_store = :file_store, ENV['RAILS_CACHE']

Added: trunk/redmine/debian/patches/0018-remove-shebang.patch
===================================================================
--- trunk/redmine/debian/patches/0018-remove-shebang.patch	                        (rev 0)
+++ trunk/redmine/debian/patches/0018-remove-shebang.patch	2010-07-18 21:27:25 UTC (rev 5682)
@@ -0,0 +1,10 @@
+Description: Remove unnecessary shebang in this coderay file.
+Author: Jérémy Lal <kapouer at melix.org>
+
+--- redmine-1.0.0.orig/vendor/plugins/coderay-0.9.2/lib/coderay/helpers/file_type.rb
++++ redmine-1.0.0/vendor/plugins/coderay-0.9.2/lib/coderay/helpers/file_type.rb
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env ruby
+ module CodeRay
+ 
+ # = FileType

Modified: trunk/redmine/debian/patches/series
===================================================================
--- trunk/redmine/debian/patches/series	2010-07-14 17:07:56 UTC (rev 5681)
+++ trunk/redmine/debian/patches/series	2010-07-18 21:27:25 UTC (rev 5682)
@@ -3,3 +3,4 @@
 0014-Move-session-configuration-to-YML-file-next-to-datab.patch
 0016-plugin_assets_in_var_dir.patch
 0017-dump_schema_to_cache_dir.patch
+0018-remove-shebang.patch

Modified: trunk/redmine/debian/rules
===================================================================
--- trunk/redmine/debian/rules	2010-07-14 17:07:56 UTC (rev 5681)
+++ trunk/redmine/debian/rules	2010-07-18 21:27:25 UTC (rev 5682)
@@ -43,8 +43,6 @@
 	chmod a+x debian/redmine/usr/share/redmine/extra/mail_handler/rdm-mailhandler.rb
 	chmod a+x debian/redmine/usr/share/redmine/extra/svn/reposman.rb
 	chmod a+x debian/redmine/usr/share/redmine/extra/svn/svnserve.wrapper
-	chmod a+x debian/redmine/usr/share/redmine/vendor/plugins/coderay-0.7.6.227/bin/coderay
-	chmod a+x debian/redmine/usr/share/redmine/vendor/plugins/coderay-0.7.6.227/bin/coderay_stylesheet
 	chmod a+x debian/redmine/usr/share/redmine/vendor/plugins/rfpdf/lib/rfpdf/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/vendor/gems/rubytree-0.5.2/test/test_binarytree.rb


