[DRE-commits] [ruby-gitlab] 02/02: Update debian files

Fri Sep 15 08:54:21 UTC 2017

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

sbrun-guest pushed a commit to branch master
in repository ruby-gitlab.

commit 3af48f75fa4eecf29aec271a64bca5988139c756
Author: Sophie Brun <sophie at freexian.com>
Date:   Fri Sep 15 10:38:05 2017 +0200

    Update debian files
---
 debian/control                         |  8 +++---
 debian/copyright                       | 46 ++++++++++++++++++----------------
 debian/patches/drop-git-ls-files.patch | 17 +++++++++++++
 debian/patches/series                  |  1 +
 4 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/debian/control b/debian/control
index ae2893d..4db4a36 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,9 @@ Build-Depends: debhelper (>= 10~),
                rake,
                ruby-httparty,
                ruby-rspec,
-               ruby-terminal-table
+               ruby-terminal-table,
+# for the tests
+               ruby-webmock
 Standards-Version: 4.0.0
 Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/ruby-gitlab.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-gitlab.git
@@ -24,5 +26,5 @@ Depends: ruby | ruby-interpreter,
          ruby-terminal-table,
          ${misc:Depends},
          ${shlibs:Depends}
-Description: A Ruby wrapper and CLI for the GitLab API
- Ruby client and CLI for GitLab API
+Description: Ruby wrapper and CLI for the GitLab API
+ This package contains a Ruby wrapper and CLI for the GitLab API.
diff --git a/debian/copyright b/debian/copyright
index 15f877c..c17a0fb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,30 +3,34 @@ Upstream-Name: gitlab
 Source: https://github.com/narkoz/gitlab
 
 Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: Expat (FIXME)
+Copyright: 2012-2015 Nihad Abbasov <mail at narkoz.me>
+License: BSD-2-clause
 
 Files: debian/*
 Copyright: 2017 Sophie Brun <sophie at freexian.com>
-License: Expat (FIXME)
-Comment: the Debian packaging is licensed under the same terms as the original package.
+License: BSD-2-clause
 
-License: Expat
- 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:
+License: BSD-2-clause
+ All rights reserved.
  .
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
  .
- 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.
+ 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 COPYRIGHT HOLDER 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/debian/patches/drop-git-ls-files.patch b/debian/patches/drop-git-ls-files.patch
new file mode 100644
index 0000000..222608b
--- /dev/null
+++ b/debian/patches/drop-git-ls-files.patch
@@ -0,0 +1,17 @@
+Description: Drop git ls-files in .gemspec
+ Replace the git ls-files with Dir.glob as build is not in git directory
+Author: Sophie Brun <sophie at freexian.com>
+Last-Update: 2017-09-07
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/gitlab.gemspec
++++ b/gitlab.gemspec
+@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
+   gem.summary       = %q{A Ruby wrapper and CLI for the GitLab API}
+   gem.homepage      = "https://github.com/narkoz/gitlab"
+ 
+-  gem.files         = `git ls-files`.split($/)
++  gem.files         = Dir.glob('**/*')
+   gem.bindir        = "exe"
+   gem.executables   = gem.files.grep(%r{^exe/}) { |f| File.basename(f) }
+   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b6c9316
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+drop-git-ls-files.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-gitlab.git

