[Fusionforge-commits] FusionForge branch 6.0 updated. v6.0.2-36-g169a7ea

Sylvain Beucler beuc-inria at libremir.placard.fr.eu.org
Tue Sep 1 12:25:19 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  169a7ea751717b2dd51356c28af5755de69d597a (commit)
       via  987fad1f8611628a1f485fb51fa29aea72b31e1d (commit)
       via  9a804d192f9bb74438eb03390dcb51a7f92ad774 (commit)
      from  a55b46ae537436da176f96b9b914ed8b4442710d (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=169a7ea751717b2dd51356c28af5755de69d597a

commit 169a7ea751717b2dd51356c28af5755de69d597a
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue Sep 1 12:24:17 2015 +0200

    Introduce Debian-specific behavior to stop and start services

diff --git a/src/debian/changelog b/src/debian/changelog
index d4b43dc..701a82b 100644
--- a/src/debian/changelog
+++ b/src/debian/changelog
@@ -1,3 +1,10 @@
+fusionforge (6.0.2+20150901-1) unstable; urgency=medium
+
+  * New upstream snapshot following the 6.0 stable branch
+  * Introduce Debian-specific behavior to stop and start services (closes: #789778)
+
+ -- Sylvain Beucler <beuc at debian.org>  Tue, 01 Sep 2015 12:22:22 +0200
+
 fusionforge (6.0.2+20150708-1) unstable; urgency=medium
 
   * New upstream snapshot following the 6.0 stable branch
diff --git a/src/post-install.d/common/plugin.sh b/src/post-install.d/common/plugin.sh
index c71ea80..175b15a 100755
--- a/src/post-install.d/common/plugin.sh
+++ b/src/post-install.d/common/plugin.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (C) 2014  Inria (Sylvain Beucler)
+# Copyright (C) 2014, 2015  Inria (Sylvain Beucler)
 #
 # This file is part of FusionForge. FusionForge is free software;
 # you can redistribute it and/or modify it under the terms of the
@@ -17,6 +17,8 @@
 # with FusionForge; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+source $(forge_get_config source_path)/post-install.d/common/service.inc
+
 source_path=$(forge_get_config source_path)
 config_path=$(forge_get_config config_path)
 apache_service=$(forge_get_config apache_service)
diff --git a/src/post-install.d/common/systasksd.sh b/src/post-install.d/common/service.inc
old mode 100755
new mode 100644
similarity index 51%
copy from src/post-install.d/common/systasksd.sh
copy to src/post-install.d/common/service.inc
index deccfb1..0983a92
--- a/src/post-install.d/common/systasksd.sh
+++ b/src/post-install.d/common/service.inc
@@ -1,7 +1,6 @@
 #!/bin/bash
-# Start systasksd on boot
-#
-# Copyright (C) 2014  Inria (Sylvain Beucler)
+# 
+# Copyright (C) 2015  Inria (Sylvain Beucler)
 #
 # This file is part of FusionForge. FusionForge is free software;
 # you can redistribute it and/or modify it under the terms of the
@@ -18,33 +17,21 @@
 # with FusionForge; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-case "$1" in
-    configure)
-	if [ -x /sbin/chkconfig ]; then
-	    chkconfig fusionforge-systasksd on
-	else
-	    update-rc.d fusionforge-systasksd defaults
-	fi
-	# not 'start' as systemd will no-op if systasksd started and exited
-	service fusionforge-systasksd restart
-	;;
-
-    remove)
-	service fusionforge-systasksd stop
-	if [ -x /sbin/chkconfig ]; then
-	    chkconfig --del fusionforge-systasksd
-	else
-	    update-rc.d fusionforge-systasksd remove
+# Debian-specific behavior for Policy Nazis
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=789778
+if [ -e /etc/debian_version ]; then
+    function service {
+	invoke-rc.d $@
+	ret=$?
+	if [ $ret -ne 0 ]; then
+	    # Work-around invoke-rc.d's silence on error..
+	    echo "invoke-rc.d: error $ret running '$@'"
+	    return $ret
 	fi
-	;;
-
-    purge)
-	rm -f $(forge_get_config log_path)/systasksd.stdout
-	rm -f $(forge_get_config log_path)/systasksd.stderr
-	;;
+    }
+fi
 
-    *)
-	echo "Usage: $0 {configure|remove}"
-	exit 1
-	;;
-esac
+# Tests:
+set -e
+service idontexist start || echo OK
+service cron restart && echo OK
diff --git a/src/post-install.d/common/systasksd.sh b/src/post-install.d/common/systasksd.sh
index deccfb1..d93b3bd 100755
--- a/src/post-install.d/common/systasksd.sh
+++ b/src/post-install.d/common/systasksd.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Start systasksd on boot
 #
-# Copyright (C) 2014  Inria (Sylvain Beucler)
+# Copyright (C) 2014, 2015  Inria (Sylvain Beucler)
 #
 # This file is part of FusionForge. FusionForge is free software;
 # you can redistribute it and/or modify it under the terms of the
@@ -18,6 +18,8 @@
 # with FusionForge; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+source $(forge_get_config source_path)/post-install.d/common/service.inc
+
 case "$1" in
     configure)
 	if [ -x /sbin/chkconfig ]; then
diff --git a/src/post-install.d/db/populate.sh b/src/post-install.d/db/populate.sh
index 8585013..cc16c6f 100755
--- a/src/post-install.d/db/populate.sh
+++ b/src/post-install.d/db/populate.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -e
 # Create user and database, and import initial data
 #
-# Copyright (C) 2014  Inria (Sylvain Beucler)
+# Copyright (C) 2014, 2015  Inria (Sylvain Beucler)
 #
 # This file is part of FusionForge. FusionForge is free software;
 # you can redistribute it and/or modify it under the terms of the
@@ -18,6 +18,8 @@
 # with FusionForge; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+source $(forge_get_config source_path)/post-install.d/common/service.inc
+
 database_host=$(forge_get_config database_host)
 database_port=$(forge_get_config database_port)
 database_name=$(forge_get_config database_name)
diff --git a/src/post-install.d/db/server.sh b/src/post-install.d/db/server.sh
index 0d5d263..43a2346 100755
--- a/src/post-install.d/db/server.sh
+++ b/src/post-install.d/db/server.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Configure local PostgreSQL server
 #
-# Copyright (C) 2014  Inria (Sylvain Beucler)
+# Copyright (C) 2014, 2015  Inria (Sylvain Beucler)
 #
 # This file is part of FusionForge. FusionForge is free software;
 # you can redistribute it and/or modify it under the terms of the
@@ -18,6 +18,8 @@
 # with FusionForge; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+source $(forge_get_config source_path)/post-install.d/common/service.inc
+
 database_name=$(forge_get_config database_name)
 database_user=$(forge_get_config database_user)
 
diff --git a/src/post-install.d/shell/shell.sh b/src/post-install.d/shell/shell.sh
index 45d1d4c..df22f92 100755
--- a/src/post-install.d/shell/shell.sh
+++ b/src/post-install.d/shell/shell.sh
@@ -1,7 +1,7 @@
 #! /bin/bash
 # Configure NSS+PostgreSQL shell access
 #
-# Copyright (C) 2014  Inria (Sylvain Beucler)
+# Copyright (C) 2014, 2015  Inria (Sylvain Beucler)
 #
 # This file is part of FusionForge. FusionForge is free software;
 # you can redistribute it and/or modify it under the terms of the
@@ -20,6 +20,8 @@
 
 set -e
 
+source $(forge_get_config source_path)/post-install.d/common/service.inc
+
 db_name=$(forge_get_config database_name)
 db_user=$(forge_get_config database_user)
 db_host=$(forge_get_config database_host)
diff --git a/src/post-install.d/web/web.sh b/src/post-install.d/web/web.sh
index 5b96142..8efc184 100755
--- a/src/post-install.d/web/web.sh
+++ b/src/post-install.d/web/web.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -e
 # Configure Apache
 #
-# Copyright (C) 2014  Inria (Sylvain Beucler)
+# Copyright (C) 2014, 2015  Inria (Sylvain Beucler)
 #
 # This file is part of FusionForge. FusionForge is free software;
 # you can redistribute it and/or modify it under the terms of the
@@ -18,6 +18,8 @@
 # with FusionForge; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+source $(forge_get_config source_path)/post-install.d/common/service.inc
+
 source_path=$(forge_get_config source_path)
 config_path=$(forge_get_config config_path)
 data_path=$(forge_get_config data_path)

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

commit 987fad1f8611628a1f485fb51fa29aea72b31e1d
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue Sep 1 11:39:20 2015 +0200

    Remove old Eclipse configuration and ignore them so people can use Eclipse PDT without introducing changes in the source

diff --git a/.buildpath b/.buildpath
deleted file mode 100644
index 814608f..0000000
--- a/.buildpath
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<buildpath>
-	<buildpathentry kind="con" path="org.eclipse.php.core.LANGUAGE"/>
-	<buildpathentry kind="src" path="src"/>
-</buildpath>
diff --git a/.gitignore b/.gitignore
index aa82379..c29454b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,7 @@ build/
 src/fusionforge.spec
 # Emacs backup files
 *~
+# Eclipse
+.buildpath
+.project
+.settings/
diff --git a/.project b/.project
deleted file mode 100644
index 52997cb..0000000
--- a/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>fusionforge</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.dltk.core.scriptbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.php.core.PHPNature</nature>
-		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
-	</natures>
-</projectDescription>
diff --git a/.settings/.jsdtscope b/.settings/.jsdtscope
deleted file mode 100644
index 2f6f983..0000000
--- a/.settings/.jsdtscope
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="">
-		<attributes>
-			<attribute name="provider" value="org.eclipse.wst.jsdt.web.core.internal.project.ModuleSourcePathProvider"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
-		<attributes>
-			<attribute name="hide" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
-	<classpathentry kind="output" path=""/>
-</classpath>
diff --git a/.settings/org.eclipse.ltk.core.refactoring.prefs b/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index b196c64..0000000
--- a/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/.settings/org.eclipse.php.core.prefs b/.settings/org.eclipse.php.core.prefs
deleted file mode 100644
index 7d89d13..0000000
--- a/.settings/org.eclipse.php.core.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-include_path=0;/fusionforge
diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.container b/.settings/org.eclipse.wst.jsdt.ui.superType.container
deleted file mode 100644
index 3bd5d0a..0000000
--- a/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.name b/.settings/org.eclipse.wst.jsdt.ui.superType.name
deleted file mode 100644
index 05bd71b..0000000
--- a/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ /dev/null
@@ -1 +0,0 @@
-Window
\ No newline at end of file
diff --git a/.settings/org.eclipse.wst.xml.core.prefs b/.settings/org.eclipse.wst.xml.core.prefs
deleted file mode 100644
index acc159a..0000000
--- a/.settings/org.eclipse.wst.xml.core.prefs
+++ /dev/null
@@ -1,18 +0,0 @@
-attributeHasNoValue=2
-eclipse.preferences.version=1
-endTagWithAttributes=2
-honourAllSchemaLocations=true
-indicateNoGrammar=1
-indiciateNoDocumentElement=-1
-markupValidation=true
-missingClosingBracket=2
-missingClosingQuote=2
-missingEndTag=2
-missingQuotes=2
-missingStartTag=2
-missingTagName=2
-namespaceInPITarget=2
-use-project-settings=true
-whitespaceAtStart=2
-whitespaceBeforeTagName=2
-xinclude=true

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

commit 9a804d192f9bb74438eb03390dcb51a7f92ad774
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue Sep 1 11:37:27 2015 +0200

    Create data_path/forum/pending/ in the 'make install' phase so packaging knows about it

diff --git a/src/GNUmakefile b/src/GNUmakefile
index b0b5e38..b6e814a 100644
--- a/src/GNUmakefile
+++ b/src/GNUmakefile
@@ -100,6 +100,7 @@ install-web: install-base-dirs
 	$(INSTALL) -d -m 00700 $(DESTDIR)$(data_path)/docman/
 	$(INSTALL) -d -m 00700 $(DESTDIR)$(data_path)/download/
 	$(INSTALL) -d -m 00700 $(DESTDIR)$(data_path)/forum/
+	$(INSTALL) -d -m 00700 $(DESTDIR)$(data_path)/forum/pending/
 	$(INSTALL) -d -m 00700 $(DESTDIR)$(data_path)/tracker/
 	$(INSTALL) -d -m 00700 $(DESTDIR)$(data_path)/rss/
 	$(CP_R) post-install.d/web $(DESTDIR)$(pkgdatadir)/post-install.d/
diff --git a/src/post-install.d/web/web.sh b/src/post-install.d/web/web.sh
index 690cfe0..5b96142 100755
--- a/src/post-install.d/web/web.sh
+++ b/src/post-install.d/web/web.sh
@@ -95,6 +95,7 @@ case "$1" in
 	chown $apache_user: $data_path/docman/
 	chown $apache_user: $data_path/download/
 	chown $apache_user: $data_path/forum/
+	chown $apache_user: $data_path/forum/pending/
 	chown $apache_user: $data_path/tracker/
 	chown $apache_user: $data_path/rss/
 

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

Summary of changes:
 .buildpath                                         |  5 ----
 .gitignore                                         |  4 +++
 .project                                           | 28 ---------------------
 .settings/.jsdtscope                               | 16 ------------
 .settings/org.eclipse.ltk.core.refactoring.prefs   |  2 --
 .settings/org.eclipse.php.core.prefs               |  2 --
 .../org.eclipse.wst.jsdt.ui.superType.container    |  1 -
 .settings/org.eclipse.wst.jsdt.ui.superType.name   |  1 -
 .settings/org.eclipse.wst.xml.core.prefs           | 18 --------------
 src/GNUmakefile                                    |  1 +
 src/debian/changelog                               |  7 ++++++
 src/post-install.d/common/plugin.sh                |  4 ++-
 .../{shell/upgrade-conf.sh => common/service.inc}  | 29 ++++++++++++++--------
 src/post-install.d/common/systasksd.sh             |  4 ++-
 src/post-install.d/db/populate.sh                  |  4 ++-
 src/post-install.d/db/server.sh                    |  4 ++-
 src/post-install.d/shell/shell.sh                  |  4 ++-
 src/post-install.d/web/web.sh                      |  5 +++-
 18 files changed, 50 insertions(+), 89 deletions(-)
 delete mode 100644 .buildpath
 delete mode 100644 .project
 delete mode 100644 .settings/.jsdtscope
 delete mode 100644 .settings/org.eclipse.ltk.core.refactoring.prefs
 delete mode 100644 .settings/org.eclipse.php.core.prefs
 delete mode 100644 .settings/org.eclipse.wst.jsdt.ui.superType.container
 delete mode 100644 .settings/org.eclipse.wst.jsdt.ui.superType.name
 delete mode 100644 .settings/org.eclipse.wst.xml.core.prefs
 copy src/post-install.d/{shell/upgrade-conf.sh => common/service.inc} (62%)
 mode change 100755 => 100644


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list