[Pkg-javascript-commits] [node-chalk] 03/11: Merge branch 'master' of ssh://git.debian.org/git/pkg-javascript/node-chalk

[Jérémy Lal]

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

kapouer pushed a commit to branch master
in repository node-chalk.

commit 62d6eccfa70ecd0c31855fa5759309119f3bc68f
Merge: 600d83f 030f47a
Author: Jérémy Lal <kapouer at melix.org>
Date:   Sun Jul 27 14:10:21 2014 +0200

    Merge branch 'master' of ssh://git.debian.org/git/pkg-javascript/node-chalk
    
    Conflicts:
    	debian/rules
    	debian/watch

 .editorconfig                                    |    4 +
 .jshintrc                                        |    8 +-
 .travis.yml                                      |    1 -
 benchmark.js                                     |   17 +
 debian/changelog                                 |    5 +-
 debian/control                                   |    8 +-
 debian/copyright                                 |   20 +
 debian/install                                   |    1 +
 debian/patches/ansi-styles-module.patch          |  181 +++
 debian/patches/escape-string-regexp-module.patch |   96 ++
 debian/patches/has-ansi-module.patch             |  238 ++++
 debian/patches/override-detection.patch          |    4 +-
 debian/patches/series                            |    6 +-
 debian/patches/strip-ansi-module.patch           |  237 ++++
 debian/patches/supports-color-module.patch       |  151 ++
 debian/patches/use-supports-color.patch          |   19 -
 debian/rules                                     |    7 +-
 debian/tests/control                             |    2 +
 debian/tests/require                             |    3 +
 debian/watch                                     |    3 +-
 index.js                                         |   59 +-
 license                                          |   21 +
 logo.ai                                          | 1614 ----------------------
 package.json                                     |   27 +-
 readme.md                                        |  101 +-
 screenshot.png                                   |  Bin 24914 -> 0 bytes
 test.js                                          |   39 +-
 27 files changed, 1122 insertions(+), 1750 deletions(-)

diff --cc debian/rules
index c82893e,0c06312..364a08f
--- a/debian/rules
+++ b/debian/rules
@@@ -7,10 -7,3 +7,7 @@@
  %:
  	dh $@
  
- #override_dh_auto_build:
- 
- override_dh_auto_test:
- 	mocha
- 
 +get-orig-source:
 +	uscan --force-download
++
++
diff --cc debian/watch
index b6fdbd6,ac9fa9a..6fdf9b1
--- a/debian/watch
+++ b/debian/watch
@@@ -1,13 -1,5 +1,12 @@@
  version=3
  opts=\
 +dversionmangle=s/\?(debian|dfsg|ds|deb)\d*$//,\
 +filenamemangle=s/.*\/v?([\d\.-]+)\.tar\.gz/escape-string-regexp-$1.tar.gz/ \
 + https://github.com/sindresorhus/escape-string-regexp/tags .*/archive/v?([\d\.]+).tar.gz \
 + debian ./debian/mkorig node_modules/escape-string-regexp
 +
 +opts=\
- dversionmangle=s/\?(debian|dfsg|ds|deb)\d*$//,\
+ dversionmangle=s/\+(debian|dfsg|ds|deb)(\.\d+)?$//,\
  filenamemangle=s/.*\/v?([\d\.-]+)\.tar\.gz/node-chalk-$1.tar.gz/ \
 - https://github.com/sindresorhus/chalk/tags .*/archive/v?([\d\.]+).tar.gz
 + https://github.com/sindresorhus/chalk/tags .*/archive/v?([\d\.]+).tar.gz \
 + debian ./debian/mkorig
- 

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