[Fusionforge-commits] FusionForge branch Branch_5_3 updated. 4acee484d0b6e68a66ff31fe50435f449fdf93fe

Sylvain Beucler beuc-inria at fusionforge.org
Mon Jun 2 15:36:39 CEST 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  4acee484d0b6e68a66ff31fe50435f449fdf93fe (commit)
       via  4f5d0522d4be32497455c9cdf38e1510d20c9c8b (commit)
       via  dc7f892083a7e29d251e40e2f63cd288e3688360 (commit)
       via  697caa41dd34a3f4a104b4ab6113881da57415f5 (commit)
      from  634a3108c60dd1af293a4f95d5230ace20a5aee3 (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 4acee484d0b6e68a66ff31fe50435f449fdf93fe
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Mon Jun 2 15:26:26 2014 +0200

    packaging: tidy for 5.3.1
    
      * Fix permissions or remove shebang when not needed
        (fixes 'executable-not-elf-or-script').
      * gforge-db-remote: depend on ${misc:Depends} (fixes 'debhelper-but-no-misc-depends')
      * Precise debhelper version (fixes 'debhelper-overrides-need-versioned-build-depends').
      * Install ini files directly in /etc/fusionforge/, not through the
        /etc/gforge/* symlinks (fixes 'binaries-have-file-conflict')
      * gforge-common: add Lintian overrides for group-writable 'non-standard-dir-perm'
      * fusionforge-plugin-scmhook: add Lintian overrides for 'script-not-executable' on template files
      * fusionforge-plugin-admssw: word-wrap description (fixes
        'extended-description-line-too-long')

diff --git a/src/db/20010304-4-artifact-convert-files.php b/src/db/20010304-4-artifact-convert-files.php
old mode 100755
new mode 100644
diff --git a/src/db/20021213-2-doc_data-migrate.php b/src/db/20021213-2-doc_data-migrate.php
old mode 100755
new mode 100644
diff --git a/src/db/20040826_migrateforum.php b/src/db/20040826_migrateforum.php
old mode 100755
new mode 100644
index a927de1..7de0394
--- a/src/db/20040826_migrateforum.php
+++ b/src/db/20040826_migrateforum.php
@@ -1,4 +1,3 @@
-#! /usr/bin/php
 <?php
 /**
  * GForge Forum Renamer - forum names are now unix-format for email gateway
diff --git a/src/db/20040826_migraterbac.php b/src/db/20040826_migraterbac.php
old mode 100755
new mode 100644
index 1116eb4..342c230
--- a/src/db/20040826_migraterbac.php
+++ b/src/db/20040826_migraterbac.php
@@ -1,4 +1,3 @@
-#! /usr/bin/php
 <?php
 /**
  * GForge Group Role Generator
diff --git a/src/db/20041211-syncmail.php b/src/db/20041211-syncmail.php
index 92d3c3d..7e30f68 100644
--- a/src/db/20041211-syncmail.php
+++ b/src/db/20041211-syncmail.php
@@ -1,4 +1,3 @@
-#! /usr/bin/php
 <?php
 require_once dirname(__FILE__).'/../www/env.inc.php';
 require_once $gfcommon.'include/pre.php';
diff --git a/src/db/20041222-1-delete-task-artifact.php b/src/db/20041222-1-delete-task-artifact.php
index b16f587..79b4b8e 100644
--- a/src/db/20041222-1-delete-task-artifact.php
+++ b/src/db/20041222-1-delete-task-artifact.php
@@ -1,4 +1,3 @@
-#! /usr/bin/php
 <?php
 require_once dirname(__FILE__).'/../www/env.inc.php';
 require_once $gfcommon.'include/pre.php';
diff --git a/src/db/20050127-frs-reorg.php b/src/db/20050127-frs-reorg.php
old mode 100755
new mode 100644
index 5e7fc1e..f98c818
--- a/src/db/20050127-frs-reorg.php
+++ b/src/db/20050127-frs-reorg.php
@@ -1,4 +1,3 @@
-#! /usr/bin/php
 <?php
 /**
  * GForge Group Role Generator
diff --git a/src/db/20050325-3.php b/src/db/20050325-3.php
old mode 100755
new mode 100644
index dc63f92..2a4c67a
--- a/src/db/20050325-3.php
+++ b/src/db/20050325-3.php
@@ -1,4 +1,3 @@
-#! /usr/bin/php
 <?php
 /**
  * GForge Extra Field Conversion Script
diff --git a/src/db/20050617.php b/src/db/20050617.php
old mode 100755
new mode 100644
index 4fb14fb..84ac08b
--- a/src/db/20050617.php
+++ b/src/db/20050617.php
@@ -1,4 +1,3 @@
-#! /usr/bin/php
 <?php
 /**
  * Extra field alias - Create aliases for the extra fields
diff --git a/src/db/20050804-2.php b/src/db/20050804-2.php
index 384bbb6..4abedb4 100644
--- a/src/db/20050804-2.php
+++ b/src/db/20050804-2.php
@@ -1,4 +1,3 @@
-#! /usr/bin/php5
 <?php
 /**
  * FusionForge Group Docman updater
diff --git a/src/db/20120409-tracker-attachement-moved-in-fs.php b/src/db/20120409-tracker-attachement-moved-in-fs.php
old mode 100755
new mode 100644
index 4d42457..d046f4c
--- a/src/db/20120409-tracker-attachement-moved-in-fs.php
+++ b/src/db/20120409-tracker-attachement-moved-in-fs.php
@@ -1,4 +1,3 @@
-#! /usr/bin/php
 <?php
 /**
  *
diff --git a/src/db/20120603-docman-file-moved-in-fs.php b/src/db/20120603-docman-file-moved-in-fs.php
old mode 100755
new mode 100644
index e121c1d..8847624
--- a/src/db/20120603-docman-file-moved-in-fs.php
+++ b/src/db/20120603-docman-file-moved-in-fs.php
@@ -1,4 +1,3 @@
-#! /usr/bin/php
 <?php
 /**
  *
diff --git a/src/db/20120610-migrate-sshkeys.php b/src/db/20120610-migrate-sshkeys.php
old mode 100755
new mode 100644
index 2b7d718..f192d1b
--- a/src/db/20120610-migrate-sshkeys.php
+++ b/src/db/20120610-migrate-sshkeys.php
@@ -1,4 +1,3 @@
-#! /usr/bin/php
 <?php
 /**
  * ssh keys backend migration
diff --git a/src/packaging/control/000source b/src/packaging/control/000source
index 77ef848..78624d7 100644
--- a/src/packaging/control/000source
+++ b/src/packaging/control/000source
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Roland Mas <lolando at debian.org>
 Uploaders: Christian Bayle <bayle at debian.org>, Olivier Berger <obergix at debian.org>, Sylvain Beucler <beuc at debian.org>
 Build-Depends-Indep: sharutils, docbook-to-man, devscripts, gettext, isoquery, iso-codes
-Build-Depends: debhelper (>= 7), quilt (>= 0.40), perl, confget, moreutils
+Build-Depends: debhelper (>= 7.0.50~), quilt (>= 0.40), perl, confget, moreutils
 Standards-Version: 3.9.5
 Homepage: https://fusionforge.org/
 Vcs-Git: https://fusionforge.org/anonscm/git/deb-packaging/deb-packaging.git
diff --git a/src/packaging/control/055db-remote b/src/packaging/control/055db-remote
index 1c6aac7..5c024b1 100644
--- a/src/packaging/control/055db-remote
+++ b/src/packaging/control/055db-remote
@@ -2,4 +2,5 @@ Package: @OLDPACKAGE at -db-remote
 Architecture: all
 Provides: @OLDPACKAGE at -db
 Conflicts: @OLDPACKAGE at -db
+Depends: ${misc:Depends}
 Description: collaborative development tool - database (remote)
diff --git a/src/packaging/dirs/web-apache2 b/src/packaging/dirs/web-apache2
index fd1d592..4bcbafc 100644
--- a/src/packaging/dirs/web-apache2
+++ b/src/packaging/dirs/web-apache2
@@ -1,4 +1,3 @@
- at CONFIG_PATH@/custom
 @CONFIG_PATH@/languages-local
 @CONFIG_PATH@/templates
 @BINARY_PATH@
diff --git a/src/packaging/install/web-apache2 b/src/packaging/install/web-apache2
index 56a4c1f..fae0fe9 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/control/222plugin-admssw.shortdesc b/src/plugins/admssw/packaging/control/222plugin-admssw.shortdesc
index ced7f74..ee7c8a7 100644
--- a/src/plugins/admssw/packaging/control/222plugin-admssw.shortdesc
+++ b/src/plugins/admssw/packaging/control/222plugin-admssw.shortdesc
@@ -1,3 +1,3 @@
- This plugin provides ADMS.SW additions to the DOAP RDF documents for projects on /projects URLs 
- with content-negociation (application/rdf+xml).
- 
\ No newline at end of file
+ This plugin provides ADMS.SW additions to the DOAP RDF documents for
+ projects on /projects URLs with content-negociation
+ (application/rdf+xml).
diff --git a/src/plugins/blocks/packaging/install/plugin-blocks b/src/plugins/blocks/packaging/install/plugin-blocks
index 8892e5f..fc201a5 100644
--- a/src/plugins/blocks/packaging/install/plugin-blocks
+++ b/src/plugins/blocks/packaging/install/plugin-blocks
@@ -1,4 +1,4 @@
 plugins/blocks/common/*               @PLUGIN_PATH@/blocks/common/
 plugins/blocks/db/*                   @PLUGIN_PATH@/blocks/db/
 plugins/blocks/www/*                  @PLUGIN_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/contribtracker/packaging/install/plugin-contribtracker b/src/plugins/contribtracker/packaging/install/plugin-contribtracker
index 2c42dd2..70629b5 100644
--- a/src/plugins/contribtracker/packaging/install/plugin-contribtracker
+++ b/src/plugins/contribtracker/packaging/install/plugin-contribtracker
@@ -1,4 +1,4 @@
 plugins/contribtracker/common/* @PLUGIN_PATH@/contribtracker/common/
 plugins/contribtracker/db/* @PLUGIN_PATH@/contribtracker/db/
-plugins/contribtracker/etc/*.ini @CONFIG_PATH@/config.ini.d/
+plugins/contribtracker/etc/*.ini etc/@PACKAGE@/config.ini.d/
 plugins/contribtracker/www/* @PLUGIN_PATH@/contribtracker/www/
diff --git a/src/plugins/moinmoin/packaging/install/plugin-moinmoin b/src/plugins/moinmoin/packaging/install/plugin-moinmoin
index 8503701..bd87eca 100644
--- a/src/plugins/moinmoin/packaging/install/plugin-moinmoin
+++ b/src/plugins/moinmoin/packaging/install/plugin-moinmoin
@@ -4,5 +4,5 @@ plugins/moinmoin/cronjobs/*       @PLUGIN_PATH@/moinmoin/cronjobs/
 plugins/moinmoin/lib/*            @PLUGIN_PATH@/moinmoin/lib/
 plugins/moinmoin/www/*            @PLUGIN_PATH@/moinmoin/www/
 plugins/moinmoin/wsgi/moin.wsgi   @PLUGIN_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/scmhook/library/scmsvn/hooks/checkmimetype/check-mime-type.pl b/src/plugins/scmhook/library/scmsvn/hooks/checkmimetype/check-mime-type.pl
old mode 100644
new mode 100755
diff --git a/src/plugins/scmhook/library/scmsvn/hooks/commitemail/commit-email.php b/src/plugins/scmhook/library/scmsvn/hooks/commitemail/commit-email.php
old mode 100644
new mode 100755
diff --git a/src/utils/default_page.php b/src/utils/default_page.php
old mode 100755
new mode 100644

commit 4f5d0522d4be32497455c9cdf38e1510d20c9c8b
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Mon Jun 2 15:25:16 2014 +0200

    vm: use 5.3 by default; it's easier to upgrade to master than downgrade from it

diff --git a/vm/packer/scripts/fusionforge-source.sh b/vm/packer/scripts/fusionforge-source.sh
index 9658c5c..7636391 100644
--- a/vm/packer/scripts/fusionforge-source.sh
+++ b/vm/packer/scripts/fusionforge-source.sh
@@ -17,11 +17,11 @@ git config --global color.branch auto
 # Install sources
 if [ -e /etc/debian_version ]; then
     apt-get -y --force-yes install git
-    repo='git://fusionforge.org/deb-packaging/deb-packaging.git -b debian/master'
+    repo='git://fusionforge.org/deb-packaging/deb-packaging.git -b debian/5.3'
 else
     echo "TODO: instructions for CentOS" >> /etc/issue
     yum -y install git
-    repo=git://fusionforge.org/fusionforge/fusionforge.git
+    repo='git://fusionforge.org/fusionforge/fusionforge.git -b Branch_5_3'
 fi
 
 cd /usr/src/

commit dc7f892083a7e29d251e40e2f63cd288e3688360
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Mon Jun 2 15:24:37 2014 +0200

    vm: always regen debian/control

diff --git a/vm/scripts/build.sh b/vm/scripts/build.sh
index 3d6cecd..f0109b9 100755
--- a/vm/scripts/build.sh
+++ b/vm/scripts/build.sh
@@ -102,6 +102,7 @@ if [ $? -eq 0 ]; then
     echo "WARNING: It is likely that the mounted /tmp could be too short. If you experience a build error bellow, Try make some room on the FS and reboot, first."
 fi
 
+debian/rules debian/control  # re-gen debian/control from packaging/*
 dch --newversion $(dpkg-parsechangelog | sed -n 's/^Version: \([0-9.]\+\(\~rc[0-9]\)\?\).*/\1/p')+$(date +%Y%m%d%H%M)-1 --distribution local --force-distribution "Autobuilt."
 debuild --no-lintian --no-tgz-check -us -uc -tc  # using -tc so 'bzr st' is readable
 

commit 697caa41dd34a3f4a104b4ab6113881da57415f5
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Mon Jun 2 15:24:09 2014 +0200

    vm: more comprehensive uninstall script

diff --git a/vm/scripts/uninstall.sh b/vm/scripts/uninstall.sh
index 2095a7c..40bae86 100755
--- a/vm/scripts/uninstall.sh
+++ b/vm/scripts/uninstall.sh
@@ -1,2 +1,3 @@
 #!/bin/bash
-aptitude purge $(dpkg -l '*forge*' | grep -E '^(ii|rc)' | cut -b5- | awk '{print $1}')
+# Aggressive desinstall for testing a clean re-install
+aptitude purge ~nforge ~npostgres ~nnss-pgsql ~napache2 ~nphp ~npostfix ~nexim4 && rm -rf /usr/share/gforge/ /etc/fusionforge/

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

Summary of changes:
 src/db/20040826_migrateforum.php                                 |    1 -
 src/db/20040826_migraterbac.php                                  |    1 -
 src/db/20041211-syncmail.php                                     |    1 -
 src/db/20041222-1-delete-task-artifact.php                       |    1 -
 src/db/20050127-frs-reorg.php                                    |    1 -
 src/db/20050325-3.php                                            |    1 -
 src/db/20050617.php                                              |    1 -
 src/db/20050804-2.php                                            |    1 -
 src/db/20120409-tracker-attachement-moved-in-fs.php              |    1 -
 src/db/20120603-docman-file-moved-in-fs.php                      |    1 -
 src/db/20120610-migrate-sshkeys.php                              |    1 -
 src/packaging/control/000source                                  |    2 +-
 src/packaging/control/055db-remote                               |    1 +
 src/packaging/dirs/web-apache2                                   |    1 -
 src/packaging/install/web-apache2                                |    2 +-
 src/plugins/admssw/packaging/control/222plugin-admssw.shortdesc  |    6 +++---
 src/plugins/blocks/packaging/install/plugin-blocks               |    2 +-
 .../contribtracker/packaging/install/plugin-contribtracker       |    2 +-
 src/plugins/moinmoin/packaging/install/plugin-moinmoin           |    2 +-
 vm/packer/scripts/fusionforge-source.sh                          |    4 ++--
 vm/scripts/build.sh                                              |    1 +
 vm/scripts/uninstall.sh                                          |    3 ++-
 22 files changed, 14 insertions(+), 23 deletions(-)
 mode change 100755 => 100644 src/db/20010304-4-artifact-convert-files.php
 mode change 100755 => 100644 src/db/20021213-2-doc_data-migrate.php
 mode change 100755 => 100644 src/db/20040826_migrateforum.php
 mode change 100755 => 100644 src/db/20040826_migraterbac.php
 mode change 100755 => 100644 src/db/20050127-frs-reorg.php
 mode change 100755 => 100644 src/db/20050325-3.php
 mode change 100755 => 100644 src/db/20050617.php
 mode change 100755 => 100644 src/db/20120409-tracker-attachement-moved-in-fs.php
 mode change 100755 => 100644 src/db/20120603-docman-file-moved-in-fs.php
 mode change 100755 => 100644 src/db/20120610-migrate-sshkeys.php
 mode change 100644 => 100755 src/plugins/scmhook/library/scmsvn/hooks/checkmimetype/check-mime-type.pl
 mode change 100644 => 100755 src/plugins/scmhook/library/scmsvn/hooks/commitemail/commit-email.php
 mode change 100755 => 100644 src/utils/default_page.php


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list