[Pkg-javascript-commits] [npm2deb] 01/01: update patch

Praveen Arimbrathodiyil praveen at moszumanska.debian.org
Sun Oct 30 05:18:45 UTC 2016


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

praveen pushed a commit to branch master
in repository npm2deb.

commit 28c8b6b983ccd9a10e8e083be8412bd57c8f5d7c
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Oct 30 10:48:04 2016 +0530

    update patch
---
 debian/patches/0005-fix-dependency-format.patch | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/debian/patches/0005-fix-dependency-format.patch b/debian/patches/0005-fix-dependency-format.patch
index 1ac9c9f..24edef7 100644
--- a/debian/patches/0005-fix-dependency-format.patch
+++ b/debian/patches/0005-fix-dependency-format.patch
@@ -1,7 +1,7 @@
 From 4dc756ef5849bf51ee41938f33ca4680d6a0829b Mon Sep 17 00:00:00 2001
 From: Suhail P <psuhailp at gmail.com>
 Date: Fri, 28 Oct 2016 12:20:20 +0000
-Subject: [PATCH] changing CONTROL file dependency package version format
+Subject: [PATCH 1/2] changing CONTROL file dependency package version format
 
 ---
  npm2deb/__init__.py | 1 +
@@ -11,11 +11,14 @@ Index: npm2deb/npm2deb/__init__.py
 ===================================================================
 --- npm2deb.orig/npm2deb/__init__.py
 +++ npm2deb/npm2deb/__init__.py
-@@ -470,6 +470,7 @@ class Npm2Deb(object):
-                     dep_debian = "%s (%s)" % (name, version)
-                 else:
-                     dep_debian = name
-+                dep_debian = '>= '.join(dep_debian.split('^'))
-                 depends.append(dep_debian)
- 
-         return '\n , '.join(depends)
+@@ -461,7 +461,10 @@ class Npm2Deb(object):
+                     mapper.append_warning('error', dep, 'dependency %s '
+                                           'not in debian' % (name))
+                 version = dependencies[dep].replace('~', '')
++                version = dependencies[dep].replace('^', '')
+                 if version:
++                    if version.find('.x') is not -1:
++                        version = version.replace('.x', '.0')
+                     if version[0].isdigit():
+                         version = '>= %s' % version
+                     elif version == '*' or version == 'latest':

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



More information about the Pkg-javascript-commits mailing list