-- Roland Mas <lolando@debian.org> Mon, 26 Mar 2012 20:10:13 +0200
-fusionforge (5.2~rc2~dev1) UNRELEASED; urgency=low
+fusionforge (5.2~rc2~svn16078) UNRELEASED; urgency=low
+
+ * Properly fix #674536 without messing too much with upstream or other
+ downstream that aren't yet using gitweb >= 1.7.4.1.
+
+ -- Olivier Berger <obergix@debian.org> Tue, 14 Aug 2012 18:03:41 +0200
+
+fusionforge (5.2~rc2~svn16071) UNRELEASED; urgency=low
[ Olivier Berger ]
* Populate new user's shell accounts out of
[ Thorsten Glaser ]
* Merge fusionforge (5.2~rc1wheezy1~exp1) experimental upload
- -- Thorsten Glaser <tg@mirbsd.de> Tue, 07 Aug 2012 13:56:36 +0200
+ -- Olivier Berger <obergix@debian.org> Tue, 14 Aug 2012 15:55:43 +0200
fusionforge (5.2~rc1wheezy1~exp1) experimental; urgency=low
Package: fusionforge-plugin-scmgit
Architecture: all
-Depends: gforge-common, gforge-db-postgresql | gforge-db, gforge-web-apache2 | gforge-web, gforge-shell-postgresql | gforge-shell, git (>= 1:1.7) | git-core, gitweb (>= 1:1.7), php5-cli, ${misc:Depends}
+Depends: gforge-common, gforge-db-postgresql | gforge-db, gforge-web-apache2 | gforge-web, gforge-shell-postgresql | gforge-shell, git (>= 1:1.7) | git-core, gitweb (>= 1:1.7.4.1), php5-cli, ${misc:Depends}
Provides: fusionforge-plugin-scm, gforge-plugin-scmgit
Conflicts: gforge-plugin-scmgit (<< 5.0.51-2)
Replaces: gforge-plugin-scmgit (<< 5.0.51-2)
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/static/git-logo.png') . "';\n");
- fwrite($config_f, "\$favicon = '". util_make_url('/plugins/scmgit/static/git-favicon.png')."';\n");
- fwrite($config_f, "\$stylesheet = '". util_make_url('/plugins/scmgit/static/gitweb.css')."';\n");
- fwrite($config_f, "\$javascript = '". util_make_url('/plugins/scmgit/static/gitweb.js')."';\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, "\$javascript = '". util_make_url('/plugins/scmgit/gitweb.js')."';\n");
fwrite($config_f, "\$prevent_xss = 'true';\n");
fclose($config_f);
chmod ($fname.'.new', 0644) ;
Package: @PACKAGE@-plugin-scmgit
Architecture: all
-Depends: @OLDPACKAGE@-common, @OLDPACKAGE@-db-postgresql | @OLDPACKAGE@-db, @OLDPACKAGE@-web-apache2 | @OLDPACKAGE@-web, @OLDPACKAGE@-shell-postgresql | @OLDPACKAGE@-shell, git (>= 1:1.7) | git-core, gitweb (>= 1:1.7), php5-cli, ${misc:Depends}
+Depends: @OLDPACKAGE@-common, @OLDPACKAGE@-db-postgresql | @OLDPACKAGE@-db, @OLDPACKAGE@-web-apache2 | @OLDPACKAGE@-web, @OLDPACKAGE@-shell-postgresql | @OLDPACKAGE@-shell, git (>= 1:1.7) | git-core, gitweb (>= 1:1.7.4.1), php5-cli, ${misc:Depends}
Provides: @PACKAGE@-plugin-scm, @OLDPACKAGE@-plugin-scmgit
Conflicts: @OLDPACKAGE@-plugin-scmgit (<< 5.0.51-2)
Replaces: @OLDPACKAGE@-plugin-scmgit (<< 5.0.51-2)
usr/share/gforge/plugins/scmgit/cgi-bin
usr/share/gforge/plugins/scmgit/common
usr/share/gforge/plugins/scmgit/www
-usr/share/gforge/www/plugins
+usr/share/gforge/www/plugins/scmgit
var/lib/gforge/chroot/scmrepos/git
/usr/lib/cgi-bin/gitweb.cgi /usr/share/@OLDPACKAGE@/plugins/scmgit/cgi-bin/gitweb.cgi
-/usr/share/gitweb /usr/share/@OLDPACKAGE@/www/plugins/scmgit
-/usr/share/@OLDPACKAGE@/plugins/scmgit/www /usr/share/@OLDPACKAGE@/www/plugins/scmgit
+/usr/share/gitweb/gitweb.cgi /usr/share/@OLDPACKAGE@/www/plugins/scmgit/gitweb.cgi
+/usr/share/gitweb/index.cgi /usr/share/@OLDPACKAGE@/www/plugins/scmgit/index.cgi
+/usr/share/gitweb/static/git-favicon.png /usr/share/@OLDPACKAGE@/www/plugins/scmgit/git-favicon.png
+/usr/share/gitweb/static/git-logo.png /usr/share/@OLDPACKAGE@/www/plugins/scmgit/git-logo.png
+/usr/share/gitweb/static/gitweb.css /usr/share/@OLDPACKAGE@/www/plugins/scmgit/gitweb.css
+/usr/share/gitweb/static/gitweb.js /usr/share/@OLDPACKAGE@/www/plugins/scmgit/gitweb.js