[Pkg-javascript-commits] [rainloop] 03/38: Removed version number from pathnames. Added lintian override for long line in source code.

[Daniel Ring]

This is an automated email from the git hooks/post-receive script.

techwolf-guest pushed a commit to branch master
in repository rainloop.

commit 9e22e00f360ec8f6f2d3d356cb79cd3059b9c14e
Author: Techwolf <dring at g33kworld.net>
Date:   Thu May 4 19:50:51 2017 -0700

    Removed version number from pathnames.
    Added lintian override for long line in source code.
---
 debian/patches/disable-version-path.patch | 86 +++++++++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 debian/rainloop.install                   |  3 +-
 debian/rules                              |  2 +-
 debian/source/lintian-overrides           |  2 +
 5 files changed, 91 insertions(+), 3 deletions(-)

diff --git a/debian/patches/disable-version-path.patch b/debian/patches/disable-version-path.patch
new file mode 100644
index 0000000..d974ac3
--- /dev/null
+++ b/debian/patches/disable-version-path.patch
@@ -0,0 +1,86 @@
+Remove version number from pathnames.
+--- a/gulpfile.js
++++ b/gulpfile.js
+@@ -478,13 +478,11 @@
+ 	fs.writeFileSync(dist + 'data/VERSION', versionFull);
+ 	fs.writeFileSync(dist + 'data/EMPTY', versionFull);
+ 
+-	fs.writeFileSync(dist + 'index.php', fs.readFileSync('index.php', 'utf8')
++	fs.writeFileSync(dist + 'rainloop/v/' + versionFull + '/index.php', fs.readFileSync('index.php', 'utf8')
+ 		.replace('\'APP_VERSION\', \'0.0.0\'', '\'APP_VERSION\', \'' + versionFull + '\'')
+ 		.replace('\'APP_VERSION_TYPE\', \'source\'', '\'APP_VERSION_TYPE\', \'' + (cfg.community ? 'community' : 'standard') + '\'')
+ 	);
+ 
+-	fs.writeFileSync(dist + 'rainloop/v/' + versionFull + '/index.php.root', fs.readFileSync(dist + 'index.php'));
+-
+ 	if (cfg.community)
+ 	{
+ 		require('rimraf').sync(dist + 'rainloop/v/' + versionFull + '/app/libraries/RainLoop/Providers/Prem.php');
+--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Utils.php
++++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Utils.php
+@@ -630,7 +630,7 @@
+ 	 */
+ 	public static function WebVersionPath()
+ 	{
+-		return self::WebPath().'rainloop/v/'.APP_VERSION.'/';
++		return self::WebPath();
+ 	}
+ 
+ 	/**
+@@ -732,4 +732,4 @@
+ 
+ 		return $mRetVal;
+ 	}
+-}
+\ No newline at end of file
++}
+--- a/rainloop/v/0.0.0/include.php
++++ b/rainloop/v/0.0.0/include.php
+@@ -13,7 +13,7 @@
+ 
+ 			define('APP_START_TIME', time());
+ 			define('APP_REQUEST_RND', md5(APP_START.rand(10000, 99999).APP_START));
+-			define('APP_VERSION_ROOT_PATH', APP_INDEX_ROOT_PATH.'rainloop/v/'.APP_VERSION.'/');
++			define('APP_VERSION_ROOT_PATH', APP_INDEX_ROOT_PATH);
+ 
+ 			define('APP_USE_APC_CACHE', true);
+ 			define('APP_DEFAULT_DENY_ALL_HTACCESS', "Deny from all\n<IfModule mod_autoindex.c>\nOptions -Indexes\n</ifModule>");
+--- a/rainloop/v/0.0.0/index.php.root
++++ /dev/null
+@@ -1,18 +0,0 @@
+-<?php
+-
+-if (!defined('APP_VERSION'))
+-{
+-	define('APP_VERSION', '0.0.0');
+-	define('APP_INDEX_ROOT_FILE', __FILE__);
+-	define('APP_INDEX_ROOT_PATH', str_replace('\\', '/', rtrim(dirname(__FILE__), '\\/').'/'));
+-}
+-
+-if (file_exists(APP_INDEX_ROOT_PATH.'rainloop/v/'.APP_VERSION.'/index.php'))
+-{
+-	return include APP_INDEX_ROOT_PATH.'rainloop/v/'.APP_VERSION.'/index.php';
+-}
+-else
+-{
+-	echo '[105] Missing version directory';
+-	exit(105);
+-}
+--- a/index.php
++++ b/index.php
+@@ -5,12 +5,12 @@
+ 	define('APP_VERSION', '0.0.0');
+ 	define('APP_VERSION_TYPE', 'source');
+ 	define('APP_INDEX_ROOT_FILE', __FILE__);
+-	define('APP_INDEX_ROOT_PATH', str_replace('\\', '/', rtrim(dirname(__FILE__), '\\/').'/'));
++	define('APP_INDEX_ROOT_PATH', '/usr/share/rainloop/');
+ }
+ 
+-if (file_exists(APP_INDEX_ROOT_PATH.'rainloop/v/'.APP_VERSION.'/include.php'))
++if (file_exists(APP_INDEX_ROOT_PATH.'include.php'))
+ {
+-	include APP_INDEX_ROOT_PATH.'rainloop/v/'.APP_VERSION.'/include.php';
++	include APP_INDEX_ROOT_PATH.'include.php';
+ }
+ else
+ {
diff --git a/debian/patches/series b/debian/patches/series
index 4c4b011..98a4f65 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+disable-version-path.patch
 set-custom-data-path.patch
diff --git a/debian/rainloop.install b/debian/rainloop.install
index c003341..b4b4ad0 100644
--- a/debian/rainloop.install
+++ b/debian/rainloop.install
@@ -1,4 +1,3 @@
-build/dist/releases/webmail/*/src/rainloop		/usr/share/rainloop
-build/dist/releases/webmail/*/src/index.php		/usr/share/rainloop
+build/dist/releases/webmail/*/src/rainloop/v/*/*	/usr/share/rainloop
 build/dist/releases/webmail/*/src/data/*		/var/lib/rainloop
 debian/conf/application.ini				/etc/rainloop
diff --git a/debian/rules b/debian/rules
index adecb90..02e72a1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 export DH_VERBOSE = 1
 
 %:
-	dh $@ 
+	dh $@
 
 override_dh_auto_configure:
 	npm install --save-dev
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..fd65693
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,2 @@
+#Base64 embedded image in single line of source file
+rainloop source: source-is-missing dev/Common/Consts.js *

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/rainloop.git