[Fusionforge-commits] FusionForge branch 6.0 updated. 6000bc2924dcf541e2efac9b05cfaf1e7278ebc7

Sylvain Beucler beuc-inria at libremir.placard.fr.eu.org
Thu May 28 15:38:38 CEST 2015


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, 6.0 has been updated
       via  6000bc2924dcf541e2efac9b05cfaf1e7278ebc7 (commit)
      from  11d95ef21e1bb94ad9d04b35a63b195ece079370 (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 6000bc2924dcf541e2efac9b05cfaf1e7278ebc7
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Thu May 28 15:35:59 2015 +0200

    deb/rpm: install fusionforge-scm with the main metapackage + Recommend it in scm* plugins

diff --git a/src/debian/control.in b/src/debian/control.in
index 8e09d94..d0daf00 100644
--- a/src/debian/control.in
+++ b/src/debian/control.in
@@ -12,7 +12,7 @@ Vcs-Browser: https://fusionforge.org/scm/browser.php?group_id=6
 
 Package: fusionforge
 Architecture: all
-Depends: fusionforge-common (=${source:Version}), fusionforge-db-local | fusionforge-db, fusionforge-web, ${misc:Depends}
+Depends: fusionforge-common (=${source:Version}), fusionforge-db-local | fusionforge-db, fusionforge-web, fusionforge-scm, ${misc:Depends}
 Recommends: fusionforge-lists, fusionforge-shell, fusionforge-plugin-scmgit, fusionforge-plugin-scmsvn
 Suggests: fusionforge-web-vhosts, fusionforge-plugin-mediawiki, fusionforge-plugin-moinmoin, fusionforge-plugin-blocks
 Description: collaborative development tool - standard metapackage
diff --git a/src/debian/plugins b/src/debian/plugins
index de4dc91..5f7e6f7 100644
--- a/src/debian/plugins
+++ b/src/debian/plugins
@@ -1,23 +1,30 @@
 Package: fusionforge-plugin-scmgit
 Depends: git, xinetd, rsync
+Recommends: fusionforge-scm
 
 Package: fusionforge-plugin-scmsvn
 Depends: subversion, subversion-tools, viewvc, python, python-pycurl, xinetd, rsync, libapache2-mod-svn
+Recommends: fusionforge-scm
 
 Package: fusionforge-plugin-scmbzr
 Depends: bzr, libapache2-mod-wsgi, loggerhead (>= 1.19~bzr477~), python-pastedeploy
+Recommends: fusionforge-scm
 
 Package: fusionforge-plugin-scmarch
 Depends: tla
+Recommends: fusionforge-scm
 
 Package: fusionforge-plugin-scmcvs
 Depends: php5-cli, cvs, viewvc, libphp-snoopy, openbsd-inetd | inet-superserver, update-inetd, libipc-run-perl, liburi-perl, ${perl:Depends}
+Recommends: fusionforge-scm
 
 Package: fusionforge-plugin-scmdarcs
 Depends: fusionforge-shell, darcs, darcsweb
+Recommends: fusionforge-scm
 
 Package: fusionforge-plugin-scmhg
 Depends: fusionforge-shell-postgresql, mercurial
+Recommends: fusionforge-scm
 
 Package: fusionforge-plugin-mediawiki
 Depends: php5-cli, mediawiki (>= 1:1.19.1-2~exp2)
diff --git a/src/rpm/fusionforge.spec.in b/src/rpm/fusionforge.spec.in
index ab1e01c..b5dc5ef 100644
--- a/src/rpm/fusionforge.spec.in
+++ b/src/rpm/fusionforge.spec.in
@@ -9,7 +9,7 @@ BuildArch: noarch
 License: GPLv2+ and MIT
 URL: http://www.fusionforge.org/
 Source0: http://fusionforge.org/frs/download.php/file/XX/%{name}- at tarball_version@.tar.bz2
-Requires: %{name}-db-local = %{version}-%{release}, %{name}-web = %{version}-%{release}
+Requires: %{name}-db-local = %{version}-%{release}, %{name}-web = %{version}-%{release}, %{name}-scm = %{version}-%{release}
 Provides: bundled(jquery) = 1.10.2, bundled(jquery-ui) = 1.10.4
 
 %description

-----------------------------------------------------------------------

Summary of changes:
 src/debian/control.in       | 2 +-
 src/debian/plugins          | 7 +++++++
 src/rpm/fusionforge.spec.in | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/debian/control.in b/src/debian/control.in
index 8e09d94..d0daf00 100644
--- a/src/debian/control.in
+++ b/src/debian/control.in
@@ -12,7 +12,7 @@ Vcs-Browser: https://fusionforge.org/scm/browser.php?group_id=6
 
 Package: fusionforge
 Architecture: all
-Depends: fusionforge-common (=${source:Version}), fusionforge-db-local | fusionforge-db, fusionforge-web, ${misc:Depends}
+Depends: fusionforge-common (=${source:Version}), fusionforge-db-local | fusionforge-db, fusionforge-web, fusionforge-scm, ${misc:Depends}
 Recommends: fusionforge-lists, fusionforge-shell, fusionforge-plugin-scmgit, fusionforge-plugin-scmsvn
 Suggests: fusionforge-web-vhosts, fusionforge-plugin-mediawiki, fusionforge-plugin-moinmoin, fusionforge-plugin-blocks
 Description: collaborative development tool - standard metapackage
diff --git a/src/debian/plugins b/src/debian/plugins
index de4dc91..5f7e6f7 100644
--- a/src/debian/plugins
+++ b/src/debian/plugins
@@ -1,23 +1,30 @@
 Package: fusionforge-plugin-scmgit
 Depends: git, xinetd, rsync
+Recommends: fusionforge-scm
 
 Package: fusionforge-plugin-scmsvn
 Depends: subversion, subversion-tools, viewvc, python, python-pycurl, xinetd, rsync, libapache2-mod-svn
+Recommends: fusionforge-scm
 
 Package: fusionforge-plugin-scmbzr
 Depends: bzr, libapache2-mod-wsgi, loggerhead (>= 1.19~bzr477~), python-pastedeploy
+Recommends: fusionforge-scm
 
 Package: fusionforge-plugin-scmarch
 Depends: tla
+Recommends: fusionforge-scm
 
 Package: fusionforge-plugin-scmcvs
 Depends: php5-cli, cvs, viewvc, libphp-snoopy, openbsd-inetd | inet-superserver, update-inetd, libipc-run-perl, liburi-perl, ${perl:Depends}
+Recommends: fusionforge-scm
 
 Package: fusionforge-plugin-scmdarcs
 Depends: fusionforge-shell, darcs, darcsweb
+Recommends: fusionforge-scm
 
 Package: fusionforge-plugin-scmhg
 Depends: fusionforge-shell-postgresql, mercurial
+Recommends: fusionforge-scm
 
 Package: fusionforge-plugin-mediawiki
 Depends: php5-cli, mediawiki (>= 1:1.19.1-2~exp2)
diff --git a/src/rpm/fusionforge.spec.in b/src/rpm/fusionforge.spec.in
index ab1e01c..b5dc5ef 100644
--- a/src/rpm/fusionforge.spec.in
+++ b/src/rpm/fusionforge.spec.in
@@ -9,7 +9,7 @@ BuildArch: noarch
 License: GPLv2+ and MIT
 URL: http://www.fusionforge.org/
 Source0: http://fusionforge.org/frs/download.php/file/XX/%{name}- at tarball_version@.tar.bz2
-Requires: %{name}-db-local = %{version}-%{release}, %{name}-web = %{version}-%{release}
+Requires: %{name}-db-local = %{version}-%{release}, %{name}-web = %{version}-%{release}, %{name}-scm = %{version}-%{release}
 Provides: bundled(jquery) = 1.10.2, bundled(jquery-ui) = 1.10.4
 
 %description


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list