diff options
author | 2015-02-26 18:07:13 -0800 | |
---|---|---|
committer | 2015-02-26 18:07:13 -0800 | |
commit | 289942fd06badd0cb896db1d4f258c7e4d441e8f (patch) | |
tree | a3b77539ba886c4395cd46b409ac209d31c29673 | |
parent | 7b7aa625f6198129f5a51056d1539ab915a93865 (diff) | |
parent | 1dd0183f3625bd37fd216f03376c3bb91e78bd72 (diff) |
Merge pull request #859 from nicolasnoble/0_5-extra-commits
"Upporting" commits from 0.5 into master.
-rw-r--r-- | src/node/LICENSE | 28 | ||||
-rw-r--r-- | src/node/package.json | 11 | ||||
-rwxr-xr-x | src/ruby/grpc.gemspec | 1 | ||||
-rwxr-xr-x | tools/distpackages/build_deb_packages.sh | 5 | ||||
-rw-r--r-- | tools/distpackages/templates/libgrpc-dev/DEBIAN/control | 2 | ||||
-rw-r--r-- | tools/distpackages/templates/libgrpc-dev/usr/share/doc/libgrpc-dev/changelog.gz | bin | 136 -> 121 bytes | |||
-rw-r--r-- | tools/distpackages/templates/libgrpc/DEBIAN/control | 2 | ||||
-rw-r--r-- | tools/distpackages/templates/libgrpc/usr/share/doc/libgrpc/changelog.gz | bin | 132 -> 117 bytes | |||
-rw-r--r-- | tools/dockerfile/grpc_node_base/Dockerfile | 2 |
9 files changed, 45 insertions, 6 deletions
diff --git a/src/node/LICENSE b/src/node/LICENSE new file mode 100644 index 0000000000..0209b570e1 --- /dev/null +++ b/src/node/LICENSE @@ -0,0 +1,28 @@ +Copyright 2015, Google Inc. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * 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. + * Neither the name of Google Inc. 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 COPYRIGHT +OWNER 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. diff --git a/src/node/package.json b/src/node/package.json index e9995e7f0c..8e0a7bdb25 100644 --- a/src/node/package.json +++ b/src/node/package.json @@ -1,7 +1,14 @@ { "name": "grpc", "version": "0.5.0", + "author": "Google Inc.", "description": "gRPC Library for Node", + "contributors": [ + { + "name": "Michael Lumish", + "email": "mlumish@google.com" + } + ], "scripts": { "lint": "node ./node_modules/jshint/bin/jshint src test examples interop index.js", "test": "node ./node_modules/mocha/bin/mocha && npm run-script lint" @@ -22,6 +29,7 @@ "strftime": "^0.8.2" }, "files": [ + "LICENSE", "README.md", "index.js", "binding.gyp", @@ -31,5 +39,6 @@ "src", "test" ], - "main": "index.js" + "main": "index.js", + "license": "BSD-3-Clause" } diff --git a/src/ruby/grpc.gemspec b/src/ruby/grpc.gemspec index 25a3ff5ce2..ed26fef4a9 100755 --- a/src/ruby/grpc.gemspec +++ b/src/ruby/grpc.gemspec @@ -11,6 +11,7 @@ Gem::Specification.new do |s| s.homepage = 'https://github.com/google/grpc/tree/master/src/ruby' s.summary = 'GRPC system in Ruby' s.description = 'Send RPCs from Ruby using GRPC' + s.license = 'BSD-3-Clause' s.files = `git ls-files`.split("\n") s.test_files = `git ls-files -- spec/*`.split("\n") diff --git a/tools/distpackages/build_deb_packages.sh b/tools/distpackages/build_deb_packages.sh index a5f945bd9a..7b2acb6577 100755 --- a/tools/distpackages/build_deb_packages.sh +++ b/tools/distpackages/build_deb_packages.sh @@ -33,7 +33,8 @@ deb_dest="deb_out" mkdir -p $deb_dest -version='0.8.0.0' +version='0.5.0.0' +pkg_version='0.5.0' if [ -f /.dockerinit ]; then # We're in Docker where uname -p returns "unknown". @@ -97,7 +98,7 @@ do # Build the debian package fakeroot dpkg-deb --build $tmp_dir/$pkg_name || { echo "dpkg-deb failed"; exit 1; } - deb_path=$deb_dest/${pkg_name}_amd64.deb + deb_path=$deb_dest/${pkg_name}_${pkg_version}_amd64.deb # Copy the .deb file to destination dir cp $tmp_dir/$pkg_name.deb $deb_path diff --git a/tools/distpackages/templates/libgrpc-dev/DEBIAN/control b/tools/distpackages/templates/libgrpc-dev/DEBIAN/control index 64dc79af19..289a278c5f 100644 --- a/tools/distpackages/templates/libgrpc-dev/DEBIAN/control +++ b/tools/distpackages/templates/libgrpc-dev/DEBIAN/control @@ -1,5 +1,5 @@ Package: libgrpc-dev -Version: 0.8.0 +Version: 0.5.0 Architecture: amd64 Maintainer: Jan Tattermusch <jtattermusch@google.com> Depends: libgrpc, libc6-dev | libc-dev diff --git a/tools/distpackages/templates/libgrpc-dev/usr/share/doc/libgrpc-dev/changelog.gz b/tools/distpackages/templates/libgrpc-dev/usr/share/doc/libgrpc-dev/changelog.gz Binary files differindex eabdf46e6e..4f557b8e9f 100644 --- a/tools/distpackages/templates/libgrpc-dev/usr/share/doc/libgrpc-dev/changelog.gz +++ b/tools/distpackages/templates/libgrpc-dev/usr/share/doc/libgrpc-dev/changelog.gz diff --git a/tools/distpackages/templates/libgrpc/DEBIAN/control b/tools/distpackages/templates/libgrpc/DEBIAN/control index 75c224e9a4..417a825827 100644 --- a/tools/distpackages/templates/libgrpc/DEBIAN/control +++ b/tools/distpackages/templates/libgrpc/DEBIAN/control @@ -1,5 +1,5 @@ Package: libgrpc -Version: 0.8.0 +Version: 0.5.0 Architecture: amd64 Maintainer: Jan Tattermusch <jtattermusch@google.com> Depends: libc6 diff --git a/tools/distpackages/templates/libgrpc/usr/share/doc/libgrpc/changelog.gz b/tools/distpackages/templates/libgrpc/usr/share/doc/libgrpc/changelog.gz Binary files differindex c07b4d2637..12d4cd9300 100644 --- a/tools/distpackages/templates/libgrpc/usr/share/doc/libgrpc/changelog.gz +++ b/tools/distpackages/templates/libgrpc/usr/share/doc/libgrpc/changelog.gz diff --git a/tools/dockerfile/grpc_node_base/Dockerfile b/tools/dockerfile/grpc_node_base/Dockerfile index 55ae608020..20ed4cf7be 100644 --- a/tools/dockerfile/grpc_node_base/Dockerfile +++ b/tools/dockerfile/grpc_node_base/Dockerfile @@ -34,7 +34,7 @@ FROM grpc/base RUN curl -sL https://deb.nodesource.com/setup | bash - -RUN apt-get update && apt-get install -y nodejs +RUN apt-get update && apt-get install -y nodejs nodejs-legacy RUN npm install -g node-gyp |