[Fusionforge-commits] FusionForge branch master updated. bd19faee0c04363a4da37a13f31ca6b789deb7bb
Roland Mas
lolando at fusionforge.org
Tue Jan 7 11:41:13 CET 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via bd19faee0c04363a4da37a13f31ca6b789deb7bb (commit)
via 28493a6449cf9f34de5b90691c3a38dc944be6b0 (commit)
via b9c5732169d819f7ff022d5ed53ae2b54c78929e (commit)
via 95a707f487f98a16f64fdcf2e4c4473e5f671679 (commit)
via 64b37021a9689a667497a5406e2371b7dbabf379 (commit)
from 6daab6d9daeab6d060a84dc9ec1e3f2d53bdfc71 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit bd19faee0c04363a4da37a13f31ca6b789deb7bb
Merge: 6daab6d 28493a6
Author: Roland Mas <lolando at debian.org>
Date: Tue Jan 7 11:40:40 2014 +0100
Merged from 5.2: two Debian-specific bugfixes
diff --cc src/packaging/install/common
index 83110f4,257baf6..3e479fb
--- a/src/packaging/install/common
+++ b/src/packaging/install/common
@@@ -2,39 -2,34 +2,40 @@@ etc/config.ini-fhs
etc/config.ini.d/defaults.ini etc/@PACKAGE@/config.ini.d/
etc/config.ini.d/debug.ini etc/@PACKAGE@/config.ini.d/
etc/config.ini.d/zzzz-local.ini etc/@PACKAGE@/config.ini.d/
+ etc/custom etc/@PACKAGE@/
deb-specific/cvssh bin/
#
-deb-specific/install-chroot.sh usr/share/@OLDPACKAGE@/bin/
-deb-specific/install-ssh.sh usr/share/@OLDPACKAGE@/bin/
-utils/include.pl usr/share/@OLDPACKAGE@/lib/
-utils/forge_get_config usr/share/@OLDPACKAGE@/bin/
-utils/forge_run_job usr/share/@OLDPACKAGE@/bin/
-utils/forge_run_plugin_job usr/share/@OLDPACKAGE@/bin/
-utils/migrate-to-ini-files.sh usr/share/@OLDPACKAGE@/bin/
-#
-deb-specific/user_dump_update.pl usr/share/@OLDPACKAGE@/bin/
-deb-specific/group_dump_update.pl usr/share/@OLDPACKAGE@/bin/
-#cronjobs/cvs-cron/default_page.php usr/share/@OLDPACKAGE@/cronjobs/
-deb-specific/ssh_dump_update.pl usr/share/@OLDPACKAGE@/bin/
-deb-specific/mailfwd_update.pl usr/share/@OLDPACKAGE@/bin/
-#
-deb-specific/update-user-group-ssh.sh usr/share/@OLDPACKAGE@/bin/
-#
-common usr/share/@OLDPACKAGE@/
-cronjobs/create_scm_repos.php usr/share/@OLDPACKAGE@/cronjobs/
-cronjobs/gather_scm_stats.php usr/share/@OLDPACKAGE@/cronjobs/
-cronjobs/generate_scm_snapshots.php usr/share/@OLDPACKAGE@/cronjobs/
+deb-specific/install-chroot.sh @BINARY_PATH@/
+deb-specific/install-ssh.sh @BINARY_PATH@/
+utils/include.pl @SOURCE_PATH@/lib/
+utils/forge_get_config @BINARY_PATH@/
+utils/forge_run_job @BINARY_PATH@/
+utils/forge_run_plugin_job @BINARY_PATH@/
+utils/migrate-to-ini-files.sh @BINARY_PATH@/
+#
+deb-specific/user_dump_update.pl @BINARY_PATH@/
+deb-specific/group_dump_update.pl @BINARY_PATH@/
+#cronjobs/cvs-cron/default_page.php @SOURCE_PATH@/cronjobs/
+deb-specific/ssh_dump_update.pl @BINARY_PATH@/
+deb-specific/mailfwd_update.pl @BINARY_PATH@/
+#
+deb-specific/update-user-group-ssh.sh @BINARY_PATH@/
+#
+common @SOURCE_PATH@/
+cronjobs/create_scm_repos.php @SOURCE_PATH@/cronjobs/
+cronjobs/gather_scm_stats.php @SOURCE_PATH@/cronjobs/
+cronjobs/generate_scm_snapshots.php @SOURCE_PATH@/cronjobs/
locales/* usr/share/locale/
#
-plugins/authbuiltin/common usr/share/@OLDPACKAGE@/plugins/authbuiltin/
-plugins/authbuiltin/www usr/share/@OLDPACKAGE@/plugins/authbuiltin/
+plugins/authbuiltin/common @PLUGIN_PATH@/authbuiltin/
+plugins/authbuiltin/www @PLUGIN_PATH@/authbuiltin/
plugins/authbuiltin/etc/*.ini etc/@PACKAGE@/config.ini.d/
#
-utils/list-admins.php usr/share/@OLDPACKAGE@/bin/
-utils/list-projects-using-plugin.php usr/share/@OLDPACKAGE@/bin/
+utils/list-admins.php @BINARY_PATH@/
+utils/list-projects-using-plugin.php @BINARY_PATH@/
+utils/update-all-in-sysauth.php @BINARY_PATH@/
+#
+utils/forge_wrapper @BINARY_PATH@/
+#
+# plugins/sysauthpgsql/common usr/share/@OLDPACKAGE@/plugins/sysauthpgsql/
+# plugins/sysauthpgsql/etc/*.ini etc/@PACKAGE@/config.ini.d/
diff --cc src/packaging/links/common
index 7ab563e,6215dd1..99f1a76
--- a/src/packaging/links/common
+++ b/src/packaging/links/common
@@@ -1,8 -1,5 +1,9 @@@
-/usr/share/@OLDPACKAGE@/common/include/database-pgsql.php /usr/share/@OLDPACKAGE@/common/include/database.php
-/etc/@PACKAGE@/config.ini /etc/@OLDPACKAGE@/config.ini
-/etc/@PACKAGE@/config.ini.d /etc/@OLDPACKAGE@/config.ini.d
-/etc/@PACKAGE@/custom /etc/@OLDPACKAGE@/custom
-/usr/share/@OLDPACKAGE@/plugins/authbuiltin/www /usr/share/@OLDPACKAGE@/www/plugins/authbuiltin
+ at SOURCE_PATH@/common/include/database-pgsql.php @SOURCE_PATH@/common/include/database.php
+/etc/@PACKAGE@/config.ini @CONFIG_PATH@/config.ini
+/etc/@PACKAGE@/config.ini.d @CONFIG_PATH@/config.ini.d
++/etc/@PACKAGE@/custom @CONFIG_PATH@/custom
+ at PLUGIN_PATH@/authbuiltin/www @SOURCE_PATH@/www/plugins/authbuiltin
+
+ at BINARY_PATH@/forge_wrapper usr/bin/forge_get_config
+ at BINARY_PATH@/forge_wrapper usr/bin/forge_run_job
+ at BINARY_PATH@/forge_wrapper usr/bin/forge_run_plugin_job
-----------------------------------------------------------------------
Summary of changes:
src/deb-specific/group_dump_update.pl | 30 +++++++++++++++++++++++------
src/deb-specific/update-user-group-ssh.sh | 2 +-
src/etc/custom/project_default_page.html | 14 ++++++++++++++
src/packaging/install/common | 1 +
src/packaging/links/common | 1 +
5 files changed, 41 insertions(+), 7 deletions(-)
create mode 100644 src/etc/custom/project_default_page.html
hooks/post-receive
--
FusionForge
More information about the Fusionforge-commits
mailing list