[DRE-commits] [ruby-unicode-display-width] 01/01: adjust files in debian/ for initial release

Fri Nov 18 14:00:25 UTC 2016

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

mmoll-guest pushed a commit to branch master
in repository ruby-unicode-display-width.

commit c411c39eb8ab6f7f17290106b93ee08b4d691690
Author: Michael Moll <Michael Moll kvedulv at kvedulv.de>
Date:   Fri Nov 18 14:43:53 2016 +0100

    adjust files in debian/ for initial release
---
 debian/changelog                          |  4 +--
 debian/control                            |  2 +-
 debian/copyright                          | 45 +++++++++++++++----------------
 debian/patches/series                     |  1 +
 debian/patches/use_debian_datadir.patch   | 11 ++++++++
 debian/ruby-unicode-display-width.install |  4 +--
 6 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b10861d..3f7472c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-ruby-unicode-display-width (1.1.1-1) UNRELEASED; urgency=medium
+ruby-unicode-display-width (1.1.1-1) unstable; urgency=medium
 
-  * Initial release (Closes: #nnnn)
+  * Initial release (Closes: #844723)
 
  -- Michael Moll <kvedulv at kvedulv.de>  Fri, 18 Nov 2016 14:30:53 +0100
diff --git a/debian/control b/debian/control
index 94ad409..71ad6c2 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 9~),
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/ruby-unicode-display-width.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-unicode-display-width.git
-Homepage: http://github.com/janlelis/unicode-display_width
+Homepage: https://github.com/janlelis/unicode-display_width
 Testsuite: autopkgtest-pkg-ruby
 XS-Ruby-Versions: all
 
diff --git a/debian/copyright b/debian/copyright
index bad3016..af364e6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,35 +1,32 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: unicode-display_width
-Source: http://github.com/janlelis/unicode-display_width
+Source: https://github.com/janlelis/unicode-display_width
 
 Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: GPL-2+ (FIXME)
+Copyright: 2011, 2015-2016 Jan Lelis <mail at janlelis.de>
+License: Expat
 
 Files: debian/*
 Copyright: 2016 Michael Moll <kvedulv at kvedulv.de>
-License: GPL-2+ (FIXME)
+License: Expat
 Comment: the Debian packaging is licensed under the same terms as the original package.
 
-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/series b/debian/patches/series
new file mode 100644
index 0000000..e07edab
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+use_debian_datadir.patch
diff --git a/debian/patches/use_debian_datadir.patch b/debian/patches/use_debian_datadir.patch
new file mode 100644
index 0000000..eef8bc4
--- /dev/null
+++ b/debian/patches/use_debian_datadir.patch
@@ -0,0 +1,11 @@
+--- a/lib/unicode/display_width/constants.rb
++++ b/lib/unicode/display_width/constants.rb
+@@ -2,7 +2,7 @@
+   module DisplayWidth
+     VERSION = '1.1.1'
+     UNICODE_VERSION = "9.0.0".freeze
+-    DATA_DIRECTORY = File.expand_path(File.dirname(__FILE__) + '/../../../data/').freeze
++    DATA_DIRECTORY = '/usr/share/ruby-unicode-display-width/'.freeze
+     INDEX_FILENAME = (DATA_DIRECTORY + '/display_width.marshal.gz').freeze
+   end
+ end
diff --git a/debian/ruby-unicode-display-width.install b/debian/ruby-unicode-display-width.install
index 57a957b..8b1517c 100644
--- a/debian/ruby-unicode-display-width.install
+++ b/debian/ruby-unicode-display-width.install
@@ -1,3 +1 @@
-# Examples:
-# FIXME: data/ dir found in source. Consider installing it somewhere.
-# data/* /usr/share/ruby-unicode-display-width/
+data/* /usr/share/ruby-unicode-display-width/

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

