[DRE-commits] [puma] 02/03: Prepare packaging

Antonio Terceiro terceiro at moszumanska.debian.org
Thu Nov 10 19:55:43 UTC 2016


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

terceiro pushed a commit to branch master
in repository puma.

commit 058afb2ccf7580885aa82ddc7064c7d92aa7e29b
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Wed Nov 9 15:50:42 2016 -0200

    Prepare packaging
---
 debian/changelog       |  4 ++--
 debian/control         |  9 +++++++--
 debian/copyright       | 51 +++++++++++++++++++++++++++-----------------------
 debian/puma.examples   |  4 +---
 debian/ruby-tests.rake | 10 ++++++----
 debian/watch           |  2 +-
 6 files changed, 45 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 87c977c..00edaef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-puma (3.6.0-1) UNRELEASED; urgency=medium
+puma (3.6.0-1) unstable; urgency=medium
 
   * Initial release (Closes: #720336)
 
- -- Antonio Terceiro <terceiro at debian.org>  Wed, 09 Nov 2016 15:49:14 -0200
+ -- Antonio Terceiro <terceiro at debian.org>  Thu, 10 Nov 2016 16:47:06 -0200
diff --git a/debian/control b/debian/control
index f11b01d..db6fcb2 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,9 @@ Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.al
 Uploaders: Antonio Terceiro <terceiro at debian.org>
 Build-Depends: debhelper (>= 9~),
                gem2deb,
+               ruby-rack,
+               ruby-hoe,
+               libssl1.0-dev,
                rake
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/puma.git
@@ -19,5 +22,7 @@ XB-Ruby-Versions: ${ruby:Versions}
 Depends: ruby | ruby-interpreter,
          ${misc:Depends},
          ${shlibs:Depends}
-Description: Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack applications
- Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack applications. Puma is intended for use in both development and production environments. It's great for highly concurrent Ruby implementations such as Rubinius and JRuby as well as as providing process worker support to support CRuby well.
+Description: threaded HTTP 1.1 server for Ruby/Rack applications
+ Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server for
+ Ruby/Rack applications. Puma is intended for use in both development and
+ production environments.
diff --git a/debian/copyright b/debian/copyright
index 236af7e..b876f6e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,35 +1,40 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: puma
-Source: http://puma.io
+Source: http://github.com/puma/puma
 
 Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: GPL-2+ (FIXME)
+Copyright:
+ (c) 2005, Zed Shaw
+ (c) 2011, Evan Phoenix
+License: BSD-3-clause
 
 Files: debian/*
 Copyright: 2016 Antonio Terceiro <terceiro at debian.org>
-License: GPL-2+ (FIXME)
+License: BSD-3-clause
 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: BSD-3-clause
+ All rights reserved.
  .
- 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.
+ Redistribution and use in source and binary forms, with or without 
+ modification, are permitted provided that the following conditions are met:
  .
- 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
+ * 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 the Evan Phoenix nor the names of its contributors 
+   may be used to endorse or promote products derived from this software 
+   without specific prior written permission.
  .
- 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'.
+ 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/debian/puma.examples b/debian/puma.examples
index 4cd72a7..e39721e 100644
--- a/debian/puma.examples
+++ b/debian/puma.examples
@@ -1,3 +1 @@
-# Examples:
-# FIXME: examples/ dir found in source. Consider installing the examples.
-# examples/*
+examples/*
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
index 63f3fd6..b4134cd 100644
--- a/debian/ruby-tests.rake
+++ b/debian/ruby-tests.rake
@@ -1,6 +1,8 @@
-require 'gem2deb/rake/testtask'
+ENV['TESTOPTS'] = '-v'
 
-Gem2Deb::Rake::TestTask.new do |t|
-  t.libs = ['test']
-  t.test_files = FileList['test/**/*_test.rb'] + FileList['test/**/test_*.rb']
+require "hoe"
+
+HOE = Hoe.spec "puma" do
+  license "BSD-3-Clause"
+  developer 'Evan Phoenix', 'evan at phx.io'
 end
diff --git a/debian/watch b/debian/watch
index c9623ed..5c3f6e5 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://pkg-ruby-extras.alioth.debian.org/cgi-bin/gemwatch/puma .*/puma-(.*).tar.gz
+https://github.com/puma/puma/releases .*/v(.*).tar.gz

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



More information about the Pkg-ruby-extras-commits mailing list