[DRE-commits] [ruby-gitlab-emoji] 02/02: make lintian happy

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository ruby-gitlab-emoji.

commit e128f2f98eae34dff0af107b4242d66f685b0259
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon Dec 7 22:53:10 2015 +0530

    make lintian happy
---
 debian/changelog                   |  6 ++---
 debian/control                     |  2 +-
 debian/copyright                   | 45 +++++++++++++++++---------------------
 debian/patches/fix-size-test.patch | 15 +++++++++++++
 debian/patches/series              |  1 +
 5 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4599c22..d4a25f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-ruby-gitlab-emoji (0.1.1-1) UNRELEASED; urgency=medium
+ruby-gitlab-emoji (0.1.1-1) unstable; urgency=medium
 
-  * Initial release (Closes: #nnnn)
+  * Initial release (Closes: #807337)
 
- -- Pirate Praveen <praveen at debian.org>  Mon, 07 Dec 2015 22:49:25 +0530
+ -- Pirate Praveen <praveen at debian.org>  Mon, 07 Dec 2015 22:53:00 +0530
diff --git a/debian/control b/debian/control
index 755bf0e..ca13ce8 100644
--- a/debian/control
+++ b/debian/control
@@ -23,4 +23,4 @@ Depends: ruby | ruby-interpreter,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: Ruby gem for emojis in GitLab
- GitLab emoji assets
+ GitLab emoji assets. It extends gemojione.
diff --git a/debian/copyright b/debian/copyright
index 0374b5c..e41af14 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,35 +1,30 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: gitlab_emoji
-Source: https://gitlab.com/gitlab-org/gitlab_emoji
+Source: https://rubygems.org/gems/gitlab_emoji
 
 Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: GPL-2+ (FIXME)
+Copyright: 2013-2014, Steve Klabnik, GitLab B.V. Marin Jankovski, Jonathan Wiesel
+License: Expat
 
 Files: debian/*
 Copyright: 2015 Pirate Praveen <praveen at debian.org>
-License: GPL-2+ (FIXME)
-Comment: the Debian packaging is licensed under the same terms as the original package.
+License: Expat
 
-License: GPL-2+ (FIXME)
- This program is free software; you can redistribute it
- and/or modify it under the terms of the GNU General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later
- version.
+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:
  .
- This program is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.  See the GNU General Public License for more
- details.
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
  .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
- .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
+ 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/patches/fix-size-test.patch b/debian/patches/fix-size-test.patch
new file mode 100644
index 0000000..b33a652
--- /dev/null
+++ b/debian/patches/fix-size-test.patch
@@ -0,0 +1,15 @@
+https://gitlab.com/gitlab-org/gitlab_emoji/issues/4
+
+Index: ruby-gitlab-emoji-0.1.1/spec/gitlab_emoji_spec.rb
+===================================================================
+--- ruby-gitlab-emoji-0.1.1.orig/spec/gitlab_emoji_spec.rb
++++ ruby-gitlab-emoji-0.1.1/spec/gitlab_emoji_spec.rb
+@@ -6,7 +6,7 @@ describe Emoji do
+     let(:emojis) { Emoji.emojis }
+ 
+     it { emojis.should be_a(Hash) }
+-    it { emojis.size.should eq(1058) }
++    it { emojis.size.should >= 1058 }
+   end
+ 
+   describe 'emojis_names' do
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ed81d59
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-size-test.patch

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