[Pkg-javascript-commits] [rainloop] 38/38: Fixed line endings of patch files.
Daniel Ring
techwolf-guest at moszumanska.debian.org
Fri Dec 15 06:04:03 UTC 2017
This is an automated email from the git hooks/post-receive script.
techwolf-guest pushed a commit to branch master
in repository rainloop.
commit 1aa6679f9cf4ef8179dbd4f2fda8b4415ef0c6c0
Author: Daniel Ring <dring at wolfishly.me>
Date: Tue Dec 12 14:34:09 2017 -0800
Fixed line endings of patch files.
---
debian/patches/build.patch | 76 +++++++++++++++----------------
debian/patches/bundled-libraries.patch | 38 ++++++++--------
debian/patches/disable-version-path.patch | 46 +++++++++----------
debian/patches/set-custom-data-path.patch | 18 ++++----
4 files changed, 89 insertions(+), 89 deletions(-)
diff --git a/debian/patches/build.patch b/debian/patches/build.patch
index efcf358..c5d1920 100644
--- a/debian/patches/build.patch
+++ b/debian/patches/build.patch
@@ -2,43 +2,43 @@ Simplified build process to reduce dependencies.
--- a/webpack.config.builder.js
+++ b/webpack.config.builder.js
@@ -3,8 +3,6 @@
- path = require('path'),
- webpack = require('webpack'),
- devPath = path.resolve(__dirname, 'dev'),
-- CopyWebpackPlugin = require('copy-webpack-plugin'),
-- WebpackNotifierPlugin = require('webpack-notifier'),
- loose = true;
-
- process.noDeprecation = true;
+ path = require('path'),
+ webpack = require('webpack'),
+ devPath = path.resolve(__dirname, 'dev'),
+- CopyWebpackPlugin = require('copy-webpack-plugin'),
+- WebpackNotifierPlugin = require('webpack-notifier'),
+ loose = true;
+
+ process.noDeprecation = true;
@@ -28,15 +26,10 @@
- 'process.env': {
- NODE_ENV: '"production"'
- }
-- }),
-- new WebpackNotifierPlugin(),
-- new CopyWebpackPlugin([
-- {from: 'debian/lib/openpgp/dist/openpgp.min.js', to: 'js/min/openpgp.min.js'},
-- {from: 'debian/lib/openpgp/dist/openpgp.worker.min.js', to: 'js/min/openpgp.worker.min.js'}
-- ])
-+ })
- ],
- resolve: {
-- modules: [devPath, 'node_modules'],
-+ modules: [devPath, 'node_modules', '/usr/lib/nodejs'],
- extensions: ['.js'],
- alias: {
- 'pikaday$': __dirname + '/debian/lib/pikaday/pikaday.js',
+ 'process.env': {
+ NODE_ENV: '"production"'
+ }
+- }),
+- new WebpackNotifierPlugin(),
+- new CopyWebpackPlugin([
+- {from: 'debian/lib/openpgp/dist/openpgp.min.js', to: 'js/min/openpgp.min.js'},
+- {from: 'debian/lib/openpgp/dist/openpgp.worker.min.js', to: 'js/min/openpgp.worker.min.js'}
+- ])
++ })
+ ],
+ resolve: {
+- modules: [devPath, 'node_modules'],
++ modules: [devPath, 'node_modules', '/usr/lib/nodejs'],
+ extensions: ['.js'],
+ alias: {
+ 'pikaday$': __dirname + '/debian/lib/pikaday/pikaday.js',
@@ -46,6 +39,13 @@
- 'ko$': __dirname + '/dev/External/ko.js'
- }
- },
-+ resolveLoader: {
-+ alias: {
-+ 'raw-loader': '/usr/lib/nodejs/raw-loader',
-+ 'style-loader': '/usr/lib/nodejs/style-loader',
-+ 'babel-loader': '/usr/lib/nodejs/babel-loader'
-+ },
-+ },
- module: {
- rules: [
- {
+ 'ko$': __dirname + '/dev/External/ko.js'
+ }
+ },
++ resolveLoader: {
++ alias: {
++ 'raw-loader': '/usr/lib/nodejs/raw-loader',
++ 'style-loader': '/usr/lib/nodejs/style-loader',
++ 'babel-loader': '/usr/lib/nodejs/babel-loader'
++ },
++ },
+ module: {
+ rules: [
+ {
diff --git a/debian/patches/bundled-libraries.patch b/debian/patches/bundled-libraries.patch
index dc9734c..13a90b7 100644
--- a/debian/patches/bundled-libraries.patch
+++ b/debian/patches/bundled-libraries.patch
@@ -24,22 +24,22 @@ Bundled libraries missing from Debian.
--- a/webpack.config.builder.js
+++ b/webpack.config.builder.js
@@ -31,14 +31,17 @@
- }),
- new WebpackNotifierPlugin(),
- new CopyWebpackPlugin([
-- {from: 'node_modules/openpgp/dist/openpgp.min.js', to: 'js/min/openpgp.min.js'},
-- {from: 'node_modules/openpgp/dist/openpgp.worker.min.js', to: 'js/min/openpgp.worker.min.js'}
-+ {from: 'debian/lib/openpgp/dist/openpgp.min.js', to: 'js/min/openpgp.min.js'},
-+ {from: 'debian/lib/openpgp/dist/openpgp.worker.min.js', to: 'js/min/openpgp.worker.min.js'}
- ])
- ],
- resolve: {
- modules: [devPath, 'node_modules'],
- extensions: ['.js'],
- alias: {
-+ 'pikaday$': __dirname + '/debian/lib/pikaday/pikaday.js',
-+ 'js-cookie$': __dirname + '/debian/lib/js-cookie/js.cookie.js',
-+ 'classnames$': __dirname + '/debian/lib/classnames/index.js',
- 'Opentip$': __dirname + '/dev/External/Opentip.js',
- 'ko$': __dirname + '/dev/External/ko.js'
- }
+ }),
+ new WebpackNotifierPlugin(),
+ new CopyWebpackPlugin([
+- {from: 'node_modules/openpgp/dist/openpgp.min.js', to: 'js/min/openpgp.min.js'},
+- {from: 'node_modules/openpgp/dist/openpgp.worker.min.js', to: 'js/min/openpgp.worker.min.js'}
++ {from: 'debian/lib/openpgp/dist/openpgp.min.js', to: 'js/min/openpgp.min.js'},
++ {from: 'debian/lib/openpgp/dist/openpgp.worker.min.js', to: 'js/min/openpgp.worker.min.js'}
+ ])
+ ],
+ resolve: {
+ modules: [devPath, 'node_modules'],
+ extensions: ['.js'],
+ alias: {
++ 'pikaday$': __dirname + '/debian/lib/pikaday/pikaday.js',
++ 'js-cookie$': __dirname + '/debian/lib/js-cookie/js.cookie.js',
++ 'classnames$': __dirname + '/debian/lib/classnames/index.js',
+ 'Opentip$': __dirname + '/dev/External/Opentip.js',
+ 'ko$': __dirname + '/dev/External/ko.js'
+ }
diff --git a/debian/patches/disable-version-path.patch b/debian/patches/disable-version-path.patch
index 0c9f028..9c7c347 100644
--- a/debian/patches/disable-version-path.patch
+++ b/debian/patches/disable-version-path.patch
@@ -20,14 +20,14 @@ Remove version number from pathnames.
--- 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>");
+
+ 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 @@
@@ -52,18 +52,18 @@ Remove version number from pathnames.
--- 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
- {
+ 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/set-custom-data-path.patch b/debian/patches/set-custom-data-path.patch
index 952fd6e..3d3c53e 100644
--- a/debian/patches/set-custom-data-path.patch
+++ b/debian/patches/set-custom-data-path.patch
@@ -1,12 +1,12 @@
-Set path for runtime data storage outside of static file directory.
+Set path for runtime data storage outside of static file directory.
--- a/rainloop/v/0.0.0/include.php
+++ b/rainloop/v/0.0.0/include.php
@@ -47,7 +47,7 @@
- define('APP_REPOSITORY_PATH', 'http://repository.rainloop.net/v1/');
- define('APP_REPO_CORE_FILE', 'http://repository.rainloop.net/v2/core.{{channel}}.json');
-
-- $sCustomDataPath = '';
-+ $sCustomDataPath = '/var/lib/rainloop';
- $sCustomConfiguration = '';
-
- if (file_exists(APP_INDEX_ROOT_PATH.'include.php'))
+ define('APP_REPOSITORY_PATH', 'http://repository.rainloop.net/v1/');
+ define('APP_REPO_CORE_FILE', 'http://repository.rainloop.net/v2/core.{{channel}}.json');
+
+- $sCustomDataPath = '';
++ $sCustomDataPath = '/var/lib/rainloop';
+ $sCustomConfiguration = '';
+
+ if (file_exists(APP_INDEX_ROOT_PATH.'include.php'))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/rainloop.git
More information about the Pkg-javascript-commits
mailing list