[Pkg-javascript-commits] [npm2deb] 01/02: Imported Upstream version 0.2.1
Leo Iannacone
l3on-guest at moszumanska.debian.org
Sat Aug 23 15:58:01 UTC 2014
This is an automated email from the git hooks/post-receive script.
l3on-guest pushed a commit to branch master
in repository npm2deb.
commit 1ffd4a4fd33d9cb001588bc08bbead9589881af5
Author: Leo Iannacone <l3on at ubuntu.com>
Date: Sat Aug 23 17:51:02 2014 +0200
Imported Upstream version 0.2.1
---
Changelog.md | 49 ++++++++++++-----------
etc/bash_completion.d/npm2deb | 2 +-
npm2deb/__init__.py | 2 +-
npm2deb/templates.py | 92 ++++++++++++++++++++++++++++++++-----------
npm2deb/utils.py | 12 +++++-
5 files changed, 109 insertions(+), 48 deletions(-)
diff --git a/Changelog.md b/Changelog.md
index f01a6ff..ae22c4b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,34 +1,39 @@
-## 0.2.0 (2014-07-04)
+## 0.2.1 (2014-08-23)
+ * [new] add support to ISC and to other BSD licenses - closes #9
+ * [fix] add URL to licence-specification if license not supported
+ * [fix] hard link MIT license to Expat
+ * [fix] set UNRELEASED in debian/changelog - closes #12
- * [new] - only python3 is now supported
- * [new] - use wnpp-check instead of external service wnpp.debian.net
- * [new] - add support to autopkgtest - make a simple module require check
- * [new] - on create add option --upstream-homepage
- * [new] - on create add option --upstream-author
- * [new] - forward ITP to debian-devel at lists.debian.org
+## 0.2.0 (2014-07-04)
+ * [new] only python3 is now supported
+ * [new] use wnpp-check instead of external service wnpp.debian.net
+ * [new] add support to autopkgtest - make a simple module require check
+ * [new] on create add option --upstream-homepage
+ * [new] on create add option --upstream-author
+ * [new] forward ITP to debian-devel at lists.debian.org
- * [fix] - correctly set filenamemangle for fakeupstream.cgi
- * [fix] - correctly localized module location and node_modules path
- * [fix] - don't expose extenal modules while import Npm2Deb
- * [fix] - update dversionmangle according with uscan wiki page
- * [fix] - support repositories defined as str in package.json
- * [fix] - check if module version is valid before parse it - closes #10
- * [fix] - check if readmeFilename is not a emtpy value in json before use it
+ * [fix] correctly set filenamemangle for fakeupstream.cgi
+ * [fix] correctly localized module location and node_modules path
+ * [fix] don't expose extenal modules while import Npm2Deb
+ * [fix] update dversionmangle according with uscan wiki page
+ * [fix] support repositories defined as str in package.json
+ * [fix] check if module version is valid before parse it - closes #10
+ * [fix] check if readmeFilename is not a emtpy value in json before use it
## 0.1.3 (2014-06-04)
- * [new] - set email headers in ITP template
- * [fix] - fallback on qa.debian.org/fakeupstream.cgi when uscan fail
+ * [new] set email headers in ITP template
+ * [fix] fallback on qa.debian.org/fakeupstream.cgi when uscan fail
## 0.1.2 (2014-05-12)
- * [new] - add a dversionmangle option to watch by default
- * [fix] - get builddeps required by the correct version of the module
- * [fix] - catch KeyboardInterrupt - fail nicely if contrl+c detected
+ * [new] add a dversionmangle option to watch by default
+ * [fix] get builddeps required by the correct version of the module
+ * [fix] catch KeyboardInterrupt - fail nicely if contrl+c detected
## 0.1.1 (2014-05-07)
- * [fix] - prevent infinite loop looking for reverse dependencies
- * [fix] - lintian warning about bsd licenses
- * [fix] - PEP-8 compliance
+ * [fix] prevent infinite loop looking for reverse dependencies
+ * [fix] lintian warning about bsd licenses
+ * [fix] PEP-8 compliance
## 0.1.0
* Initial release
diff --git a/etc/bash_completion.d/npm2deb b/etc/bash_completion.d/npm2deb
index 43d02c6..62fd346 100644
--- a/etc/bash_completion.d/npm2deb
+++ b/etc/bash_completion.d/npm2deb
@@ -9,7 +9,7 @@ _npm2deb()
case "$prev" in
license)
- options="apache artistic bsd expat gpl-2 gpl-3 lgpl-2 lgpl-3 mit"
+ options="`npm2deb license -l | awk -F': ' '{print $2}' | sed s/[\,,\.]//g`"
;;
npm2deb)
options="create view search depends rdepends itp license"
diff --git a/npm2deb/__init__.py b/npm2deb/__init__.py
index 1986344..736415b 100644
--- a/npm2deb/__init__.py
+++ b/npm2deb/__init__.py
@@ -9,7 +9,7 @@ import re as _re
from npm2deb import utils, templates
from npm2deb.mapper import Mapper
-VERSION = '0.2.0'
+VERSION = '0.2.1'
DEBHELPER = 8
STANDARDS_VERSION = '3.9.5'
diff --git a/npm2deb/templates.py b/npm2deb/templates.py
index cd44337..82caa94 100644
--- a/npm2deb/templates.py
+++ b/npm2deb/templates.py
@@ -1,4 +1,4 @@
-CHANGELOG = """%(debian_name)s (%(version)s-1) unstable; urgency=low
+CHANGELOG = """%(debian_name)s (%(version)s-1) UNRELEASED; urgency=low
* Initial release (Closes: #nnnn)
@@ -154,7 +154,30 @@ LICENSES['Artistic'] = """Artistic-1.0
can be found in "/usr/share/common-licenses/Artistic".
"""
-LICENSES['BSD'] = """BSD-3-clause
+LICENSES['BSD-2-clause'] = """BSD-2-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE HOLDERS OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+"""
+
+LICENSES['BSD-3-clause'] = """BSD-3-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
@@ -180,6 +203,35 @@ LICENSES['BSD'] = """BSD-3-clause
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
"""
+LICENSES['BSD-4-clause'] = """BSD-4-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the University nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+ 4. Neither the name of the organization nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE HOLDERS OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+"""
+
LICENSES['LGPL-2'] = """LGPL-2
This package is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -216,26 +268,6 @@ LICENSES['LGPL-3'] = """LGPL-3
Public License can be found in "/usr/share/common-licenses/LGPL-3".
"""
-LICENSES['MIT'] = """MIT
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-"""
-
LICENSES['Expat'] = """Expat
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation files
@@ -258,6 +290,22 @@ LICENSES['Expat'] = """Expat
SOFTWARE.
"""
+LICENSES['MIT'] = LICENSES['Expat']
+
+LICENSES['ISC'] = """ISC
+ Permission to use, copy, modify, and/or distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+"""
+
WATCH = {}
WATCH['github'] = """version=3
diff --git a/npm2deb/utils.py b/npm2deb/utils.py
index 6e80286..a2daf65 100644
--- a/npm2deb/utils.py
+++ b/npm2deb/utils.py
@@ -59,14 +59,22 @@ def get_license(license):
result = _templates.LICENSES['MIT']
elif name.startswith('expat'):
result = _templates.LICENSES['Expat']
+ elif name.startswith('bsd4'):
+ result = _templates.LICENSES['BSD-4-clause']
+ elif name.startswith('bsd2'):
+ result = _templates.LICENSES['BSD-2-clause']
elif name.startswith('bsd'):
- result = _templates.LICENSES['BSD']
+ result = _templates.LICENSES['BSD-3-clause']
elif name.startswith('artistic'):
result = _templates.LICENSES['Artistic']
elif name.startswith('apache'):
result = _templates.LICENSES['Apache']
+ elif name.startswith('isc'):
+ result = _templates.LICENSES['ISC']
else:
- result = 'FIX_ME please specify a license description'
+ result = 'FIX_ME specify a license, see: ' \
+ 'https://www.debian.org/doc/packaging-manuals/' \
+ 'copyright-format/1.0/#license-specification'
return result
--
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