[Pkg-javascript-commits] [node-resolve] 05/06: merge both version

[Thorsten Alteholz]

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

alteholz pushed a commit to branch master
in repository node-resolve.

commit 8c8613e0e6d233b2f09f1ab45c174b85b74334d9
Author: Thorsten Alteholz <debian at alteholz.de>
Date:   Fri Jun 17 19:53:01 2016 +0200

    merge both version
---
 debian/changelog | 17 +++++++++++++++++
 debian/control   |  3 ++-
 debian/copyright | 10 +++++-----
 debian/examples  |  1 +
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9f14b6b..3832ff4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,23 @@
+ode-resolve (1.1.7-2) unstable; urgency=medium
+
+  * merging of 1.1.7 and 0.3.1 package
+    - restore original short description
+    - merge copyright
+    - add examples
+    - readd sunweaver as uploader
+    - point VCS URLs to pkg-javascript
+      (there has been no repo in collab maint)
+
+ -- Thorsten Alteholz <debian at alteholz.de>  Fri, 17 Jun 2016 19:33:25 +0200
+
 node-resolve (1.1.7-1) unstable; urgency=medium
 
   * Initial release
 
  -- Thorsten Alteholz <debian at alteholz.de>  Sun, 12 Jun 2016 21:33:25 +0200
 
+node-resolve (0.3.1-1) unstable; urgency=low
+
+  * Initial release (Closes: #707132).
+
+ -- Mike Gabriel <sunweaver at debian.org>  Tue, 07 May 2013 20:09:05 +0200
diff --git a/debian/control b/debian/control
index 7273cf3..6224414 100644
--- a/debian/control
+++ b/debian/control
@@ -3,6 +3,7 @@ Section: web
 Priority: optional
 Maintainer: Debian Javascript Maintainers <pkg-javascript-devel at lists.alioth.debian.org>
 Uploaders: Thorsten Alteholz <debian at alteholz.de>
+         , Mike Gabriel <sunweaver at debian.org>
 Build-Depends:
  debhelper (>= 9)
  , dh-buildinfo
@@ -17,7 +18,7 @@ Architecture: all
 Depends:
  ${misc:Depends}
  , nodejs
-Description: resolve like require.resolve() on behalf of files
+Description: Synchronous/Asynchronous require.resolve() algorithm
  This module implements the node require.resolve() algorithm such 
  that you can require.resolve() on behalf of a file asynchronously
  and synchronously
diff --git a/debian/copyright b/debian/copyright
index b21605d..b03d364 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,14 +4,15 @@ Upstream-Contact: https://github.com/substack/node-resolve/issues
 Source: https://github.com/substack/node-resolve#readme
 
 Files: *
-Copyright: 2016 James Halliday <mail at substack.net> (http://substack.net)
-License: Expat
+Copyright: 2011-2016 James Halliday <mail at substack.net> (http://substack.net)
+License: MIT
 
 Files: debian/*
 Copyright: 2016 Thorsten Alteholz <debian at alteholz.de>
-License: Expat
+           2013, Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+License: MIT
 
-License: Expat
+License: 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,
@@ -31,4 +32,3 @@ License: Expat
  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.
-
diff --git a/debian/examples b/debian/examples
new file mode 100644
index 0000000..0bbe99e
--- /dev/null
+++ b/debian/examples
@@ -0,0 +1 @@
+example/*

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