[Fusionforge-commits] r10112 - in branches/Branch_5_0/gforge: debian packaging/control plugins/scmgit/common

Roland Mas lolando at libremir.placard.fr.eu.org
Thu Jun 24 14:04:24 CEST 2010


Author: lolando
Date: 2010-06-24 14:04:23 +0200 (Thu, 24 Jun 2010)
New Revision: 10112

Modified:
   branches/Branch_5_0/gforge/debian/changelog
   branches/Branch_5_0/gforge/debian/control
   branches/Branch_5_0/gforge/packaging/control/133plugin-scmgit
   branches/Branch_5_0/gforge/plugins/scmgit/common/GitPlugin.class.php
Log:
Adapted URLs to logos and CSS for gitweb >= 1.7

Modified: branches/Branch_5_0/gforge/debian/changelog
===================================================================
--- branches/Branch_5_0/gforge/debian/changelog	2010-06-23 21:05:29 UTC (rev 10111)
+++ branches/Branch_5_0/gforge/debian/changelog	2010-06-24 12:04:23 UTC (rev 10112)
@@ -1,3 +1,10 @@
+fusionforge (5.0.1+svn10088-1+) unstable; urgency=low
+
+  * Adapted URLs to logos and CSS for gitweb >= 1.7.  Added versioned
+    dependency accordingly.
+
+ -- Roland Mas <lolando at debian.org>  Thu, 24 Jun 2010 14:02:29 +0200
+
 fusionforge (5.0.1+svn10088-1) unstable; urgency=low
 
   * New snapshot from upstream SVN (Branch_5_0).

Modified: branches/Branch_5_0/gforge/debian/control
===================================================================
--- branches/Branch_5_0/gforge/debian/control	2010-06-23 21:05:29 UTC (rev 10111)
+++ branches/Branch_5_0/gforge/debian/control	2010-06-24 12:04:23 UTC (rev 10112)
@@ -289,7 +289,7 @@
 
 Package: gforge-plugin-scmgit
 Architecture: all
-Depends: gforge-common, gforge-db-postgresql | gforge-db, gforge-web-apache2 | gforge-web, gforge-shell-postgresql | gforge-shell, git-core, gitweb, php5-cli, ${misc:Depends}
+Depends: gforge-common, gforge-db-postgresql | gforge-db, gforge-web-apache2 | gforge-web, gforge-shell-postgresql | gforge-shell, git-core, gitweb (>= 1.7), php5-cli, ${misc:Depends}
 Provides: gforge-plugin-scm
 Description: collaborative development tool - Git plugin
  FusionForge provides many tools to aid collaboration in a

Modified: branches/Branch_5_0/gforge/packaging/control/133plugin-scmgit
===================================================================
--- branches/Branch_5_0/gforge/packaging/control/133plugin-scmgit	2010-06-23 21:05:29 UTC (rev 10111)
+++ branches/Branch_5_0/gforge/packaging/control/133plugin-scmgit	2010-06-24 12:04:23 UTC (rev 10112)
@@ -1,5 +1,5 @@
 Package: @OLDPACKAGE at -plugin-scmgit
 Architecture: all
-Depends: @OLDPACKAGE at -common, gforge-db-postgresql | gforge-db, gforge-web-apache2 | gforge-web, gforge-shell-postgresql | gforge-shell, git-core, gitweb, php5-cli, ${misc:Depends}
+Depends: @OLDPACKAGE at -common, gforge-db-postgresql | gforge-db, gforge-web-apache2 | gforge-web, gforge-shell-postgresql | gforge-shell, git-core, gitweb (>= 1.7), php5-cli, ${misc:Depends}
 Provides: @OLDPACKAGE at -plugin-scm
 Description: collaborative development tool - Git plugin

Modified: branches/Branch_5_0/gforge/plugins/scmgit/common/GitPlugin.class.php
===================================================================
--- branches/Branch_5_0/gforge/plugins/scmgit/common/GitPlugin.class.php	2010-06-23 21:05:29 UTC (rev 10111)
+++ branches/Branch_5_0/gforge/plugins/scmgit/common/GitPlugin.class.php	2010-06-24 12:04:23 UTC (rev 10112)
@@ -240,9 +240,9 @@
 		fwrite($config_f, "\$projectroot = '$rootdir';\n");
 		fwrite($config_f, "\$projects_list = '$config_dir/gitweb.list';\n");
 		fwrite($config_f, "@git_base_url_list = ('". util_make_url ('/anonscm/git') . "');\n");
-		fwrite($config_f, "\$logo = '". util_make_url ('/plugins/scmgit/gitweb/git-logo.png') . "';\n");
-		fwrite($config_f, "\$favicon = '". util_make_url ('/plugins/scmgit/gitweb/git-favicon.png')."';\n");
-		fwrite($config_f, "\$stylesheet = '". util_make_url ('/plugins/scmgit/gitweb/gitweb.css')."';\n");
+		fwrite($config_f, "\$logo = '". util_make_url ('/plugins/scmgit/git-logo.png') . "';\n");
+		fwrite($config_f, "\$favicon = '". util_make_url ('/plugins/scmgit/git-favicon.png')."';\n");
+		fwrite($config_f, "\$stylesheet = '". util_make_url ('/plugins/scmgit/gitweb.css')."';\n");
 		fwrite($config_f, "\$prevent_xss = 'true';\n");
 		fclose($config_f);
 		chmod ($fname.'.new', 0644) ;




More information about the Fusionforge-commits mailing list