[Pkg-javascript-commits] [node-argparse] 09/11: Update patches
Jonathan Horn
jonathanh-guest at moszumanska.debian.org
Sat Mar 19 14:12:42 UTC 2016
This is an automated email from the git hooks/post-receive script.
jonathanh-guest pushed a commit to branch master
in repository node-argparse.
commit ef79ea0ca0e3ff4d9c9b933191116756bc2785ca
Author: Jonathan Ulrich Horn <debian at autoit4you.de>
Date: Sat Mar 19 15:03:03 2016 +0100
Update patches
---
debian/patches/01_nodejs_debian.diff | 46 ++++++++++++++--------------
debian/patches/02_make_sane.diff | 58 ------------------------------------
debian/patches/10_no_linting.diff | 19 ------------
3 files changed, 22 insertions(+), 101 deletions(-)
diff --git a/debian/patches/01_nodejs_debian.diff b/debian/patches/01_nodejs_debian.diff
index e133b63..e079086 100644
--- a/debian/patches/01_nodejs_debian.diff
+++ b/debian/patches/01_nodejs_debian.diff
@@ -8,27 +8,6 @@ Forwarded: not-needed
Last-Update: 2016-01-08
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,7 @@
- PATH := ./node_modules/.bin:${PATH}
-
--NPM_PACKAGE := $(shell node -e 'process.stdout.write(require("./package.json").name)')
--NPM_VERSION := $(shell node -e 'process.stdout.write(require("./package.json").version)')
-+NPM_PACKAGE := $(shell nodejs -e 'process.stdout.write(require("./package.json").name)')
-+NPM_VERSION := $(shell nodejs -e 'process.stdout.write(require("./package.json").version)')
-
- TMP_PATH := /tmp/${NPM_PACKAGE}-$(shell date +%s)
-
-@@ -75,7 +75,7 @@
- git commit -q -m 'Recreated docs'
- cd ${TMP_PATH} && \
- git remote add remote ${REMOTE_REPO} && \
-- git push --force remote +master:gh-pages
-+ git push --force remote +master:gh-pages
- rm -rf ${TMP_PATH}
-
-
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@
@@ -40,7 +19,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
'use strict';
var ArgumentParser = require('../lib/argparse').ArgumentParser;
-@@ -181,7 +181,7 @@
+@@ -191,7 +191,7 @@
sub_commands.js
```javascript
@@ -49,7 +28,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
'use strict';
var ArgumentParser = require('../lib/argparse').ArgumentParser;
-@@ -239,5 +239,3 @@
+@@ -249,5 +249,3 @@
Copyright (c) 2012 [Vitaly Puzrin](https://github.com/puzrin).
Released under the MIT license. See
[LICENSE](https://github.com/nodeca/argparse/blob/master/LICENSE) for details.
@@ -73,7 +52,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
var ArgumentParser = require('../lib/argparse').ArgumentParser;
@@ -19,4 +19,3 @@
console.log('-----------');
- parser.parseArgs(['X']);
+ parser.parseArgs([ 'X' ]);
console.dir(args);
-
--- a/examples/constants.js
@@ -132,3 +111,22 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
'use strict';
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,5 @@
+-NPM_PACKAGE := $(shell node -e 'process.stdout.write(require("./package.json").name)')
+-NPM_VERSION := $(shell node -e 'process.stdout.write(require("./package.json").version)')
++NPM_PACKAGE := $(shell nodejs -e 'process.stdout.write(require("./package.json").name)')
++NPM_VERSION := $(shell nodejs -e 'process.stdout.write(require("./package.json").version)')
+
+ TMP_PATH := /tmp/${NPM_PACKAGE}-$(shell date +%s)
+
+@@ -47,7 +47,7 @@
+ git commit -q -m 'Recreated docs'
+ cd ${TMP_PATH} && \
+ git remote add remote ${REMOTE_REPO} && \
+- git push --force remote +master:gh-pages
++ git push --force remote +master:gh-pages
+ rm -rf ${TMP_PATH}
+
+
diff --git a/debian/patches/02_make_sane.diff b/debian/patches/02_make_sane.diff
deleted file mode 100644
index b7d9c6e..0000000
--- a/debian/patches/02_make_sane.diff
+++ /dev/null
@@ -1,58 +0,0 @@
-Description: Keep the variables as local as possible
- To keep the namespace sane and only execute shell commands that
- have to be executed, variables, that are only needed in one make section,
- have been shifted to where they are needed and thus are not global anymore.
-Author: Jonathan Ulrich Horn <debian at autoit4you.de>
-Origin: vendor
-Bug: <URL to the upstream bug report if any, implies patch has been forwarded, optional>
-Last-Update: 2016-01-08
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/Makefile
-+++ b/Makefile
-@@ -1,17 +1,5 @@
- PATH := ./node_modules/.bin:${PATH}
-
--NPM_PACKAGE := $(shell nodejs -e 'process.stdout.write(require("./package.json").name)')
--NPM_VERSION := $(shell nodejs -e 'process.stdout.write(require("./package.json").version)')
--
--TMP_PATH := /tmp/${NPM_PACKAGE}-$(shell date +%s)
--
--REMOTE_NAME ?= origin
--REMOTE_REPO ?= $(shell git config --get remote.${REMOTE_NAME}.url)
--
--CURR_HEAD := $(firstword $(shell git show-ref --hash HEAD | cut --bytes=-6) master)
--GITHUB_PROJ := nodeca/${NPM_PACKAGE}
--
--
- help:
- echo "make help - Print this help"
- echo "make lint - Lint sources with JSHint"
-@@ -42,6 +30,7 @@
-
-
- doc:
-+ CURR_HEAD := $(firstword $(shell git show-ref --hash HEAD | cut --bytes=-6) master)
- @if test ! `which ndoc` ; then \
- echo "You need 'ndoc' installed in order to generate docs." >&2 ; \
- echo " $ npm install -g ndoc" >&2 ; \
-@@ -62,6 +51,9 @@
-
-
- gh-pages:
-+ REMOTE_NAME ?= origin
-+ REMOTE_REPO ?= $(shell git config --get remote.${REMOTE_NAME}.url)
-+ TMP_PATH := /tmp/${NPM_PACKAGE}-$(shell date +%s)
- @if test -z ${REMOTE_REPO} ; then \
- echo 'Remote repo URL not found' >&2 ; \
- exit 128 ; \
-@@ -80,6 +72,9 @@
-
-
- publish:
-+ NPM_PACKAGE := $(shell nodejs -e 'process.stdout.write(require("./package.json").name)')
-+ NPM_VERSION := $(shell nodejs -e 'process.stdout.write(require("./package.json").version)')
-+ GITHUB_PROJ := nodeca/${NPM_PACKAGE}
- @if test 0 -ne `git status --porcelain | wc -l` ; then \
- echo "Unclean working tree. Commit or stash changes first." >&2 ; \
- exit 128 ; \
diff --git a/debian/patches/10_no_linting.diff b/debian/patches/10_no_linting.diff
deleted file mode 100644
index 55073a0..0000000
--- a/debian/patches/10_no_linting.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Don't automatically execute linting, when doing tests
-Author: Jonathan Ulrich Horn <debian at autoit4you.de>
-Origin: vendor
-Bug: <URL to the upstream bug report if any, implies patch has been forwarded, optional>
-Forwarded: <URL|no|not-needed, useless if you have a Bug field, optional>
-Last-Update: 2016-01-08
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/Makefile
-+++ b/Makefile
-@@ -20,7 +20,7 @@
- jshint . --show-non-errors
-
-
--test: lint
-+test:
- @if test ! `which mocha` ; then \
- echo "You need 'mocha' installed in order to run tests." >&2 ; \
- echo " $ make dev-deps" >&2 ; \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-argparse.git
More information about the Pkg-javascript-commits
mailing list