[Pkg-javascript-commits] [SCM] simplified HTTP request client for NodeJS branch, master, updated. debian/2.2.5-1-2-g50ce139

[David Paleino]

The following commit has been merged in the master branch:
commit 75f68995e69b3d98da91ea095c31066cf9b1d25f
Author: David Paleino <dapal at debian.org>
Date:   Wed Nov 23 20:16:18 2011 +0100

    Install missing vendor/ directory, and update copyright to include it.

diff --git a/debian/TODO b/debian/TODO
new file mode 100644
index 0000000..72a229c
--- /dev/null
+++ b/debian/TODO
@@ -0,0 +1,2 @@
+* Not use the embedded copy of vendor/cookie/ from tobi (available via npm),
+  which should be packaged and depended upon.
diff --git a/debian/changelog b/debian/changelog
index 1c938ac..64e6fb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+node-request (2.2.5-2) UNRELEASED; urgency=low
+
+  * Install missing vendor/ directory, and update copyright to include
+    it.
+
+ -- David Paleino <dapal at debian.org>  Wed, 23 Nov 2011 20:14:44 +0100
+
 node-request (2.2.5-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/copyright b/debian/copyright
index 74cea83..b52eac9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,12 +4,6 @@ Upstream-Name: request
 Files: *
 Copyright: ©, Mikeal Rogers <mikeal.rogers at gmail.com>
 License: Apache-2.0
-
-Files: debian/*
-Copyright: © 2011, David Paleino <dapal at debian.org>
-License: Apache-2.0
-
-License: Apache-2.0
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
@@ -24,3 +18,33 @@ License: Apache-2.0
  .
  On Debian systems, the complete text of the Apache version 2.0 license
  can be found in "/usr/share/common-licenses/Apache-2.0".
+
+Files: debian/*
+Copyright: © 2011, David Paleino <dapal at debian.org>
+License: MIT
+
+Files: vendor/*
+Copyright: © 2010, LearnBoost <dev at learnboost.com>
+License: MIT
+
+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, 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.
diff --git a/debian/install b/debian/install
index 1658e8d..7770a6c 100644
--- a/debian/install
+++ b/debian/install
@@ -2,3 +2,6 @@ main.js         usr/lib/nodejs/request/
 mimetypes.js    usr/lib/nodejs/request/
 oauth.js        usr/lib/nodejs/request/
 uuid.js         usr/lib/nodejs/request/
+
+# it should really be packaged into node-tobi, and then depend on it
+vendor/         usr/lib/nodejs/request/

-- 
simplified HTTP request client for NodeJS