[Fusionforge-commits] FusionForge branch master updated. 57338eed6dda73c47a927b490419cd7ed0a6d3f6

Sylvain Beucler beuc-inria at fusionforge.org
Thu Sep 4 18:30:59 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, master has been updated
       via  57338eed6dda73c47a927b490419cd7ed0a6d3f6 (commit)
      from  86448002649acf0af1207c659fe9902f3e474cbd (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 57338eed6dda73c47a927b490419cd7ed0a6d3f6
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Thu Sep 4 18:29:37 2014 +0200

    Move simplepie.inc to vendor/ to ease packaging

diff --git a/src/common/widget/Widget_Rss.class.php b/src/common/widget/Widget_Rss.class.php
index 73a6a5d..7e383b0 100644
--- a/src/common/widget/Widget_Rss.class.php
+++ b/src/common/widget/Widget_Rss.class.php
@@ -50,7 +50,7 @@ require_once 'Widget.class.php';
 					return idn_to_unicode($param);
 				}
 			}
-			require_once 'common/rss/simplepie.inc';
+			require_once 'simplepie/simplepie.inc';
 			if (!is_dir(forge_get_config('data_path') .'/rss')) {
 				if (!mkdir(forge_get_config('data_path') .'/rss')) {
 					$content .= $HTML->error_msg(_('Cannot create backend directory. Contact forge administrator.'));
@@ -147,12 +147,7 @@ require_once 'Widget.class.php';
 			$vTitle = new Valid_String('title');
 			$vTitle->required();
 			if (!$request->validInArray('rss', $vTitle)) {
-				if (function_exists('idn_to_utf8()')) {
-					require_once 'simplepie/simplepie.inc';
-				}
-				else {
-					require_once 'common/rss/simplepie.inc';
-				}
+				require_once 'simplepie/simplepie.inc';
 				if (!is_dir(forge_get_config('data_path') .'/rss')) {
 					mkdir(forge_get_config('data_path') .'/rss');
 				}
diff --git a/src/debian/control.in b/src/debian/control.in
index 800b952..0e97736 100644
--- a/src/debian/control.in
+++ b/src/debian/control.in
@@ -73,7 +73,7 @@ Description: collaborative development tool - database (remote)
 
 Package: fusionforge-web
 Architecture: all
-Depends: fusionforge-common (=${source:Version}), fusionforge-db, php5-cli, libapache2-mod-php5, python, ucf, ${misc:Depends}
+Depends: fusionforge-common (=${source:Version}), fusionforge-db, php5-cli, libapache2-mod-php5, libphp-simplepie, python, ucf, ${misc:Depends}
 Recommends: locales-all
 Description: collaborative development tool - web part (using Apache)
  FusionForge provides many tools to aid collaboration in a
diff --git a/src/debian/gen_control.sh b/src/debian/gen_control.sh
index f47c703..4082558 100755
--- a/src/debian/gen_control.sh
+++ b/src/debian/gen_control.sh
@@ -31,3 +31,5 @@
 	echo
     done
 ) > debian/control
+# Not possible because dpkg-gencontrol requires write permission to read it(!?)
+# chmod a-w debian/control
diff --git a/src/debian/rules b/src/debian/rules
index bc6a1d7..8a1188e 100755
--- a/src/debian/rules
+++ b/src/debian/rules
@@ -39,6 +39,8 @@ override_dh_auto_install:
 			echo plugins/$$i/README > debian/fusionforge-plugin-$$i.docs; \
 		fi; \
 	done
+#	embedded-php-library usr/share/fusionforge/vendor/simplepie/simplepie.inc -> libphp-simplepie
+	rm -rf debian/fusionforge-web/usr/share/fusionforge/vendor/simplepie/
 
 override_dh_clean:
 	dh_clean
diff --git a/src/rpm/gen_spec.sh b/src/rpm/gen_spec.sh
index 06df577..895124d 100755
--- a/src/rpm/gen_spec.sh
+++ b/src/rpm/gen_spec.sh
@@ -46,3 +46,4 @@ if [ -z "$autobuild" ]; then autobuild=''; fi
     -e "s/@snapshot@/$snapshot/" \
     -e '/^@plugins@/ { ' -e 'ecat' -e 'd }' \
     rpm/fusionforge.spec.in > fusionforge.spec
+chmod a-w fusionforge.spec
diff --git a/src/templates/httpd.conf.d/02-config-main.conf b/src/templates/httpd.conf.d/02-config-main.conf
index e031b83..4594ee0 100644
--- a/src/templates/httpd.conf.d/02-config-main.conf
+++ b/src/templates/httpd.conf.d/02-config-main.conf
@@ -11,8 +11,6 @@
   #
   # PHP settings
   #
-  
-  php_admin_value include_path "{core/source_path}:{core/source_path}/www/include:{core/source_path}/common/include:{core/source_path}/plugins:{core/source_path}/vendor:/usr/share/php:/usr/share/php/htmlpurifier:/usr/share/pear:."
   php_admin_value default_charset "UTF-8"
   php_flag register_globals "off"
   php_flag magic_quotes_gpc "off"
diff --git a/src/common/rss/simplepie.inc b/src/vendor/simplepie/simplepie.inc
similarity index 100%
rename from src/common/rss/simplepie.inc
rename to src/vendor/simplepie/simplepie.inc

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

Summary of changes:
 src/common/widget/Widget_Rss.class.php             |    9 ++-------
 src/debian/control.in                              |    2 +-
 src/debian/gen_control.sh                          |    2 ++
 src/debian/rules                                   |    2 ++
 src/rpm/gen_spec.sh                                |    1 +
 src/templates/httpd.conf.d/02-config-main.conf     |    2 --
 src/{common/rss => vendor/simplepie}/simplepie.inc |    0
 7 files changed, 8 insertions(+), 10 deletions(-)
 rename src/{common/rss => vendor/simplepie}/simplepie.inc (100%)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list