[Fusionforge-commits] r7497 - in trunk: . gforge/debian

Roland Mas lolando at libremir.placard.fr.eu.org
Tue Apr 28 15:58:06 CEST 2009


Author: lolando
Date: 2009-04-28 15:58:05 +0200 (Tue, 28 Apr 2009)
New Revision: 7497

Modified:
   trunk/
   trunk/gforge/debian/changelog
   trunk/gforge/debian/control
Log:
Merged from 4.8: disabled scmbzr until it's ready


Property changes on: trunk
___________________________________________________________________
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,7355,7365-7366,7375-7376,7378,7395,7423-7426,7435,7458
/branches/Branch_4_8:7334-7335,7344-7345,7382,7387,7389-7390,7396,7398,7401-7402,7428-7429,7437,7440,7443,7449-7455,7459,7462,7466,7469-7470

   + /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,7395,7423-7426,7435,7458
/branches/Branch_4_8:7334-7335,7344-7345,7382,7387,7389-7390,7396,7398,7401-7402,7428-7429,7437,7440,7443,7449-7455,7459,7462,7466,7469-7470,7476

Modified: svk:merge
   - 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7001
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7012
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7291
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7458
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7335
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7344
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7345
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7396
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7402
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7455
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7459
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7469
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7470

   + 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7001
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7012
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7291
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7458
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7335
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7344
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7345
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7396
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7402
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7455
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7459
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7469
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7470
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7476


Modified: trunk/gforge/debian/changelog
===================================================================
--- trunk/gforge/debian/changelog	2009-04-28 13:55:31 UTC (rev 7496)
+++ trunk/gforge/debian/changelog	2009-04-28 13:58:05 UTC (rev 7497)
@@ -7,13 +7,12 @@
   * Use dh_install instead of copy in rules
 
   [ Roland Mas ]
-  * New package: gforge-plugin-scmbzr (not complete yet!).
   * Fixed a bunch of lintian warnings.
   * Added logrotate configuration file for vhosts access logs.
   * Fixed blackhole syntax for gforge-mta-exim4 so as not to require
     file_transport.
 
- -- Roland Mas <lolando at debian.org>  Wed, 08 Apr 2009 20:50:20 +0200
+ -- Roland Mas <lolando at debian.org>  Fri, 24 Apr 2009 13:45:45 +0200
 
 gforge (4.7.2-7+1) unstable; urgency=low
 

Modified: trunk/gforge/debian/control
===================================================================
--- trunk/gforge/debian/control	2009-04-28 13:55:31 UTC (rev 7496)
+++ trunk/gforge/debian/control	2009-04-28 13:58:05 UTC (rev 7497)
@@ -214,20 +214,20 @@
  each FusionForge project to have its own Subversion repository, and gives
  some control over it to the project's administrator.
 
-Package: gforge-plugin-scmbzr
-Architecture: all
-Depends: gforge-common, gforge-db-postgresql | gforge-db, gforge-web-apache2 | gforge-web, gforge-shell-postgresql | gforge-shell, bzr, php5-cli, ${misc:Depends}
-Provides: gforge-plugin-scm
-Description: collaborative development tool - Bazaar plugin
- FusionForge provides many tools to aid collaboration in a
- development project, such as bug-tracking, task management,
- mailing-lists, SCM repository, forums, support request helper,
- web/FTP hosting, release management, etc. All these services are
- integrated into one web site and managed through a web interface.
- .
- This plugin contains the Bazaar subsystem of FusionForge. It allows each
- FusionForge project to have its own Bazaar repository, and gives some control
- over it to the project's administrator.
+# Package: gforge-plugin-scmbzr
+# Architecture: all
+# Depends: gforge-common, gforge-db-postgresql | gforge-db, gforge-web-apache2 | gforge-web, gforge-shell-postgresql | gforge-shell, bzr, php5-cli, ${misc:Depends}
+# Description: collaborative development tool - Bazaar plugin
+#  FusionForge provides many tools to aid collaboration in a
+#  development project, such as bug-tracking, task management,
+#  mailing-lists, SCM repository, forums, support request helper,
+#  web/FTP hosting, release management, etc. All these services are
+#  integrated into one web site and managed through a web interface.
+#  .
+#  This plugin contains the Bazaar subsystem of FusionForge. It allows each
+#  FusionForge project to have its own Bazaar repository, and gives some control
+#  over it to the project's administrator.
+# Provides: gforge-plugin-scm
 
 Package: gforge-plugin-mediawiki
 Architecture: all




More information about the Fusionforge-commits mailing list