[Pkg-javascript-commits] [node-connect] 21/23: removed debian/patches - no longer needed

Leo Iannacone l3on-guest at moszumanska.debian.org
Sun Jun 15 16:36:19 UTC 2014


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

l3on-guest pushed a commit to branch master
in repository node-connect.

commit 6740dbf6acdf6ab754dacbf347c5dc8c0e2e601b
Author: Leo Iannacone <l3on at ubuntu.com>
Date:   Sun Jun 15 18:25:50 2014 +0200

    removed debian/patches - no longer needed
---
 debian/patches/00-fix_public_path.patch | 72 ---------------------------------
 debian/patches/series                   |  1 -
 2 files changed, 73 deletions(-)

diff --git a/debian/patches/00-fix_public_path.patch b/debian/patches/00-fix_public_path.patch
deleted file mode 100644
index 979d8a8..0000000
--- a/debian/patches/00-fix_public_path.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From: David Paleino <dapal at debian.org>
-Subject: move public/ under /usr/share/node-connect/
-Origin: vendor
-Forwarded: no
-
----
- lib/middleware/directory.js    |    6 +++---
- lib/middleware/errorHandler.js |    6 +++---
- lib/middleware/favicon.js      |    4 ++--
- 3 files changed, 8 insertions(+), 8 deletions(-)
-
---- node-connect.orig/lib/middleware/directory.js
-+++ node-connect/lib/middleware/directory.js
-@@ -100,9 +100,9 @@ exports = module.exports = function dire
-  */
- 
- exports.html = function(req, res, files, next, dir, showUp, icons){
--  fs.readFile(__dirname + '/../public/directory.html', 'utf8', function(err, str){
-+  fs.readFile('/usr/share/node-connect/public/directory.html', 'utf8', function(err, str){
-     if (err) return next(err);
--    fs.readFile(__dirname + '/../public/style.css', 'utf8', function(err, style){
-+    fs.readFile('/usr/share/node-connect/public/style.css', 'utf8', function(err, style){
-       if (err) return next(err);
-       if (showUp) files.unshift('..');
-       str = str
-@@ -186,7 +186,7 @@ function html(files, dir, useIcons) {
- 
- function load(icon) {
-   if (cache[icon]) return cache[icon];
--  return cache[icon] = fs.readFileSync(__dirname + '/../public/icons/' + icon, 'base64');
-+  return cache[icon] = fs.readFileSync('/usr/share/node-connect/public/icons/' + icon, 'base64');
- }
- 
- /**
---- node-connect.orig/lib/middleware/errorHandler.js
-+++ node-connect/lib/middleware/errorHandler.js
-@@ -59,8 +59,8 @@ exports = module.exports = function erro
-       var accept = req.headers.accept || '';
-       // html
-       if (~accept.indexOf('html')) {
--        fs.readFile(__dirname + '/../public/style.css', 'utf8', function(e, style){
--          fs.readFile(__dirname + '/../public/error.html', 'utf8', function(e, html){
-+        fs.readFile('/usr/share/node-connect/public/style.css', 'utf8', function(e, style){
-+          fs.readFile('/usr/share/node-connect/public/error.html', 'utf8', function(e, html){
-             var stack = (err.stack || '')
-               .split('\n').slice(1)
-               .map(function(v){ return '<li>' + v + '</li>'; }).join('');
-@@ -97,4 +97,4 @@ exports = module.exports = function erro
-  * Template title.
-  */
- 
--exports.title = 'Connect';
-\ No newline at end of file
-+exports.title = 'Connect';
---- node-connect.orig/lib/middleware/favicon.js
-+++ node-connect/lib/middleware/favicon.js
-@@ -45,7 +45,7 @@ var icon;
- 
- module.exports = function favicon(path, options){
-   var options = options || {}
--    , path = path || __dirname + '/../public/favicon.ico'
-+    , path = path || '/usr/share/node-connect/public/favicon.ico'
-     , maxAge = options.maxAge || 86400000;
- 
-   return function favicon(req, res, next){
-@@ -73,4 +73,4 @@ module.exports = function favicon(path,
-       next();
-     }
-   };
--};
-\ No newline at end of file
-+};
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index fd6a255..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-00-fix_public_path.patch

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



More information about the Pkg-javascript-commits mailing list