[DRE-commits] r2944 - packages-wip/redmine/trunk/debian

rnhurt-guest at alioth.debian.org rnhurt-guest at alioth.debian.org
Fri Aug 15 18:10:29 UTC 2008 

Author: rnhurt-guest
Date: 2008-08-15 18:10:28 +0000 (Fri, 15 Aug 2008)
New Revision: 2944

Modified:
   packages-wip/redmine/trunk/debian/control
   packages-wip/redmine/trunk/debian/redmine.install
   packages-wip/redmine/trunk/debian/redmine.links
   packages-wip/redmine/trunk/debian/redmine.lintian-overrides
   packages-wip/redmine/trunk/debian/rules
Log:
Moved public and config dirs to /etc/redmine

Modified: packages-wip/redmine/trunk/debian/control
===================================================================
--- packages-wip/redmine/trunk/debian/control	2008-08-13 14:13:43 UTC (rev 2943)
+++ packages-wip/redmine/trunk/debian/control	2008-08-15 18:10:28 UTC (rev 2944)
@@ -2,7 +2,7 @@
 Section: web
 Priority: optional
 Maintainer: Richard Hurt <rnhurt at kangaroobox.com>
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7), dpatch
 Standards-Version: 3.8.0
 Vcs-Svn: svn://rubyforge.org/var/svn/redmine/trunk redmine
 Vcs-Browser: http://www.redmine.org/repositories/show/redmine

Modified: packages-wip/redmine/trunk/debian/redmine.install
===================================================================
--- packages-wip/redmine/trunk/debian/redmine.install	2008-08-13 14:13:43 UTC (rev 2943)
+++ packages-wip/redmine/trunk/debian/redmine.install	2008-08-15 18:10:28 UTC (rev 2944)
@@ -1,6 +1,6 @@
 # Install the basic application files
 app usr/share/redmine
-config usr/share/redmine
+config /etc/redmine
 db usr/share/redmine
 doc usr/share/redmine
 extra usr/share/redmine
@@ -8,7 +8,7 @@
 lang usr/share/redmine
 lib usr/share/redmine
 log var/log/redmine
-public usr/share/redmine
+public /etc/redmine
 Rakefile usr/share/redmine
 script usr/share/redmine
 #tmp/cache var/cache/redmine

Modified: packages-wip/redmine/trunk/debian/redmine.links
===================================================================
--- packages-wip/redmine/trunk/debian/redmine.links	2008-08-13 14:13:43 UTC (rev 2943)
+++ packages-wip/redmine/trunk/debian/redmine.links	2008-08-15 18:10:28 UTC (rev 2944)
@@ -1,10 +1,10 @@
 # Move r/w directories to /var
-var/cache/redmine		usr/share/redmine/tmp/cache
+var/cache/redmine   		usr/share/redmine/tmp/cache
 var/lib/redmine/files		usr/share/redmine/files
 var/lib/redmine/sessions	usr/share/redmine/tmp/sessions
-var/log/redmine			usr/share/redmine/log
+var/log/redmine	    		usr/share/redmine/log
 var/run/redmine/sockets		usr/share/redmine/tmp/sockets
 
 # Link in other Debian packages
-usr/share/javascript/prototype/prototype.js	usr/share/redmine/public/javascripts/prototype.js
+usr/share/javascript/prototype/prototype.js	etc/redmine/public/javascripts/prototype.js
 usr/share/rails					usr/share/redmine/vendor/rails

Modified: packages-wip/redmine/trunk/debian/redmine.lintian-overrides
===================================================================
--- packages-wip/redmine/trunk/debian/redmine.lintian-overrides	2008-08-13 14:13:43 UTC (rev 2943)
+++ packages-wip/redmine/trunk/debian/redmine.lintian-overrides	2008-08-15 18:10:28 UTC (rev 2944)
@@ -1,7 +1,9 @@
 # This is being phased out in a future version of lintian
 debian-copyright-line-too-long
 
-# These files are not supposed to be externally executed
+
+# These files are not supposed to be executed by Redmine but are convenience
+# functions for users.
 redmine: script-not-executable ./usr/share/redmine/extra/svn/reposman.rb
 redmine: script-not-executable ./usr/share/redmine/extra/svn/svnserve.wrapper
 redmine: script-not-executable ./usr/share/redmine/vendor/plugins/coderay-0.7.6.227/bin/coderay

Modified: packages-wip/redmine/trunk/debian/rules
===================================================================
--- packages-wip/redmine/trunk/debian/rules	2008-08-13 14:13:43 UTC (rev 2943)
+++ packages-wip/redmine/trunk/debian/rules	2008-08-15 18:10:28 UTC (rev 2944)
@@ -23,25 +23,16 @@
 	dh_installdocs
 	dh_install
 
+	# Create links to the /etc/redmine directory structure
+	ln -s /etc/redmine/public debian/redmine/usr/share/redmine
+	ln -s /etc/redmine/config debian/redmine/usr/share/redmine
+
 	# Clean up the "extra" license files
 	rm -f debian/redmine/usr/share/redmine/doc/COPYING
 	rm -f debian/redmine/usr/share/redmine/lib/SVG/LICENSE.txt
-	rm -f debian/redmine/usr/share/redmine/vendor/plugins/engines/MIT-LICENSE
-	rm -f debian/redmine/usr/share/redmine/vendor/plugins/actionwebservice/MIT-LICENSE
-	rm -f debian/redmine/usr/share/redmine/vendor/plugins/acts_as_versioned/MIT-LICENSE
-	rm -f debian/redmine/usr/share/redmine/vendor/plugins/coderay-0.7.6.227/LICENSE
-	rm -f debian/redmine/usr/share/redmine/vendor/plugins/gloc-1.1.0/MIT-LICENSE
-	rm -f debian/redmine/usr/share/redmine/vendor/plugins/rfpdf/MIT-LICENSE
-	rm -f debian/redmine/usr/share/redmine/vendor/plugins/ruby-net-ldap-0.0.4/COPYING
+	rm -f debian/redmine/usr/share/redmine/vendor/plugins/*/*LICENSE
+	rm -f debian/redmine/usr/share/redmine/vendor/plugins/*/COPYING
 	rm -f debian/redmine/usr/share/redmine/vendor/plugins/ruby-net-ldap-0.0.4/LICENCE
-	#rm -f debian/redmine/usr/share/redmine/vendor/rails/actionmailer/MIT-LICENSE
-	#rm -f debian/redmine/usr/share/redmine/vendor/rails/actionpack/MIT-LICENSE
-	#rm -f debian/redmine/usr/sharm/redmine/vendor/rails/activerecord/MIT-LICENSE
-	#rm -f debian/redmine/usr/share/redmine/vendor/rails/activeresource/MIT-LICENSE
-	#rm -f debian/redmine/usr/share/redmine/vendor/rails/activesupport/MIT-LICENSE
-	#rm -f debian/redmine/usr/share/redmine/vendor/rails/railties/MIT-LICENSE
-	#rm -f debian/redmine/usr/share/redmine/vendor/rails/activerecord/MIT-LICENSE
-	#rm -f debian/redmine/usr/share/redmine/vendor/rails/railties/lib/rails_generator/generators/components/plugin/templates/MIT-LICENSE
 	# ...and other various files
 	rm -f debian/redmine/usr/share/redmine/vendor/plugins/engines/.gitignore
 
@@ -72,18 +63,19 @@
 
 	dh_installdirs	
 	dh_lintian
-#	dh_installlogrotate
+	dh_installlogrotate
 #	dh_installcron
 	dh_link
 	dh_strip
 	dh_compress
 
 	# Correct some permissions
-	chown -R www-data:www-data debian/redmine/var/log/redmine
-	chown -R www-data:www-data debian/redmine/var/lib/redmine
-	chown -R www-data:www-data debian/redmine/var/cache/redmine
+	chown -fR www-data:www-data debian/redmine/var/log/redmine
+	chown -fR www-data:www-data debian/redmine/var/lib/redmine
+	chown -fR www-data:www-data debian/redmine/var/cache/redmine
+	chown -fR www-data:www-data debian/redmine/etc/redmine
 
-	dh_fixperms -X debian/redmine/var/
+	dh_fixperms -Xdebian/redmine/var/ -Xdebian/redmine/etc
 	dh_installdeb
 	dh_gencontrol
 	dh_md5sums

More information about the Pkg-ruby-extras-commits mailing list