[Fusionforge-commits] r16079 - in branches/Branch_5_2/src: debian plugins/scmgit/packaging/control plugins/scmgit/packaging/dirs plugins/scmgit/packaging/links

Olivier Berger olberger at fusionforge.org
Tue Aug 14 19:07:06 CEST 2012


Author: olberger
Date: 2012-08-14 19:07:05 +0200 (Tue, 14 Aug 2012)
New Revision: 16079

Modified:
   branches/Branch_5_2/src/debian/changelog
   branches/Branch_5_2/src/debian/control
   branches/Branch_5_2/src/plugins/scmgit/packaging/control/133plugin-scmgit
   branches/Branch_5_2/src/plugins/scmgit/packaging/dirs/plugin-scmgit
   branches/Branch_5_2/src/plugins/scmgit/packaging/links/plugin-scmgit
Log:
Try and adjust so that upstream isn't forced to use recent versions of gitweb while wheezy is fine

Modified: branches/Branch_5_2/src/debian/changelog
===================================================================
--- branches/Branch_5_2/src/debian/changelog	2012-08-14 16:01:47 UTC (rev 16078)
+++ branches/Branch_5_2/src/debian/changelog	2012-08-14 17:07:05 UTC (rev 16079)
@@ -1,3 +1,10 @@
+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 at debian.org>  Tue, 14 Aug 2012 18:03:41 +0200
+
 fusionforge (5.2~rc2~svn16071) UNRELEASED; urgency=low
 
   [ Olivier Berger ]

Modified: branches/Branch_5_2/src/debian/control
===================================================================
--- branches/Branch_5_2/src/debian/control	2012-08-14 16:01:47 UTC (rev 16078)
+++ branches/Branch_5_2/src/debian/control	2012-08-14 17:07:05 UTC (rev 16079)
@@ -609,7 +609,7 @@
 
 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)

Modified: branches/Branch_5_2/src/plugins/scmgit/packaging/control/133plugin-scmgit
===================================================================
--- branches/Branch_5_2/src/plugins/scmgit/packaging/control/133plugin-scmgit	2012-08-14 16:01:47 UTC (rev 16078)
+++ branches/Branch_5_2/src/plugins/scmgit/packaging/control/133plugin-scmgit	2012-08-14 17:07:05 UTC (rev 16079)
@@ -1,6 +1,6 @@
 Package: @PACKAGE at -plugin-scmgit
 Architecture: all
-Depends: @OLDPACKAGE at -common, @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -db, @OLDPACKAGE at -web-apache2 | @OLDPACKAGE at -web, @OLDPACKAGE at -shell-postgresql | @OLDPACKAGE at -shell, git (>= 1:1.7) | git-core, gitweb (>= 1:1.7), php5-cli, ${misc:Depends}
+Depends: @OLDPACKAGE at -common, @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -db, @OLDPACKAGE at -web-apache2 | @OLDPACKAGE at -web, @OLDPACKAGE at -shell-postgresql | @OLDPACKAGE at -shell, git (>= 1:1.7) | git-core, gitweb (>= 1:1.7.4.1), php5-cli, ${misc:Depends}
 Provides: @PACKAGE at -plugin-scm, @OLDPACKAGE at -plugin-scmgit
 Conflicts: @OLDPACKAGE at -plugin-scmgit (<< 5.0.51-2)
 Replaces: @OLDPACKAGE at -plugin-scmgit (<< 5.0.51-2)

Modified: branches/Branch_5_2/src/plugins/scmgit/packaging/dirs/plugin-scmgit
===================================================================
--- branches/Branch_5_2/src/plugins/scmgit/packaging/dirs/plugin-scmgit	2012-08-14 16:01:47 UTC (rev 16078)
+++ branches/Branch_5_2/src/plugins/scmgit/packaging/dirs/plugin-scmgit	2012-08-14 17:07:05 UTC (rev 16079)
@@ -3,5 +3,5 @@
 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

Modified: branches/Branch_5_2/src/plugins/scmgit/packaging/links/plugin-scmgit
===================================================================
--- branches/Branch_5_2/src/plugins/scmgit/packaging/links/plugin-scmgit	2012-08-14 16:01:47 UTC (rev 16078)
+++ branches/Branch_5_2/src/plugins/scmgit/packaging/links/plugin-scmgit	2012-08-14 17:07:05 UTC (rev 16079)
@@ -1,3 +1,7 @@
 /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




More information about the Fusionforge-commits mailing list