[Fusionforge-commits] FusionForge branch Branch_5_3 updated. c1e977858f0b8b84de16865017b7f59bedbcc30d

Sylvain Beucler beuc-inria at fusionforge.org
Tue Nov 4 14:19:54 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, Branch_5_3 has been updated
       via  c1e977858f0b8b84de16865017b7f59bedbcc30d (commit)
       via  a2294fc9e90eb180b8db2e4a159b4a004d608947 (commit)
      from  be921839a018987b855887edd7d69b6c46d1d9dd (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 c1e977858f0b8b84de16865017b7f59bedbcc30d
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue Nov 4 14:18:48 2014 +0100

    debian: don't install over symlink (closes #767688)
    
    a.k.a. don't clean-up a released stable branch :P

diff --git a/src/packaging/install/web-apache2 b/src/packaging/install/web-apache2
index 56a4c1f..ccfd85a 100644
--- a/src/packaging/install/web-apache2
+++ b/src/packaging/install/web-apache2
@@ -1,5 +1,5 @@
 www                                 @SOURCE_PATH@/
-www/index_std.php                   @CONFIG_PATH@/custom/
+www/index_std.php                   /etc/@PACKAGE@/custom/
 utils/install-apache.sh             @BINARY_PATH@/
 utils/manage-apache-config.sh	    @BINARY_PATH@/
 etc/httpd.conf.d-fhs		    @SOURCE_PATH@/etc/
diff --git a/src/plugins/admssw/packaging/install/plugin-admssw b/src/plugins/admssw/packaging/install/plugin-admssw
index 6ff7599..06290a9 100644
--- a/src/plugins/admssw/packaging/install/plugin-admssw
+++ b/src/plugins/admssw/packaging/install/plugin-admssw
@@ -1,4 +1,4 @@
 plugins/admssw/common/*                  @PLUGINS_PATH@/admssw/common/
 plugins/admssw/include/*                 @PLUGINS_PATH@/admssw/include/
-plugins/admssw/etc/admssw.ini	             @CONFIG_PATH@/config.ini.d/
+plugins/admssw/etc/admssw.ini	             /etc/@PACKAGE@/config.ini.d/
 plugins/admssw/www/* @PLUGINS_PATH@/admssw/www/
diff --git a/src/plugins/authcas/packaging/install/plugin-authcas b/src/plugins/authcas/packaging/install/plugin-authcas
index d57491d..0d5b89b 100644
--- a/src/plugins/authcas/packaging/install/plugin-authcas
+++ b/src/plugins/authcas/packaging/install/plugin-authcas
@@ -1,3 +1,3 @@
 plugins/authcas/include              @PLUGINS_PATH@/authcas/
 plugins/authcas/www              @PLUGINS_PATH@/authcas/
-plugins/authcas/etc/*.ini 	     @CONFIG_PATH@/config.ini.d/
+plugins/authcas/etc/*.ini 	     /etc/@PACKAGE@/config.ini.d/
diff --git a/src/plugins/authhttpd/packaging/install/plugin-authhttpd b/src/plugins/authhttpd/packaging/install/plugin-authhttpd
index fcb5039..a9464eb 100644
--- a/src/plugins/authhttpd/packaging/install/plugin-authhttpd
+++ b/src/plugins/authhttpd/packaging/install/plugin-authhttpd
@@ -1,3 +1,3 @@
 plugins/authhttpd/include              @PLUGINS_PATH@/authhttpd/
 plugins/authhttpd/www              @PLUGINS_PATH@/authhttpd/
-plugins/authhttpd/etc/*.ini 	     @CONFIG_PATH@/config.ini.d/
+plugins/authhttpd/etc/*.ini 	     /etc/@PACKAGE@/config.ini.d/
diff --git a/src/plugins/authldap/packaging/install/plugin-authldap b/src/plugins/authldap/packaging/install/plugin-authldap
index 870fbf8..b5931b8 100644
--- a/src/plugins/authldap/packaging/install/plugin-authldap
+++ b/src/plugins/authldap/packaging/install/plugin-authldap
@@ -1,3 +1,3 @@
 plugins/authldap/include              @PLUGINS_PATH@/authldap/
 plugins/authldap/www              @PLUGINS_PATH@/authldap/
-plugins/authldap/etc/*.ini 	     @CONFIG_PATH@/config.ini.d/
+plugins/authldap/etc/*.ini 	     /etc/@PACKAGE@/config.ini.d/
diff --git a/src/plugins/authopenid/packaging/install/plugin-authopenid b/src/plugins/authopenid/packaging/install/plugin-authopenid
index 27d259d..0aba1e4 100644
--- a/src/plugins/authopenid/packaging/install/plugin-authopenid
+++ b/src/plugins/authopenid/packaging/install/plugin-authopenid
@@ -1,4 +1,4 @@
 plugins/authopenid/include   @PLUGINS_PATH@/authopenid/
 plugins/authopenid/www       @PLUGINS_PATH@/authopenid/
-plugins/authopenid/etc/*.ini @CONFIG_PATH@/config.ini.d/
+plugins/authopenid/etc/*.ini /etc/@PACKAGE@/config.ini.d/
 plugins/authopenid/db/*      @PLUGINS_PATH@/authopenid/db/
diff --git a/src/plugins/authwebid/packaging/install/plugin-authwebid b/src/plugins/authwebid/packaging/install/plugin-authwebid
index f888320..88be5b4 100644
--- a/src/plugins/authwebid/packaging/install/plugin-authwebid
+++ b/src/plugins/authwebid/packaging/install/plugin-authwebid
@@ -1,4 +1,4 @@
 plugins/authwebid/include   @PLUGINS_PATH@/authwebid/
 plugins/authwebid/www       @PLUGINS_PATH@/authwebid/
-plugins/authwebid/etc/*.ini @CONFIG_PATH@/config.ini.d/
+plugins/authwebid/etc/*.ini /etc/@PACKAGE@/config.ini.d/
 plugins/authwebid/db/*      @PLUGINS_PATH@/authwebid/db/
diff --git a/src/plugins/blocks/packaging/install/plugin-blocks b/src/plugins/blocks/packaging/install/plugin-blocks
index 75e42b2..0479354 100644
--- a/src/plugins/blocks/packaging/install/plugin-blocks
+++ b/src/plugins/blocks/packaging/install/plugin-blocks
@@ -1,4 +1,4 @@
 plugins/blocks/common/*               @PLUGINS_PATH@/blocks/common/
 plugins/blocks/db/*                   @PLUGINS_PATH@/blocks/db/
 plugins/blocks/www/*                  @PLUGINS_PATH@/blocks/www/
-plugins/blocks/etc/*.ini              @CONFIG_PATH@/config.ini.d/
+plugins/blocks/etc/*.ini              /etc/@PACKAGE@/config.ini.d/
diff --git a/src/plugins/compactpreview/packaging/install/plugin-compactpreview b/src/plugins/compactpreview/packaging/install/plugin-compactpreview
index e93b978..84a5f53 100644
--- a/src/plugins/compactpreview/packaging/install/plugin-compactpreview
+++ b/src/plugins/compactpreview/packaging/install/plugin-compactpreview
@@ -1,4 +1,4 @@
 plugins/compactpreview/common/*                  @PLUGINS_PATH@/compactpreview/common/
 plugins/compactpreview/include/*                 @PLUGINS_PATH@/compactpreview/include/
 plugins/compactpreview/www/*                     @PLUGINS_PATH@/compactpreview/www/
-plugins/compactpreview/etc/compactpreview.ini	             @CONFIG_PATH@/config.ini.d/
+plugins/compactpreview/etc/compactpreview.ini	             /etc/@PACKAGE@/config.ini.d/
diff --git a/src/plugins/contribtracker/packaging/install/plugin-contribtracker b/src/plugins/contribtracker/packaging/install/plugin-contribtracker
index 7a14209..7373f9e 100644
--- a/src/plugins/contribtracker/packaging/install/plugin-contribtracker
+++ b/src/plugins/contribtracker/packaging/install/plugin-contribtracker
@@ -1,4 +1,4 @@
 plugins/contribtracker/common/* @PLUGINS_PATH@/contribtracker/common/
 plugins/contribtracker/db/* @PLUGINS_PATH@/contribtracker/db/
-plugins/contribtracker/etc/*.ini @CONFIG_PATH@/config.ini.d/
+plugins/contribtracker/etc/*.ini /etc/@PACKAGE@/config.ini.d/
 plugins/contribtracker/www/* @PLUGINS_PATH@/contribtracker/www/
diff --git a/src/plugins/doaprdf/packaging/install/plugin-doaprdf b/src/plugins/doaprdf/packaging/install/plugin-doaprdf
index c3e1dd6..241dee9 100644
--- a/src/plugins/doaprdf/packaging/install/plugin-doaprdf
+++ b/src/plugins/doaprdf/packaging/install/plugin-doaprdf
@@ -1,3 +1,3 @@
 plugins/doaprdf/common/*                  @PLUGINS_PATH@/doaprdf/common/
 plugins/doaprdf/include/*                 @PLUGINS_PATH@/doaprdf/include/
-plugins/doaprdf/etc/doaprdf.ini	             @CONFIG_PATH@/config.ini.d/
+plugins/doaprdf/etc/doaprdf.ini	             /etc/@PACKAGE@/config.ini.d/
diff --git a/src/plugins/externalsearch/packaging/install/plugin-externalsearch b/src/plugins/externalsearch/packaging/install/plugin-externalsearch
index 64398a6..9887321 100644
--- a/src/plugins/externalsearch/packaging/install/plugin-externalsearch
+++ b/src/plugins/externalsearch/packaging/install/plugin-externalsearch
@@ -1 +1 @@
-plugins/externalsearch/etc/*.ini @CONFIG_PATH@/config.ini.d/
+plugins/externalsearch/etc/*.ini /etc/@PACKAGE@/config.ini.d/
diff --git a/src/plugins/extsubproj/packaging/install/plugin-extsubproj b/src/plugins/extsubproj/packaging/install/plugin-extsubproj
index 071c6e5..4609ad8 100644
--- a/src/plugins/extsubproj/packaging/install/plugin-extsubproj
+++ b/src/plugins/extsubproj/packaging/install/plugin-extsubproj
@@ -4,4 +4,4 @@ plugins/extsubproj/view/*                  @PLUGINS_PATH@/extsubproj/view/
 plugins/extsubproj/include/*                 @PLUGINS_PATH@/extsubproj/include/
 plugins/extsubproj/db/*                      @PLUGINS_PATH@/extsubproj/db/
 plugins/extsubproj/www/*                     @PLUGINS_PATH@/extsubproj/www/
-plugins/extsubproj/etc/extsubproj.ini	             @CONFIG_PATH@/config.ini.d/
+plugins/extsubproj/etc/extsubproj.ini	             /etc/@PACKAGE@/config.ini.d/
diff --git a/src/plugins/foafprofiles/packaging/install/plugin-foafprofiles b/src/plugins/foafprofiles/packaging/install/plugin-foafprofiles
index 48effb2..7438a964 100644
--- a/src/plugins/foafprofiles/packaging/install/plugin-foafprofiles
+++ b/src/plugins/foafprofiles/packaging/install/plugin-foafprofiles
@@ -1,3 +1,3 @@
 plugins/foafprofiles/common/*                  @PLUGINS_PATH@/foafprofiles/common/
 plugins/foafprofiles/include/*                 @PLUGINS_PATH@/foafprofiles/include/
-plugins/foafprofiles/etc/foafprofiles.ini	             @CONFIG_PATH@/config.ini.d/
+plugins/foafprofiles/etc/foafprofiles.ini	             /etc/@PACKAGE@/config.ini.d/
diff --git a/src/plugins/globaldashboard/packaging/install/plugin-globaldashboard b/src/plugins/globaldashboard/packaging/install/plugin-globaldashboard
index e12ee4b..68cf112 100644
--- a/src/plugins/globaldashboard/packaging/install/plugin-globaldashboard
+++ b/src/plugins/globaldashboard/packaging/install/plugin-globaldashboard
@@ -5,4 +5,4 @@ plugins/globaldashboard/www/*                     @PLUGINS_PATH@/globaldashboard
 plugins/globaldashboard/cronjobs/*                @SOURCE_PATH@/cronjobs
 plugins/globaldashboard/etc/plugins/globaldashboard/*     @CONFIG_PATH@/plugins/globaldashboard/
 plugins/globaldashboard/etc/httpd.d/*             @SOURCE_PATH@/etc/httpd.d/
-plugins/globaldashboard/etc/globaldashboard.ini	             @CONFIG_PATH@/config.ini.d/
+plugins/globaldashboard/etc/globaldashboard.ini	             /etc/@PACKAGE@/config.ini.d/
diff --git a/src/plugins/gravatar/packaging/install/plugin-gravatar b/src/plugins/gravatar/packaging/install/plugin-gravatar
index f528a19..61c5a42 100644
--- a/src/plugins/gravatar/packaging/install/plugin-gravatar
+++ b/src/plugins/gravatar/packaging/install/plugin-gravatar
@@ -1,2 +1,2 @@
 plugins/gravatar/common/*		@PLUGINS_PATH@/gravatar/common/
-plugins/gravatar/etc/*.ini		@CONFIG_PATH@/config.ini.d/
+plugins/gravatar/etc/*.ini		/etc/@PACKAGE@/config.ini.d/
diff --git a/src/plugins/headermenu/packaging/install/plugin-headermenu b/src/plugins/headermenu/packaging/install/plugin-headermenu
index 1a093ec..10bdffd 100644
--- a/src/plugins/headermenu/packaging/install/plugin-headermenu
+++ b/src/plugins/headermenu/packaging/install/plugin-headermenu
@@ -3,4 +3,4 @@ plugins/headermenu/common/* @PLUGINS_PATH@/headermenu/common/
 plugins/headermenu/db/* @PLUGINS_PATH@/headermenu/db/
 plugins/headermenu/view/*	@PLUGINS_PATH@/headermenu/view/
 plugins/headermenu/www/* @PLUGINS_PATH@/headermenu/www/
-plugins/headermenu/etc/*.ini @CONFIG_PATH@/config.ini.d/
+plugins/headermenu/etc/*.ini /etc/@PACKAGE@/config.ini.d/
diff --git a/src/plugins/helloworld/packaging/install/plugin-helloworld b/src/plugins/helloworld/packaging/install/plugin-helloworld
index 61b79ce..db27efa 100644
--- a/src/plugins/helloworld/packaging/install/plugin-helloworld
+++ b/src/plugins/helloworld/packaging/install/plugin-helloworld
@@ -5,4 +5,4 @@ plugins/helloworld/bin/*                     @PLUGINS_PATH@/helloworld/bin/
 plugins/helloworld/www/*                     @PLUGINS_PATH@/helloworld/www/
 plugins/helloworld/cronjobs/*                @SOURCE_PATH@/cronjobs
 plugins/helloworld/etc/httpd.d/*             @SOURCE_PATH@/etc/httpd.d/
-plugins/helloworld/etc/helloworld.ini	     @CONFIG_PATH@/config.ini.d/
+plugins/helloworld/etc/helloworld.ini	     /etc/@PACKAGE@/config.ini.d/
diff --git a/src/plugins/hudson/packaging/install/plugin-hudson b/src/plugins/hudson/packaging/install/plugin-hudson
index a9a180e..9eebf7b 100644
--- a/src/plugins/hudson/packaging/install/plugin-hudson
+++ b/src/plugins/hudson/packaging/install/plugin-hudson
@@ -5,4 +5,4 @@ plugins/hudson/www/*                     @PLUGINS_PATH@/hudson/www/
 plugins/hudson/cronjobs/*                @SOURCE_PATH@/cronjobs
 plugins/hudson/etc/plugins/hudson/*      @CONFIG_PATH@/plugins/hudson/
 plugins/hudson/etc/httpd.d/*             @SOURCE_PATH@/etc/httpd.d/
-plugins/hudson/etc/*.ini                 @CONFIG_PATH@/config.ini.d/
+plugins/hudson/etc/*.ini                 /etc/@PACKAGE@/config.ini.d/
diff --git a/src/plugins/mantisbt/packaging/install/plugin-mantisbt b/src/plugins/mantisbt/packaging/install/plugin-mantisbt
index f867a07..d414b50 100644
--- a/src/plugins/mantisbt/packaging/install/plugin-mantisbt
+++ b/src/plugins/mantisbt/packaging/install/plugin-mantisbt
@@ -5,4 +5,4 @@ plugins/mantisbt/db		@PLUGINS_PATH@/mantisbt/
 plugins/mantisbt/view		@PLUGINS_PATH@/mantisbt/
 plugins/mantisbt/www		@PLUGINS_PATH@/mantisbt/
 plugins/mantisbt/etc/plugins/mantisbt/*  @CONFIG_PATH@/plugins/mantisbt/
-plugins/mantisbt/etc/*.ini 	     @CONFIG_PATH@/config.ini.d/
+plugins/mantisbt/etc/*.ini 	     /etc/@PACKAGE@/config.ini.d/
diff --git a/src/plugins/mediawiki/packaging/install/plugin-mediawiki b/src/plugins/mediawiki/packaging/install/plugin-mediawiki
index 8ff9a96..a28e248 100644
--- a/src/plugins/mediawiki/packaging/install/plugin-mediawiki
+++ b/src/plugins/mediawiki/packaging/install/plugin-mediawiki
@@ -5,5 +5,5 @@ plugins/mediawiki/db/*		   @PLUGINS_PATH@/mediawiki/db/
 plugins/mediawiki/www/*            @PLUGINS_PATH@/mediawiki/www/
 plugins/mediawiki/mediawiki-skin/*            @PLUGINS_PATH@/mediawiki/mediawiki-skin/
 plugins/mediawiki/etc/httpd.d/*    @SOURCE_PATH@/etc/httpd.d/
-plugins/mediawiki/etc/*.ini 	   @CONFIG_PATH@/config.ini.d/
+plugins/mediawiki/etc/*.ini 	   /etc/@PACKAGE@/config.ini.d/
 plugins/mediawiki/etc/plugins/mediawiki/* @CONFIG_PATH@/plugins/mediawiki/
diff --git a/src/plugins/message/packaging/install/plugin-message b/src/plugins/message/packaging/install/plugin-message
index 3325b56..a8db4f7 100644
--- a/src/plugins/message/packaging/install/plugin-message
+++ b/src/plugins/message/packaging/install/plugin-message
@@ -1,4 +1,4 @@
 plugins/message/common/*	@PLUGINS_PATH@/message/common/
 plugins/message/www/*		@PLUGINS_PATH@/message/www/
 plugins/message/db/*		@PLUGINS_PATH@/message/db/
-plugins/message/etc/*.ini	@CONFIG_PATH@/config.ini.d/
+plugins/message/etc/*.ini	/etc/@PACKAGE@/config.ini.d/
diff --git a/src/plugins/moinmoin/packaging/install/plugin-moinmoin b/src/plugins/moinmoin/packaging/install/plugin-moinmoin
index 68a33c4..5205521 100644
--- a/src/plugins/moinmoin/packaging/install/plugin-moinmoin
+++ b/src/plugins/moinmoin/packaging/install/plugin-moinmoin
@@ -4,5 +4,5 @@ plugins/moinmoin/cronjobs/*       @PLUGINS_PATH@/moinmoin/cronjobs/
 plugins/moinmoin/lib/*            @PLUGINS_PATH@/moinmoin/lib/
 plugins/moinmoin/www/*            @PLUGINS_PATH@/moinmoin/www/
 plugins/moinmoin/wsgi/moin.wsgi   @PLUGINS_PATH@/moinmoin/wsgi
-plugins/moinmoin/etc/*.ini 	  		@CONFIG_PATH@/config.ini.d/
+plugins/moinmoin/etc/*.ini 	  		/etc/@PACKAGE@/config.ini.d/
 plugins/moinmoin/etc/plugins/moinmoin/*		@CONFIG_PATH@/plugins/moinmoin/
diff --git a/src/plugins/oauthconsumer/packaging/install/plugin-oauthconsumer b/src/plugins/oauthconsumer/packaging/install/plugin-oauthconsumer
index 7d4b55e..510e93a 100644
--- a/src/plugins/oauthconsumer/packaging/install/plugin-oauthconsumer
+++ b/src/plugins/oauthconsumer/packaging/install/plugin-oauthconsumer
@@ -1,4 +1,4 @@
 plugins/oauthconsumer/common/*                  @PLUGINS_PATH@/oauthconsumer/common/
 plugins/oauthconsumer/include/*                  @PLUGINS_PATH@/oauthconsumer/include/
 plugins/oauthconsumer/www/*                  @PLUGINS_PATH@/oauthconsumer/www/
-plugins/oauthconsumer/etc/oauthconsumer.ini	             @CONFIG_PATH@/config.ini.d/
+plugins/oauthconsumer/etc/oauthconsumer.ini	             /etc/@PACKAGE@/config.ini.d/
diff --git a/src/plugins/oauthprovider/packaging/install/plugin-oauthprovider b/src/plugins/oauthprovider/packaging/install/plugin-oauthprovider
index 0dc77e7..f1912e5 100644
--- a/src/plugins/oauthprovider/packaging/install/plugin-oauthprovider
+++ b/src/plugins/oauthprovider/packaging/install/plugin-oauthprovider
@@ -3,4 +3,4 @@ plugins/oauthprovider/include/*.php             @PLUGINS_PATH@/oauthprovider/inc
 plugins/oauthprovider/db/*                      @PLUGINS_PATH@/oauthprovider/db/
 plugins/oauthprovider/www/*                     @PLUGINS_PATH@/oauthprovider/www/
 plugins/oauthprovider/etc/plugins/oauthprovider/*     @CONFIG_PATH@/plugins/oauthprovider/
-plugins/oauthprovider/etc/*.ini @CONFIG_PATH@/config.ini.d/
+plugins/oauthprovider/etc/*.ini /etc/@PACKAGE@/config.ini.d/
diff --git a/src/plugins/oslc/packaging/install/plugin-oslc b/src/plugins/oslc/packaging/install/plugin-oslc
index 80b1668..2f6921b 100644
--- a/src/plugins/oslc/packaging/install/plugin-oslc
+++ b/src/plugins/oslc/packaging/install/plugin-oslc
@@ -5,4 +5,4 @@ plugins/oslc/www/*                     @PLUGINS_PATH@/oslc/www/
 plugins/oslc/cronjobs/*                @SOURCE_PATH@/cronjobs
 plugins/oslc/etc/plugins/oslc/*        @CONFIG_PATH@/plugins/oslc/
 plugins/oslc/etc/httpd.d/*             @CONFIG_PATH@/httpd.conf.d/
-plugins/oslc/etc/oslc.ini              @CONFIG_PATH@/config.ini.d/
+plugins/oslc/etc/oslc.ini              /etc/@PACKAGE@/config.ini.d/
diff --git a/src/plugins/projectimport/packaging/install/plugin-projectimport b/src/plugins/projectimport/packaging/install/plugin-projectimport
index a59d009..0667f0d 100644
--- a/src/plugins/projectimport/packaging/install/plugin-projectimport
+++ b/src/plugins/projectimport/packaging/install/plugin-projectimport
@@ -2,5 +2,5 @@ plugins/projectimport/common/*                  @PLUGINS_PATH@/projectimport/com
 plugins/projectimport/www/*                     @PLUGINS_PATH@/projectimport/www/
 plugins/projectimport/etc/plugins/projectimport/*        @CONFIG_PATH@/plugins/projectimport/
 plugins/projectimport/3rd-party/oslc-tools/arc2-plugin/ARC2_OSLCCoreRDFJSONParserPlugin.php	@PLUGINS_PATH@/projectimport/common/	
-plugins/projectimport/etc/*.ini 	   			@CONFIG_PATH@/config.ini.d/
+plugins/projectimport/etc/*.ini 	   			/etc/@PACKAGE@/config.ini.d/
 plugins/projectimport/bin/*.sh                	@PLUGINS_PATH@/projectimport/bin/
diff --git a/src/plugins/projectlabels/packaging/install/plugin-projectlabels b/src/plugins/projectlabels/packaging/install/plugin-projectlabels
index 5104202..65b224b 100644
--- a/src/plugins/projectlabels/packaging/install/plugin-projectlabels
+++ b/src/plugins/projectlabels/packaging/install/plugin-projectlabels
@@ -1,4 +1,4 @@
 plugins/projectlabels/common/*	@PLUGINS_PATH@/projectlabels/common/
 plugins/projectlabels/db/*	@PLUGINS_PATH@/projectlabels/db/
 plugins/projectlabels/www/*	@PLUGINS_PATH@/projectlabels/www/
-plugins/projectlabels/etc/*.ini @CONFIG_PATH@/config.ini.d/
+plugins/projectlabels/etc/*.ini /etc/@PACKAGE@/config.ini.d/
diff --git a/src/plugins/projects-hierarchy/packaging/install/plugin-projects-hierarchy b/src/plugins/projects-hierarchy/packaging/install/plugin-projects-hierarchy
index 6f44b02..9834efd 100644
--- a/src/plugins/projects-hierarchy/packaging/install/plugin-projects-hierarchy
+++ b/src/plugins/projects-hierarchy/packaging/install/plugin-projects-hierarchy
@@ -3,5 +3,5 @@ plugins/projects-hierarchy/view/*                  @PLUGINS_PATH@/projects-hiera
 plugins/projects-hierarchy/actions/*                  @PLUGINS_PATH@/projects-hierarchy/actions/
 plugins/projects-hierarchy/include/*                  @PLUGINS_PATH@/projects-hierarchy/include/
 plugins/projects-hierarchy/www/*                     @PLUGINS_PATH@/projects-hierarchy/www/
-plugins/projects-hierarchy/etc/*.ini 	   			@CONFIG_PATH@/config.ini.d/
+plugins/projects-hierarchy/etc/*.ini 	   			/etc/@PACKAGE@/config.ini.d/
 plugins/projects-hierarchy/db/*                      @PLUGINS_PATH@/projects-hierarchy/db/
diff --git a/src/plugins/scmarch/packaging/install/plugin-scmarch b/src/plugins/scmarch/packaging/install/plugin-scmarch
index 931df67..bf8261d 100644
--- a/src/plugins/scmarch/packaging/install/plugin-scmarch
+++ b/src/plugins/scmarch/packaging/install/plugin-scmarch
@@ -1,2 +1,2 @@
 plugins/scmarch/common/*             @PLUGINS_PATH@/scmarch/common/
-plugins/scmarch/etc/*.ini	     @CONFIG_PATH@/config.ini.d/
+plugins/scmarch/etc/*.ini	     /etc/@PACKAGE@/config.ini.d/
diff --git a/src/plugins/scmbzr/packaging/install/plugin-scmbzr b/src/plugins/scmbzr/packaging/install/plugin-scmbzr
index 29b1beb..1611997 100644
--- a/src/plugins/scmbzr/packaging/install/plugin-scmbzr
+++ b/src/plugins/scmbzr/packaging/install/plugin-scmbzr
@@ -1,4 +1,4 @@
 plugins/scmbzr/bin/*                 @PLUGINS_PATH@/scmbzr/bin/
 plugins/scmbzr/common/*              @PLUGINS_PATH@/scmbzr/common/
 plugins/scmbzr/etc/plugins/scmbzr/*  @CONFIG_PATH@/plugins/scmbzr/
-plugins/scmbzr/etc/*.ini 	     @CONFIG_PATH@/config.ini.d/
+plugins/scmbzr/etc/*.ini 	     /etc/@PACKAGE@/config.ini.d/
diff --git a/src/plugins/scmccase/packaging/install/plugin-scmccase b/src/plugins/scmccase/packaging/install/plugin-scmccase
index 81a3515..b00734a 100644
--- a/src/plugins/scmccase/packaging/install/plugin-scmccase
+++ b/src/plugins/scmccase/packaging/install/plugin-scmccase
@@ -1 +1 @@
-plugins/scmccase/etc/*.ini @CONFIG_PATH@/config.ini.d/
+plugins/scmccase/etc/*.ini /etc/@PACKAGE@/config.ini.d/
diff --git a/src/plugins/scmcvs/packaging/install/plugin-scmcvs b/src/plugins/scmcvs/packaging/install/plugin-scmcvs
index cec9f84..d55ff57 100644
--- a/src/plugins/scmcvs/packaging/install/plugin-scmcvs
+++ b/src/plugins/scmcvs/packaging/install/plugin-scmcvs
@@ -4,4 +4,4 @@ plugins/scmcvs/sbin/*                  @PLUGINS_PATH@/scmcvs/sbin/
 plugins/scmcvs/common/*                @PLUGINS_PATH@/scmcvs/common/
 plugins/scmcvs/cronjobs/*              @PLUGINS_PATH@/scmcvs/cronjobs/
 plugins/scmcvs/etc/plugins/scmcvs/*    @CONFIG_PATH@/plugins/scmcvs/
-plugins/scmcvs/etc/*.ini 	       @CONFIG_PATH@/config.ini.d/
+plugins/scmcvs/etc/*.ini 	       /etc/@PACKAGE@/config.ini.d/
diff --git a/src/plugins/scmdarcs/packaging/install/plugin-scmdarcs b/src/plugins/scmdarcs/packaging/install/plugin-scmdarcs
index 6d20313..9baa636 100644
--- a/src/plugins/scmdarcs/packaging/install/plugin-scmdarcs
+++ b/src/plugins/scmdarcs/packaging/install/plugin-scmdarcs
@@ -1,3 +1,3 @@
 plugins/scmdarcs/common/*               @PLUGINS_PATH@/scmdarcs/common/
 plugins/scmdarcs/db/*		@PLUGINS_PATH@/scmdarcs/db/
-plugins/scmdarcs/etc/*.ini 		@CONFIG_PATH@/config.ini.d/
+plugins/scmdarcs/etc/*.ini 		/etc/@PACKAGE@/config.ini.d/
diff --git a/src/plugins/scmgit/packaging/install/plugin-scmgit b/src/plugins/scmgit/packaging/install/plugin-scmgit
index 7422371..c1914ee 100644
--- a/src/plugins/scmgit/packaging/install/plugin-scmgit
+++ b/src/plugins/scmgit/packaging/install/plugin-scmgit
@@ -1,4 +1,4 @@
 plugins/scmgit/common/*		@PLUGINS_PATH@/scmgit/common/
 plugins/scmgit/www/*            @PLUGINS_PATH@/scmgit/www/
 plugins/scmgit/db/*		@PLUGINS_PATH@/scmgit/db/
-plugins/scmgit/etc/*.ini 	@CONFIG_PATH@/config.ini.d/
+plugins/scmgit/etc/*.ini 	/etc/@PACKAGE@/config.ini.d/
diff --git a/src/plugins/scmhg/packaging/install/plugin-scmhg b/src/plugins/scmhg/packaging/install/plugin-scmhg
index 1497ef9..b4afc67 100644
--- a/src/plugins/scmhg/packaging/install/plugin-scmhg
+++ b/src/plugins/scmhg/packaging/install/plugin-scmhg
@@ -1,2 +1,2 @@
 plugins/scmhg/common/*             @PLUGINS_PATH@/scmhg/common/
-plugins/scmhg/etc/*.ini		  @CONFIG_PATH@/config.ini.d/
+plugins/scmhg/etc/*.ini		  /etc/@PACKAGE@/config.ini.d/
diff --git a/src/plugins/scmhook/packaging/install/plugin-scmhook b/src/plugins/scmhook/packaging/install/plugin-scmhook
index 2e719c7..654c8ce 100644
--- a/src/plugins/scmhook/packaging/install/plugin-scmhook
+++ b/src/plugins/scmhook/packaging/install/plugin-scmhook
@@ -2,5 +2,5 @@ plugins/scmhook/common/*	@PLUGINS_PATH@/scmhook/common/
 plugins/scmhook/www/*		@PLUGINS_PATH@/scmhook/www/
 plugins/scmhook/db/*		@PLUGINS_PATH@/scmhook/db/
 plugins/scmhook/library/*	@PLUGINS_PATH@/scmhook/library/
-plugins/scmhook/etc/*.ini	@CONFIG_PATH@/config.ini.d/
+plugins/scmhook/etc/*.ini	/etc/@PACKAGE@/config.ini.d/
 plugins/scmhook/cronjobs/*	@PLUGINS_PATH@/scmhook/cronjobs/
diff --git a/src/plugins/scmsvn/packaging/install/plugin-scmsvn b/src/plugins/scmsvn/packaging/install/plugin-scmsvn
index 1bef4bc..a8755dd 100644
--- a/src/plugins/scmsvn/packaging/install/plugin-scmsvn
+++ b/src/plugins/scmsvn/packaging/install/plugin-scmsvn
@@ -1,4 +1,4 @@
 plugins/scmsvn/bin/*                @PLUGINS_PATH@/scmsvn/bin/
 plugins/scmsvn/common/*             @PLUGINS_PATH@/scmsvn/common/
 plugins/scmsvn/etc/plugins/scmsvn/* @CONFIG_PATH@/plugins/scmsvn/
-plugins/scmsvn/etc/*.ini 	    @CONFIG_PATH@/config.ini.d/
+plugins/scmsvn/etc/*.ini 	    /etc/@PACKAGE@/config.ini.d/
diff --git a/src/plugins/sysauthldap/packaging/install/plugin-sysauthldap b/src/plugins/sysauthldap/packaging/install/plugin-sysauthldap
index 7838338..6c3705b 100644
--- a/src/plugins/sysauthldap/packaging/install/plugin-sysauthldap
+++ b/src/plugins/sysauthldap/packaging/install/plugin-sysauthldap
@@ -1,4 +1,4 @@
 plugins/sysauthldap/bin             @PLUGINS_PATH@/sysauthldap/
 plugins/sysauthldap/common          @PLUGINS_PATH@/sysauthldap/
 plugins/sysauthldap/gforge.schema   @PLUGINS_PATH@/sysauthldap/
-plugins/sysauthldap/etc/*.ini 	    @CONFIG_PATH@/config.ini.d/
+plugins/sysauthldap/etc/*.ini 	    /etc/@PACKAGE@/config.ini.d/
diff --git a/src/plugins/twitter/packaging/install/plugin-twitter b/src/plugins/twitter/packaging/install/plugin-twitter
index 70de439..0ff9654 100644
--- a/src/plugins/twitter/packaging/install/plugin-twitter
+++ b/src/plugins/twitter/packaging/install/plugin-twitter
@@ -1,4 +1,4 @@
 plugins/twitter/common/*                  @PLUGINS_PATH@/twitter/common/
 plugins/twitter/include/*                  @PLUGINS_PATH@/twitter/include/
 plugins/twitter/www/*                  @PLUGINS_PATH@/twitter/www/
-plugins/twitter/etc/twitter.ini	             @CONFIG_PATH@/config.ini.d/
+plugins/twitter/etc/twitter.ini	             /etc/@PACKAGE@/config.ini.d/

commit a2294fc9e90eb180b8db2e4a159b4a004d608947
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Wed Sep 10 18:17:34 2014 +0200

    Revert accidental /etc/fusionforge/* -> /etc/gforge/ moves
    
    Conflicts:
    	src/debian/rules

diff --git a/src/packaging/dirs/common b/src/packaging/dirs/common
index d9de93e..07cc9cc 100644
--- a/src/packaging/dirs/common
+++ b/src/packaging/dirs/common
@@ -1,5 +1,5 @@
 bin
- at CONFIG_PATH@/config.ini.d
+etc/@PACKAGE@/config.ini.d
 @CONFIG_PATH@/templates
 @BINARY_PATH@
 @SOURCE_PATH@/lib
diff --git a/src/packaging/install/common b/src/packaging/install/common
index 0582d8f..22a2eef 100644
--- a/src/packaging/install/common
+++ b/src/packaging/install/common
@@ -1,8 +1,8 @@
-etc/config.ini-fhs                     @CONFIG_PATH@
-etc/config.ini.d/defaults.ini          @CONFIG_PATH@/config.ini.d/
-etc/config.ini.d/debug.ini             @CONFIG_PATH@/config.ini.d/
-etc/config.ini.d/zzzz-local.ini        @CONFIG_PATH@/config.ini.d/
-etc/custom                     	       @CONFIG_PATH@/
+etc/config.ini-fhs                     etc/@PACKAGE@
+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         @BINARY_PATH@/
@@ -28,7 +28,7 @@ locales/*                              usr/share/locale/
 #
 plugins/authbuiltin/common          @PLUGINS_PATH@/authbuiltin/
 plugins/authbuiltin/www             @PLUGINS_PATH@/authbuiltin/
-plugins/authbuiltin/etc/*.ini 	    @CONFIG_PATH@/config.ini.d/
+plugins/authbuiltin/etc/*.ini 	    etc/@PACKAGE@/config.ini.d/
 #
 utils/list-admins.php                  @BINARY_PATH@/
 utils/list-projects-using-plugin.php   @BINARY_PATH@/
diff --git a/src/packaging/links/common b/src/packaging/links/common
index 800428d..f81e4fe 100644
--- a/src/packaging/links/common
+++ b/src/packaging/links/common
@@ -1,7 +1,7 @@
 @SOURCE_PATH@/common/include/database-pgsql.php @SOURCE_PATH@/common/include/database.php
- at CONFIG_PATH@/config.ini /etc/@OLDPACKAGE@/config.ini
- at CONFIG_PATH@/config.ini.d /etc/@OLDPACKAGE@/config.ini.d
- at CONFIG_PATH@/custom /etc/@OLDPACKAGE@/custom
+/etc/@PACKAGE@/config.ini @CONFIG_PATH@/config.ini
+/etc/@PACKAGE@/config.ini.d @CONFIG_PATH@/config.ini.d
+/etc/@PACKAGE@/custom @CONFIG_PATH@/custom
 @PLUGINS_PATH@/authbuiltin/www @SOURCE_PATH@/www/plugins/authbuiltin
 
 @BINARY_PATH@/forge_wrapper usr/bin/forge_get_config

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

Summary of changes:
 src/packaging/dirs/common                                  |    2 +-
 src/packaging/install/common                               |   12 ++++++------
 src/packaging/install/web-apache2                          |    2 +-
 src/packaging/links/common                                 |    6 +++---
 src/plugins/admssw/packaging/install/plugin-admssw         |    2 +-
 src/plugins/authcas/packaging/install/plugin-authcas       |    2 +-
 src/plugins/authhttpd/packaging/install/plugin-authhttpd   |    2 +-
 src/plugins/authldap/packaging/install/plugin-authldap     |    2 +-
 src/plugins/authopenid/packaging/install/plugin-authopenid |    2 +-
 src/plugins/authwebid/packaging/install/plugin-authwebid   |    2 +-
 src/plugins/blocks/packaging/install/plugin-blocks         |    2 +-
 .../compactpreview/packaging/install/plugin-compactpreview |    2 +-
 .../contribtracker/packaging/install/plugin-contribtracker |    2 +-
 src/plugins/doaprdf/packaging/install/plugin-doaprdf       |    2 +-
 .../externalsearch/packaging/install/plugin-externalsearch |    2 +-
 src/plugins/extsubproj/packaging/install/plugin-extsubproj |    2 +-
 .../foafprofiles/packaging/install/plugin-foafprofiles     |    2 +-
 .../packaging/install/plugin-globaldashboard               |    2 +-
 src/plugins/gravatar/packaging/install/plugin-gravatar     |    2 +-
 src/plugins/headermenu/packaging/install/plugin-headermenu |    2 +-
 src/plugins/helloworld/packaging/install/plugin-helloworld |    2 +-
 src/plugins/hudson/packaging/install/plugin-hudson         |    2 +-
 src/plugins/mantisbt/packaging/install/plugin-mantisbt     |    2 +-
 src/plugins/mediawiki/packaging/install/plugin-mediawiki   |    2 +-
 src/plugins/message/packaging/install/plugin-message       |    2 +-
 src/plugins/moinmoin/packaging/install/plugin-moinmoin     |    2 +-
 .../oauthconsumer/packaging/install/plugin-oauthconsumer   |    2 +-
 .../oauthprovider/packaging/install/plugin-oauthprovider   |    2 +-
 src/plugins/oslc/packaging/install/plugin-oslc             |    2 +-
 .../projectimport/packaging/install/plugin-projectimport   |    2 +-
 .../projectlabels/packaging/install/plugin-projectlabels   |    2 +-
 .../packaging/install/plugin-projects-hierarchy            |    2 +-
 src/plugins/scmarch/packaging/install/plugin-scmarch       |    2 +-
 src/plugins/scmbzr/packaging/install/plugin-scmbzr         |    2 +-
 src/plugins/scmccase/packaging/install/plugin-scmccase     |    2 +-
 src/plugins/scmcvs/packaging/install/plugin-scmcvs         |    2 +-
 src/plugins/scmdarcs/packaging/install/plugin-scmdarcs     |    2 +-
 src/plugins/scmgit/packaging/install/plugin-scmgit         |    2 +-
 src/plugins/scmhg/packaging/install/plugin-scmhg           |    2 +-
 src/plugins/scmhook/packaging/install/plugin-scmhook       |    2 +-
 src/plugins/scmsvn/packaging/install/plugin-scmsvn         |    2 +-
 .../sysauthldap/packaging/install/plugin-sysauthldap       |    2 +-
 src/plugins/twitter/packaging/install/plugin-twitter       |    2 +-
 43 files changed, 50 insertions(+), 50 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list