[Fusionforge-commits] r7382 - in branches/Branch_4_8: . gforge/deb-specific gforge/debian gforge/translations gforge/utils gforge/www/project/stats gforge/www/soap/docman

Roland Mas lolando at libremir.placard.fr.eu.org
Wed Apr 8 20:48:33 CEST 2009


Author: lolando
Date: 2009-04-08 20:48:33 +0200 (Wed, 08 Apr 2009)
New Revision: 7382

Modified:
   branches/Branch_4_8/
   branches/Branch_4_8/gforge/deb-specific/install-chroot.sh
   branches/Branch_4_8/gforge/debian/changelog
   branches/Branch_4_8/gforge/debian/gforge-dns-bind9.postinst
   branches/Branch_4_8/gforge/translations/fr.po
   branches/Branch_4_8/gforge/utils/include.pl
   branches/Branch_4_8/gforge/www/project/stats/index.php
   branches/Branch_4_8/gforge/www/soap/docman/docman.php
Log:
Merged from 4.7: mostly packaging fixes (as well as stuff already
committed on 4.8)



Property changes on: branches/Branch_4_8
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/Branch_4_7:6879,6881,6884,6897,6899,6902,6904,6906,6909,6911,6922,6932,6936,6939,6942,6944,6946-6948,6954,6956,6959,7000-7001,7012,7111,7130-7131,7133-7134,7138,7140-7142,7147-7148,7159-7160,7163,7168,7177,7179,7203,7205,7207,7210,7212,7251-7253,7255,7284,7287,7291,7293,7295-7296,7300
   + /branches/Branch_4_7:6879,6881,6884,6897,6899,6902,6904,6906,6909,6911,6922,6932,6936,6939,6942,6944,6946-6948,6954,6956,6959,7000-7001,7012,7111,7130-7131,7133-7134,7138,7140-7142,7147-7148,7159-7160,7163,7168,7177,7179,7203,7205,7207,7210,7212,7251-7253,7255,7284,7287,7291,7293,7295-7296,7300,7355,7365-7366,7375-7376,7378


Modified: branches/Branch_4_8/gforge/deb-specific/install-chroot.sh
===================================================================
--- branches/Branch_4_8/gforge/deb-specific/install-chroot.sh	2009-04-08 18:43:15 UTC (rev 7381)
+++ branches/Branch_4_8/gforge/deb-specific/install-chroot.sh	2009-04-08 18:48:33 UTC (rev 7382)
@@ -158,8 +158,9 @@
 root:x:0:0:Root:/:/bin/bash
 nobody:x:65534:65534:nobody:/:/bin/false
 FIN
-getent passwd sshd | sed "s:$CHROOTDIR::g" >> $CHROOTDIR/etc/passwd
-getent passwd scm-gforge | sed "s:$CHROOTDIR::g" >> $CHROOTDIR/etc/passwd
+	getent passwd sshd | sed "s:$CHROOTDIR::g" >> $CHROOTDIR/etc/passwd
+	getent passwd scm-gforge | sed "s:$CHROOTDIR::g" >> $CHROOTDIR/etc/passwd
+	getent passwd anonscm-gforge | sed "s:$CHROOTDIR::g" >> $CHROOTDIR/etc/passwd
 	cat > $CHROOTDIR/etc/shadow <<-FIN
 root:*:11142:0:99999:7:::
 nobody:*:11142:0:99999:7:::

Modified: branches/Branch_4_8/gforge/debian/changelog
===================================================================
--- branches/Branch_4_8/gforge/debian/changelog	2009-04-08 18:43:15 UTC (rev 7381)
+++ branches/Branch_4_8/gforge/debian/changelog	2009-04-08 18:48:33 UTC (rev 7382)
@@ -13,6 +13,22 @@
 
  -- Roland Mas <lolando at debian.org>  Fri, 03 Apr 2009 11:45:28 +0200
 
+gforge (4.7.2-5+2) experimental; urgency=low
+
+  * Use Unix sockets to connect to the DB in the Perl scripts.
+  * Added db_stop to fix gforge-dns-bind9's postinst script from hanging.
+  * Also create anonscm-gforge user in the chroot, not only scm-gforge.
+
+ -- Roland Mas <lolando at debian.org>  Wed, 08 Apr 2009 17:42:15 +0200
+
+gforge (4.7.2-5) experimental; urgency=low
+
+  * Small tweak in fr.po to fix links to statistics and project reporting
+    pages from the project summary page.
+  * Fixed project reporting graphs.
+
+ -- Roland Mas <lolando at debian.org>  Tue, 07 Apr 2009 18:54:09 +0200
+
 gforge (4.7.2-4) experimental; urgency=low
 
   * Quick fix for a bug in uploading attachments to forum posts.  A proper

Modified: branches/Branch_4_8/gforge/debian/gforge-dns-bind9.postinst
===================================================================
--- branches/Branch_4_8/gforge/debian/gforge-dns-bind9.postinst	2009-04-08 18:43:15 UTC (rev 7381)
+++ branches/Branch_4_8/gforge/debian/gforge-dns-bind9.postinst	2009-04-08 18:48:33 UTC (rev 7382)
@@ -34,6 +34,8 @@
 	ucf --debconf-ok /etc/bind/named.conf.gforge-new /etc/bind/named.conf
 	rm /etc/bind/named.conf.gforge-new
 
+	db_stop
+
 	# Create the DNS zone
 	/usr/share/gforge/bin/install-dns.sh configure
     ;;

Modified: branches/Branch_4_8/gforge/www/project/stats/index.php
===================================================================
--- branches/Branch_4_8/gforge/www/project/stats/index.php	2009-04-08 18:43:15 UTC (rev 7381)
+++ branches/Branch_4_8/gforge/www/project/stats/index.php	2009-04-08 18:48:33 UTC (rev 7382)
@@ -40,6 +40,13 @@
 
 site_project_header(array('title'=>_('Project Activity').' '.$group->getPublicName(),'group'=>$group_id,'toptab'=>'home'));
 
+if (($area != 'tracker')
+    && ($area != 'forum')
+    && ($area != 'docman')
+    && ($area != 'taskman')
+    && ($area != 'downloads')) {
+	$area = 'tracker' ;
+} ;
 if ($SPAN && !is_numeric($SPAN)) { $SPAN = 1; }
 if ($start && !is_numeric($start)) { $start = false; }
 if ($end && !is_numeric($end)) { $end = false; }




More information about the Fusionforge-commits mailing list