[Fusionforge-commits] FusionForge branch 6.0 updated. v6.0.1-16-g7bf8348

Sylvain Beucler beuc-inria at libremir.placard.fr.eu.org
Thu Jun 25 14:09:50 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  7bf8348806a706600c195be783bfb5d90049f239 (commit)
       via  66a9c861584fb47d9c282f5a102031e398987229 (commit)
       via  7eae1b4a48c488d20f30b78a2156d9eb45ced970 (commit)
       via  942b4218dde91b66484bb65aab726512b24757da (commit)
      from  95c133844639f8b9949703c5b50b1b8520fb2db4 (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=7bf8348806a706600c195be783bfb5d90049f239

commit 7bf8348806a706600c195be783bfb5d90049f239
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Thu Jun 25 14:08:26 2015 +0200

    debian: only introduce replaces+breaks for package with overlapping filesets

diff --git a/src/debian/control.in b/src/debian/control.in
index b24c4c9..d054ecf 100644
--- a/src/debian/control.in
+++ b/src/debian/control.in
@@ -46,8 +46,6 @@ Package: fusionforge-db-local
 Architecture: all
 Provides: fusionforge-db
 Depends: fusionforge-common (=${source:Version}), postgresql, php5-cli, ${misc:Depends}
-Replaces: gforge-db-postgresql (<< 6.0-1~)
-Breaks: gforge-db-postgresql (<< 6.0-1~)
 Description: collaborative development tool - database (using PostgreSQL)
  FusionForge provides many tools to aid collaboration in a
  development project, such as bug-tracking, task management,
@@ -63,8 +61,6 @@ Package: fusionforge-db-remote
 Architecture: all
 Provides: fusionforge-db
 Depends: ${misc:Depends}
-Replaces: gforge-db-remote (<< 6.0-1~)
-Breaks: gforge-db-remote (<< 6.0-1~)
 Description: collaborative development tool - database (remote)
  FusionForge provides many tools to aid collaboration in a
  development project, such as bug-tracking, task management,
@@ -82,8 +78,6 @@ Package: fusionforge-web
 Architecture: all
 Depends: fusionforge-common (=${source:Version}), fusionforge-db, libapache2-mpm-itk | apache2-mpm-itk, php5-cli, libapache2-mod-php5, libphp-simplepie, php-http, php-http-webdav-server, libjs-jquery-livequery, python, poppler-utils, ${misc:Depends}
 Recommends: locales-all, unoconv
-Replaces: gforge-web-apache2 (<< 6.0-1~)
-Breaks: gforge-web-apache2 (<< 6.0-1~)
 Description: collaborative development tool - web part (using Apache)
  FusionForge provides many tools to aid collaboration in a
  development project, such as bug-tracking, task management,
@@ -112,8 +106,6 @@ Description: collaborative development tool - web vhosts (using Apache)
 Package: fusionforge-shell
 Architecture: all
 Depends: fusionforge-common (=${source:Version}), php5-cli, libnss-pgsql2, openssh-server, unscd | nscd, libpam-modules, ucf, ${misc:Depends}
-Replaces: gforge-shell-postgresql (<< 6.0-1~)
-Breaks: gforge-shell-postgresql (<< 6.0-1~)
 Description: collaborative development tool - shell accounts (using PostgreSQL)
  FusionForge provides many tools to aid collaboration in a
  development project, such as bug-tracking, task management,
@@ -144,8 +136,6 @@ Architecture: all
 Depends: fusionforge-common (=${source:Version}), postfix, postfix-pgsql, ${misc:Depends}
 Provides: fusionforge-mta
 Conflicts: fusionforge-mta
-Replaces: gforge-mta-postfix (<< 6.0-1~)
-Breaks: gforge-mta-postfix (<< 6.0-1~)
 Description: collaborative development tool - mail tools (using Postfix)
  FusionForge provides many tools to aid collaboration in a
  development project, such as bug-tracking, task management,
@@ -162,8 +152,6 @@ Architecture: all
 Depends: fusionforge-common (=${source:Version}), exim4-daemon-heavy, ${misc:Depends}
 Provides: fusionforge-mta
 Conflicts: fusionforge-mta
-Replaces: gforge-mta-exim4 (<< 6.0-1~)
-Breaks: gforge-mta-exim4 (<< 6.0-1~)
 Description: collaborative development tool - mail tools (using Exim 4)
  FusionForge provides many tools to aid collaboration in a
  development project, such as bug-tracking, task management,
@@ -178,8 +166,6 @@ Description: collaborative development tool - mail tools (using Exim 4)
 Package: fusionforge-lists
 Architecture: all
 Depends: fusionforge-common (=${source:Version}), php5-cli, fusionforge-mta-postfix | fusionforge-mta, mailman, ${misc:Depends}
-Replaces: gforge-lists-mailman (<< 6.0-1~)
-Breaks: gforge-lists-mailman (<< 6.0-1~)
 Description: collaborative development tool - mailing-lists (using Mailman)
  FusionForge provides many tools to aid collaboration in a
  development project, such as bug-tracking, task management,

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=66a9c861584fb47d9c282f5a102031e398987229

commit 66a9c861584fb47d9c282f5a102031e398987229
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Thu Jun 25 14:07:36 2015 +0200

    debian: fix upgrade conflict on locale files

diff --git a/src/debian/changelog b/src/debian/changelog
index 1f1c43a..fb84de3 100644
--- a/src/debian/changelog
+++ b/src/debian/changelog
@@ -3,6 +3,7 @@ fusionforge (6.0.1-2) UNRELEASED; urgency=medium
   * New upstream snapshot following the stable branch.
   * Silent lintian command-with-path-in-maintainer-script
   * Remove logs on purge (closes: #789801)
+  * Fix upgrade conflict on locale files (closes: #789925)
 
  -- Sylvain Beucler <beuc at debian.org>  Wed, 24 Jun 2015 17:09:24 +0200
 
diff --git a/src/debian/control.in b/src/debian/control.in
index d0daf00..b24c4c9 100644
--- a/src/debian/control.in
+++ b/src/debian/control.in
@@ -29,6 +29,8 @@ 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~)
 Description: collaborative development tool - shared files
  FusionForge provides many tools to aid collaboration in a
  development project, such as bug-tracking, task management,
@@ -44,6 +46,8 @@ Package: fusionforge-db-local
 Architecture: all
 Provides: fusionforge-db
 Depends: fusionforge-common (=${source:Version}), postgresql, php5-cli, ${misc:Depends}
+Replaces: gforge-db-postgresql (<< 6.0-1~)
+Breaks: gforge-db-postgresql (<< 6.0-1~)
 Description: collaborative development tool - database (using PostgreSQL)
  FusionForge provides many tools to aid collaboration in a
  development project, such as bug-tracking, task management,
@@ -59,6 +63,8 @@ Package: fusionforge-db-remote
 Architecture: all
 Provides: fusionforge-db
 Depends: ${misc:Depends}
+Replaces: gforge-db-remote (<< 6.0-1~)
+Breaks: gforge-db-remote (<< 6.0-1~)
 Description: collaborative development tool - database (remote)
  FusionForge provides many tools to aid collaboration in a
  development project, such as bug-tracking, task management,
@@ -76,6 +82,8 @@ Package: fusionforge-web
 Architecture: all
 Depends: fusionforge-common (=${source:Version}), fusionforge-db, libapache2-mpm-itk | apache2-mpm-itk, php5-cli, libapache2-mod-php5, libphp-simplepie, php-http, php-http-webdav-server, libjs-jquery-livequery, python, poppler-utils, ${misc:Depends}
 Recommends: locales-all, unoconv
+Replaces: gforge-web-apache2 (<< 6.0-1~)
+Breaks: gforge-web-apache2 (<< 6.0-1~)
 Description: collaborative development tool - web part (using Apache)
  FusionForge provides many tools to aid collaboration in a
  development project, such as bug-tracking, task management,
@@ -104,6 +112,8 @@ Description: collaborative development tool - web vhosts (using Apache)
 Package: fusionforge-shell
 Architecture: all
 Depends: fusionforge-common (=${source:Version}), php5-cli, libnss-pgsql2, openssh-server, unscd | nscd, libpam-modules, ucf, ${misc:Depends}
+Replaces: gforge-shell-postgresql (<< 6.0-1~)
+Breaks: gforge-shell-postgresql (<< 6.0-1~)
 Description: collaborative development tool - shell accounts (using PostgreSQL)
  FusionForge provides many tools to aid collaboration in a
  development project, such as bug-tracking, task management,
@@ -134,6 +144,8 @@ Architecture: all
 Depends: fusionforge-common (=${source:Version}), postfix, postfix-pgsql, ${misc:Depends}
 Provides: fusionforge-mta
 Conflicts: fusionforge-mta
+Replaces: gforge-mta-postfix (<< 6.0-1~)
+Breaks: gforge-mta-postfix (<< 6.0-1~)
 Description: collaborative development tool - mail tools (using Postfix)
  FusionForge provides many tools to aid collaboration in a
  development project, such as bug-tracking, task management,
@@ -150,6 +162,8 @@ Architecture: all
 Depends: fusionforge-common (=${source:Version}), exim4-daemon-heavy, ${misc:Depends}
 Provides: fusionforge-mta
 Conflicts: fusionforge-mta
+Replaces: gforge-mta-exim4 (<< 6.0-1~)
+Breaks: gforge-mta-exim4 (<< 6.0-1~)
 Description: collaborative development tool - mail tools (using Exim 4)
  FusionForge provides many tools to aid collaboration in a
  development project, such as bug-tracking, task management,
@@ -164,6 +178,8 @@ Description: collaborative development tool - mail tools (using Exim 4)
 Package: fusionforge-lists
 Architecture: all
 Depends: fusionforge-common (=${source:Version}), php5-cli, fusionforge-mta-postfix | fusionforge-mta, mailman, ${misc:Depends}
+Replaces: gforge-lists-mailman (<< 6.0-1~)
+Breaks: gforge-lists-mailman (<< 6.0-1~)
 Description: collaborative development tool - mailing-lists (using Mailman)
  FusionForge provides many tools to aid collaboration in a
  development project, such as bug-tracking, task management,

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=7eae1b4a48c488d20f30b78a2156d9eb45ced970

commit 7eae1b4a48c488d20f30b78a2156d9eb45ced970
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Thu Jun 25 13:50:48 2015 +0200

    Update CHANGES

diff --git a/src/CHANGES b/src/CHANGES
index 9bee37b..b6dbb35 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,6 +1,7 @@
 FusionForge 6.0.2:
-* Mailing lists: fix description encoding depending on Mailman version (Inria & Thorsten Glaser)
 * Accounts: fix elliptic curve ssh keys support (Inria)
+* Mailing lists: fix description encoding depending on Mailman version (Inria & Thorsten Glaser)
+* Mailing lists: fix default list URL path (Inria)
 
 FusionForge 6.0.1:
 * Accounts: accept elliptic curve ssh keys (Unit 193)

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=942b4218dde91b66484bb65aab726512b24757da

commit 942b4218dde91b66484bb65aab726512b24757da
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Thu Jun 25 13:48:55 2015 +0200

    install: remove logs on purge

diff --git a/src/debian/changelog b/src/debian/changelog
index 8d8ee2e..1f1c43a 100644
--- a/src/debian/changelog
+++ b/src/debian/changelog
@@ -2,6 +2,7 @@ fusionforge (6.0.1-2) UNRELEASED; urgency=medium
 
   * New upstream snapshot following the stable branch.
   * Silent lintian command-with-path-in-maintainer-script
+  * Remove logs on purge (closes: #789801)
 
  -- Sylvain Beucler <beuc at debian.org>  Wed, 24 Jun 2015 17:09:24 +0200
 
diff --git a/src/debian/fusionforge-common.postrm b/src/debian/fusionforge-common.postrm
index 0cbb8db..9707fac 100644
--- a/src/debian/fusionforge-common.postrm
+++ b/src/debian/fusionforge-common.postrm
@@ -28,6 +28,8 @@ case "$1" in
 	    ucfr --purge fusionforge-common $i
 	done
 	userdel fusionforge
+	rm -f /var/log/fusionforge/systasksd.stdout
+	rm -f /var/log/fusionforge/systasksd.stderr
 	;;
 
     remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
diff --git a/src/debian/fusionforge-common.postrm b/src/debian/fusionforge-web.postrm
similarity index 83%
copy from src/debian/fusionforge-common.postrm
copy to src/debian/fusionforge-web.postrm
index 0cbb8db..946d9be 100644
--- a/src/debian/fusionforge-common.postrm
+++ b/src/debian/fusionforge-web.postrm
@@ -21,13 +21,8 @@ set -e
 
 case "$1" in
     purge)
-	ucfq fusionforge-common --with-colons \
-	    | while IFS=: read i ignored; do
-	    rm -f $i $i.ucf-*
-	    ucf --purge $i
-	    ucfr --purge fusionforge-common $i
-	done
-	userdel fusionforge
+	rm -f /var/log/fusionforge/access.log
+	rm -f /var/log/fusionforge/awstats.log
 	;;
 
     remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
diff --git a/src/post-install.d/common/systasksd.sh b/src/post-install.d/common/systasksd.sh
index 4999c24..a999d49 100755
--- a/src/post-install.d/common/systasksd.sh
+++ b/src/post-install.d/common/systasksd.sh
@@ -38,6 +38,8 @@ case "$1" in
 	;;
 
     purge)
+	rm -f $(forge_get_config log_path)/systasksd.stdout
+	rm -f $(forge_get_config log_path)/systasksd.stderr
 	;;
 
     *)
diff --git a/src/post-install.d/web/web.sh b/src/post-install.d/web/web.sh
index 70e3ea4..690cfe0 100755
--- a/src/post-install.d/web/web.sh
+++ b/src/post-install.d/web/web.sh
@@ -160,6 +160,9 @@ case "$1" in
 	;;
 
     purge)
+	log_path=$(forge_get_config log_path)
+	rm -f $log_path/access.log
+	rm -f $log_path/awstats.log
 	;;
 
     *)

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

Summary of changes:
 src/CHANGES                                                    |  3 ++-
 src/debian/changelog                                           |  2 ++
 src/debian/control.in                                          |  2 ++
 src/debian/fusionforge-common.postrm                           |  2 ++
 .../{fusionforge-shell.postrm => fusionforge-web.postrm}       | 10 +++-------
 src/post-install.d/common/systasksd.sh                         |  2 ++
 src/post-install.d/web/web.sh                                  |  3 +++
 7 files changed, 16 insertions(+), 8 deletions(-)
 copy src/debian/{fusionforge-shell.postrm => fusionforge-web.postrm} (84%)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list