[Pkg-javascript-commits] [node-srs] 21/22: Merge branch 'master' of ssh://git.debian.org/git/collab-maint/node-srs

[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-srs.

commit 137c366d80e0495bceb9649bcde90969f11bf0f9
Merge: 25f69ae 5c5bd4b
Author: Jérémy Lal <kapouer at melix.org>
Date:   Sun Jun 21 21:34:39 2015 +0200

    Merge branch 'master' of ssh://git.debian.org/git/collab-maint/node-srs
    
    Conflicts:
    	debian/changelog

 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc debian/control
index b2bcf5d,c5de2c4..8a0288d
--- a/debian/control
+++ b/debian/control
@@@ -8,12 -8,10 +8,12 @@@ Build-Depends
   debhelper (>= 9~)
   , dh-buildinfo
   , node-gyp
 - , libgdal1-dev (>= 1.9.0~)
 -Standards-Version: 3.9.4
 + , node-nan
 + , libgdal-dev (>= 1.10.0~)
 + , mocha
 +Standards-Version: 3.9.6
  Homepage: https://github.com/springmeyer/node-srs
- Vcs-Git: git://anoncm.debian.org/collab-maint/node-srs.git
+ Vcs-Git: git://anonscm.debian.org/collab-maint/node-srs.git
  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/node-srs.git
  
  Package: node-srs

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/node-srs.git