[Fusionforge-commits] r8271 - branches/Branch_4_8/gforge/debian

Roland Mas lolando at libremir.placard.fr.eu.org
Wed Oct 14 14:41:01 CEST 2009


Author: lolando
Date: 2009-10-14 14:41:01 +0200 (Wed, 14 Oct 2009)
New Revision: 8271

Modified:
   branches/Branch_4_8/gforge/debian/changelog
   branches/Branch_4_8/gforge/debian/rules
Log:
Fixed file conflict between -web-apache2 and -plugin-mediawiki

Modified: branches/Branch_4_8/gforge/debian/changelog
===================================================================
--- branches/Branch_4_8/gforge/debian/changelog	2009-10-13 17:24:03 UTC (rev 8270)
+++ branches/Branch_4_8/gforge/debian/changelog	2009-10-14 12:41:01 UTC (rev 8271)
@@ -1,3 +1,10 @@
+gforge (4.8.1-1.1) unstable; urgency=low
+
+  * New upstream snapshot.
+  * Fixed file conflict between -web-apache2 and -plugin-mediawiki.
+
+ --
+
 gforge (4.8.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: branches/Branch_4_8/gforge/debian/rules
===================================================================
--- branches/Branch_4_8/gforge/debian/rules	2009-10-13 17:24:03 UTC (rev 8270)
+++ branches/Branch_4_8/gforge/debian/rules	2009-10-14 12:41:01 UTC (rev 8271)
@@ -101,6 +101,8 @@
 	# 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
+	# Remove a few others
+	rm $(CURDIR)/debian/$(PACKAGE)-web-apache2/usr/share/gforge/www/plugins/mediawiki
 
 	# Fix permissions
 	for i in $(addprefix $(CURDIR)/debian/,$(shell dh_listpackages)) ; do find $$i -type f -exec chmod 644 {} \;  ; done




More information about the Fusionforge-commits mailing list