[Fusionforge-commits] FusionForge branch 6.0 updated. v6.0.2-6-g71213ad

Sylvain Beucler beuc-inria at libremir.placard.fr.eu.org
Tue Jul 7 12:08:30 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  71213adfb6696954de71fb6def54329473604a09 (commit)
      from  518fa7d2e2bf16bb9c80d665c99b29124ca075c0 (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 -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=71213adfb6696954de71fb6def54329473604a09

commit 71213adfb6696954de71fb6def54329473604a09
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue Jul 7 11:45:39 2015 +0200

    debian: fix upgrade conflict on /usr/bin/forge_make_admin

diff --git a/src/debian/changelog b/src/debian/changelog
index 906ef65..541d347 100644
--- a/src/debian/changelog
+++ b/src/debian/changelog
@@ -1,8 +1,9 @@
-fusionforge (6.0.2-2) UNRELEASED; urgency=medium
+fusionforge (6.0.2+20150707-1) unstable; urgency=medium
 
-  * New upstream XXX
+  * New upstream snapshot following the 6.0 stable branch.
+  * Fix upgrade conflict on /usr/bin/forge_make_admin (closes: #791619)
 
- -- Sylvain Beucler <beuc at debian.org>  Thu, 02 Jul 2015 16:24:19 +0200
+ -- Sylvain Beucler <beuc at debian.org>  Tue, 07 Jul 2015 11:32:19 +0200
 
 fusionforge (6.0.2-1) unstable; urgency=medium
 
diff --git a/src/debian/control.in b/src/debian/control.in
index d054ecf..89cf2b1 100644
--- a/src/debian/control.in
+++ b/src/debian/control.in
@@ -29,8 +29,11 @@ Description: collaborative development tool - standard metapackage
 Package: fusionforge-common
 Architecture: all
 Depends: php5-cli, php5-pgsql, php-htmlpurifier, cron, ucf, ${misc:Depends}
-Replaces: gforge-common (<< 6.0-1~)
-Breaks: gforge-common (<< 6.0-1~)
+# Handle conflicts with files in old packages:
+# gforge-common -> /usr/share/locale/XX/LC_MESSAGES/fusionforge.mo
+# gforge-db-postgresql -> /usr/bin/forge_make_admin & forge_set_password
+Replaces: gforge-common (<< 6.0-1~), gforge-db-postgresql (<< 6.0-1~)
+Breaks: gforge-common (<< 6.0-1~), gforge-db-postgresql (<< 6.0-1~)
 Description: collaborative development tool - shared files
  FusionForge provides many tools to aid collaboration in a
  development project, such as bug-tracking, task management,

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

Summary of changes:
 src/debian/changelog  | 7 ++++---
 src/debian/control.in | 7 +++++--
 2 files changed, 9 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list