[Fusionforge-commits] r8420 - in trunk/gforge: deb-specific debian debian/dsf-in

Roland Mas lolando at libremir.placard.fr.eu.org
Thu Nov 19 16:01:27 CET 2009


Author: lolando
Date: 2009-11-19 16:01:27 +0100 (Thu, 19 Nov 2009)
New Revision: 8420

Added:
   trunk/gforge/debian/dsf-in/common.links
   trunk/gforge/debian/dsf-in/plugin-mediawiki.links
   trunk/gforge/debian/dsf-in/plugin-scmdarcs.links
   trunk/gforge/debian/dsf-in/plugin-scmgit.links
Modified:
   trunk/gforge/deb-specific/dsf-helper.pl
   trunk/gforge/debian/rules
Log:
Switch to dh_link for creation of symlinks

Modified: trunk/gforge/deb-specific/dsf-helper.pl
===================================================================
--- trunk/gforge/deb-specific/dsf-helper.pl	2009-11-19 15:01:19 UTC (rev 8419)
+++ trunk/gforge/deb-specific/dsf-helper.pl	2009-11-19 15:01:27 UTC (rev 8420)
@@ -15,7 +15,7 @@
 ###
 # STATIC DATA
 
- at known_files = qw/ config templates preinst postinst prerm postrm / ;
+ at known_files = qw/ config templates preinst postinst prerm postrm links / ;
 
 ###
 # HELPER FUNCTIONS

Added: trunk/gforge/debian/dsf-in/common.links
===================================================================
--- trunk/gforge/debian/dsf-in/common.links	                        (rev 0)
+++ trunk/gforge/debian/dsf-in/common.links	2009-11-19 15:01:27 UTC (rev 8420)
@@ -0,0 +1 @@
+/usr/share/@PACKAGE@/common/include/database-pgsql.php /usr/share/@PACKAGE@/common/include/database.php

Added: trunk/gforge/debian/dsf-in/plugin-mediawiki.links
===================================================================
--- trunk/gforge/debian/dsf-in/plugin-mediawiki.links	                        (rev 0)
+++ trunk/gforge/debian/dsf-in/plugin-mediawiki.links	2009-11-19 15:01:27 UTC (rev 8420)
@@ -0,0 +1,45 @@
+/usr/share/mediawiki/skins/@PACKAGE@/loader.php /etc/mediawiki-extensions/extensions-available/GforgeAuth.php
+
+/usr/share/mediawiki/StartProfiler.php /usr/share/gforge/www/plugins/mediawiki/StartProfiler.php
+/usr/share/mediawiki/api.php /usr/share/gforge/www/plugins/mediawiki/api.php
+/usr/share/mediawiki/extensions /usr/share/gforge/www/plugins/mediawiki/extensions
+/usr/share/mediawiki/img_auth.php /usr/share/gforge/www/plugins/mediawiki/img_auth.php
+/usr/share/mediawiki/includes /usr/share/gforge/www/plugins/mediawiki/includes
+/usr/share/mediawiki/index.php /usr/share/gforge/www/plugins/mediawiki/index.php
+/usr/share/mediawiki/languages /usr/share/gforge/www/plugins/mediawiki/languages
+/usr/share/mediawiki/maintenance /usr/share/gforge/www/plugins/mediawiki/maintenance
+/usr/share/mediawiki/opensearch_desc.php /usr/share/gforge/www/plugins/mediawiki/opensearch_desc.php
+/usr/share/mediawiki/profileinfo.php /usr/share/gforge/www/plugins/mediawiki/profileinfo.php
+/usr/share/mediawiki/redirect.php /usr/share/gforge/www/plugins/mediawiki/redirect.php
+/usr/share/mediawiki/thumb.php /usr/share/gforge/www/plugins/mediawiki/thumb.php
+/usr/share/mediawiki/trackback.php /usr/share/gforge/www/plugins/mediawiki/trackback.php
+
+/usr/share/mediawiki/skins/monobook/FF2Fixes.css /usr/share/mediawiki/skins/fusionforge/FF2Fixes.css
+/usr/share/mediawiki/skins/monoboo/IE50Fixes.css /usr/share/mediawiki/skins/fusionforge/IE50Fixes.css
+/usr/share/mediawiki/skins/monoboo/IE55Fixes.css /usr/share/mediawiki/skins/fusionforge/IE55Fixes.css
+/usr/share/mediawiki/skins/monoboo/IE60Fixes.css /usr/share/mediawiki/skins/fusionforge/IE60Fixes.css
+/usr/share/mediawiki/skins/monoboo/IE70Fixes.css /usr/share/mediawiki/skins/fusionforge/IE70Fixes.css
+/usr/share/mediawiki/skins/monoboo/IEMacFixes.css /usr/share/mediawiki/skins/fusionforge/IEMacFixes.css
+/usr/share/mediawiki/skins/monoboo/KHTMLFixes.css /usr/share/mediawiki/skins/fusionforge/KHTMLFixes.css
+/usr/share/mediawiki/skins/monoboo/Opera6Fixes.css /usr/share/mediawiki/skins/fusionforge/Opera6Fixes.css
+/usr/share/mediawiki/skins/monoboo/Opera7Fixes.css /usr/share/mediawiki/skins/fusionforge/Opera7Fixes.css
+/usr/share/mediawiki/skins/monoboo/Opera9Fixes.css /usr/share/mediawiki/skins/fusionforge/Opera9Fixes.css
+/usr/share/mediawiki/skins/monoboo/audio.png /usr/share/mediawiki/skins/fusionforge/audio.png
+/usr/share/mediawiki/skins/monoboo/bullet.gif /usr/share/mediawiki/skins/fusionforge/bullet.gif
+/usr/share/mediawiki/skins/monoboo/discussionitem_icon.gif /usr/share/mediawiki/skins/fusionforge/discussionitem_icon.gif
+/usr/share/mediawiki/skins/monoboo/document.png /usr/share/mediawiki/skins/fusionforge/document.png
+/usr/share/mediawiki/skins/monoboo/external-rtl.png /usr/share/mediawiki/skins/fusionforge/external-rtl.png
+/usr/share/mediawiki/skins/monoboo/external.png /usr/share/mediawiki/skins/fusionforge/external.png
+/usr/share/mediawiki/skins/monoboo/file_icon.gif /usr/share/mediawiki/skins/fusionforge/file_icon.gif
+/usr/share/mediawiki/skins/monoboo/headbg.jpg /usr/share/mediawiki/skins/fusionforge/headbg.jpg
+/usr/share/mediawiki/skins/monoboo/link_icon.gif /usr/share/mediawiki/skins/fusionforge/link_icon.gif
+/usr/share/mediawiki/skins/monoboo/lock_icon.gif /usr/share/mediawiki/skins/fusionforge/lock_icon.gif
+/usr/share/mediawiki/skins/monoboo/magnify-clip.png /usr/share/mediawiki/skins/fusionforge/magnify-clip.png
+/usr/share/mediawiki/skins/monoboo/mail_icon.gif /usr/share/mediawiki/skins/fusionforge/mail_icon.gif
+/usr/share/mediawiki/skins/monoboo/news_icon.png /usr/share/mediawiki/skins/fusionforge/news_icon.png
+/usr/share/mediawiki/skins/monoboo/required.gif /usr/share/mediawiki/skins/fusionforge/required.gif
+/usr/share/mediawiki/skins/monoboo/rtl.css /usr/share/mediawiki/skins/fusionforge/rtl.css
+/usr/share/mediawiki/skins/monoboo/user.gif /usr/share/mediawiki/skins/fusionforge/user.gif
+/usr/share/mediawiki/skins/monoboo/video.png /usr/share/mediawiki/skins/fusionforge/video.png
+/usr/share/mediawiki/skins/monoboo/wiki-indexed.png /usr/share/mediawiki/skins/fusionforge/wiki-indexed.png
+/usr/share/mediawiki/skins/monoboo/wiki.png /usr/share/mediawiki/skins/fusionforge/wiki.png

Added: trunk/gforge/debian/dsf-in/plugin-scmdarcs.links
===================================================================
--- trunk/gforge/debian/dsf-in/plugin-scmdarcs.links	                        (rev 0)
+++ trunk/gforge/debian/dsf-in/plugin-scmdarcs.links	2009-11-19 15:01:27 UTC (rev 8420)
@@ -0,0 +1,3 @@
+/usr/lib/cgi-bin/darcsweb.cgi /usr/share/gforge/plugins/scmdarcs/cgi-bin/darcsweb.cgi
+/usr/share/darcsweb /usr/share/gforge/www/plugins/scmdarcs
+/usr/share/gforge/plugins/scmdarcs/www /usr/share/gforge/www/plugins/scmdarcs

Added: trunk/gforge/debian/dsf-in/plugin-scmgit.links
===================================================================
--- trunk/gforge/debian/dsf-in/plugin-scmgit.links	                        (rev 0)
+++ trunk/gforge/debian/dsf-in/plugin-scmgit.links	2009-11-19 15:01:27 UTC (rev 8420)
@@ -0,0 +1,3 @@
+/usr/lib/cgi-bin/gitweb.cgi /usr/share/gforge/plugins/scmgit/cgi-bin/gitweb.cgi
+/usr/share/gitweb /usr/share/gforge/www/plugins/scmgit
+/usr/share/gforge/plugins/scmgit/www /usr/share/gforge/www/plugins/scmgit

Modified: trunk/gforge/debian/rules
===================================================================
--- trunk/gforge/debian/rules	2009-11-19 15:01:19 UTC (rev 8419)
+++ trunk/gforge/debian/rules	2009-11-19 15:01:27 UTC (rev 8420)
@@ -138,13 +138,6 @@
 	#dh_install --fail-missing -X.svn -X.arch-ids -X.bzr -X.cvsignore --sourcedir=$(CURDIR)
 	dh_install -X.svn -X.arch-ids -X.bzr -X.cvsignore --sourcedir=$(CURDIR)
 
-	# Install few links
-	ln -s database-pgsql.php $(CURDIR)/debian/$(PACKAGE)-common/usr/share/$(PACKAGE)/common/include/database.php
-	ln -s /usr/share/mediawiki/skins/$(PACKAGE)/loader.php $(CURDIR)/debian/$(PACKAGE)-plugin-mediawiki/etc/mediawiki-extensions/extensions-available/GforgeAuth.php
-	for i in includes opensearch_desc.php redirect.php thumb.php api.php extensions img_auth.php index.php languages maintenance profileinfo.php StartProfiler.php trackback.php ; do ln -s /usr/share/mediawiki/$$i $(CURDIR)/debian/$(PACKAGE)-plugin-mediawiki/usr/share/gforge/www/plugins/mediawiki/ ; done
-	# These link are done for mediawiki 1.15
-	for i in audio.png external.png headbg.jpg IE70Fixes.css lock_icon.gif news_icon.png required.gif wiki-indexed.png bullet.gif external-rtl.png IE50Fixes.css IEMacFixes.css magnify-clip.png Opera6Fixes.css rtl.css wiki.png discussionitem_icon.gif FF2Fixes.css IE55Fixes.css KHTMLFixes.css  mail_icon.gif Opera7Fixes.css user.gif document.png file_icon.gif IE60Fixes.css link_icon.gif Opera9Fixes.css video.png ; do ln -s /usr/share/mediawiki/skins/monobook/$$i $(CURDIR)/debian/$(PACKAGE)-plugin-mediawiki/usr/share/mediawiki/skins/fusionforge/ ; done
-
 	# Fix permissions
 	for i in $(addprefix $(CURDIR)/debian/,$(shell dh_listpackages)) ; do find $$i -type f -exec chmod 644 {} \;  ; done
 	-chmod 755 $(CURDIR)/debian/*/*/*/*/bin/* $(CURDIR)/debian/*/*/*/*/cronjobs/* \
@@ -168,14 +161,6 @@
 	#
 	rm -f $(CURDIR)/debian/$(PACKAGE)-web-apache2/usr/share/*/www/themes/$(PACKAGE)/COPYING
 
-	ln -s /usr/lib/cgi-bin/darcsweb.cgi $(CURDIR)/debian/$(PACKAGE)-plugin-scmdarcs/usr/share/gforge/plugins/scmdarcs/cgi-bin/
-	ln -s /usr/share/darcsweb $(CURDIR)/debian/$(PACKAGE)-plugin-scmdarcs/usr/share/gforge/plugins/scmdarcs/www/darcsweb
-	ln -s ../../plugins/scmdarcs/www $(CURDIR)/debian/$(PACKAGE)-plugin-scmdarcs/usr/share/gforge/www/plugins/scmdarcs
-
-	ln -s /usr/lib/cgi-bin/gitweb.cgi $(CURDIR)/debian/$(PACKAGE)-plugin-scmgit/usr/share/gforge/plugins/scmgit/cgi-bin/
-	ln -s /usr/share/gitweb $(CURDIR)/debian/$(PACKAGE)-plugin-scmgit/usr/share/gforge/plugins/scmgit/www/gitweb
-	ln -s ../../plugins/scmgit/www $(CURDIR)/debian/$(PACKAGE)-plugin-scmgit/usr/share/gforge/www/plugins/scmgit
-
 	# Remove Snoopy class from binary packages (provided by libphp-snoopy)
 	for i in $(addprefix $(CURDIR)/debian/,$(shell dh_listpackages)) ; do find $$i -name Snoopy.class.php | xargs rm -rf ; done
 
@@ -203,7 +188,7 @@
 	#dh_installinfo
 	#dh_undocumented
 	dh_installchangelogs ChangeLog
-	#dh_link
+	dh_link
 	dh_strip
 	dh_compress
 	 dh_fixperms




More information about the Fusionforge-commits mailing list