[DRE-commits] [SCM] unicorn.git branch, master, updated. upstream/4.2.0-3-g0c1ac39
Hleb Valoshka
375GNU at Gmail.COM
Sat Feb 18 13:29:21 UTC 2012
The following commit has been merged in the master branch:
commit 0c1ac398b159ece90262e33cf3ee7fc2489d9220
Author: Hleb Valoshka <375GNU at Gmail.COM>
Date: Sat Feb 18 16:28:38 2012 +0300
Make it ready to be built and uploaded
diff --git a/debian/changelog b/debian/changelog
index 6f4f5bc..814de0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
unicorn (4.2.0-1) UNRELEASED; urgency=low
- * Initial release (Closes: #nnnn)
+ * Initial release (Closes: #652093)
- -- globus <375gnu at gmail.com> Sat, 18 Feb 2012 16:00:14 +0300
+ -- Hleb Valoshka <375gnu at gmail.com> Sat, 18 Feb 2012 16:00:14 +0300
diff --git a/debian/control b/debian/control
index a286118..8d14e2d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,20 +2,19 @@ Source: unicorn
Section: ruby
Priority: optional
Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Uploaders: <375gnu at gmail.com>
+Uploaders: Hleb Valoshka <375gnu at gmail.com>
DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.13~)
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.11~), ruby-raindrops (>= 0.7), ruby-kgio (>= 2.6), ruby-rack
Standards-Version: 3.9.2
-#Vcs-Git: git://git.debian.org/pkg-ruby-extras/unicorn.git
-#Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/unicorn.git;a=summary
+Vcs-Git: git://git.debian.org/pkg-ruby-extras/unicorn.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/unicorn.git;a=summary
Homepage: http://unicorn.bogomips.org/
XS-Ruby-Versions: all
Package: unicorn
Architecture: any
XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
-# rack (>= 0), kgio (~> 2.6), raindrops (~> 0.7), isolate (~> 3.2, development), wrongdoc (~> 1.6.1, development)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-rack, ruby-kgio (>= 2.6), ruby-raindrops (>= 0.7)
Description: Rack HTTP server for fast clients and Unix
\Unicorn is an HTTP server for Rack applications designed to only serve
fast clients on low-latency, high-bandwidth connections and take
diff --git a/debian/copyright b/debian/copyright
index 93fc0a2..fa25506 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,12 @@
Format: http://dep.debian.net/deps/dep5
Upstream-Name: unicorn
-Source: FIXME <http://example.com/>
+Source: http://unicorn.bogomips.org/
Files: *
-Copyright: <years> <put author's name and email here>
- <years> <likewise for another author>
-License: GPL-2+ (FIXME)
+Copyright: 2009-2011 \Unicorn project <mongrel-unicorn at rubyforge.org>
+License: Ruby or GPL-2 or GPL-3
+
+License: GPL-2
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
@@ -27,7 +28,80 @@ License: GPL-2+ (FIXME)
License version 2 can be found in the file
`/usr/share/common-licenses/GPL-2'.
+License: GPL-3
+ 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 3 of the License, or
+ (at your option) any later version.
+ .
+ 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.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ 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-3'.
+
+License: Ruby
+ 1. You may make and give away verbatim copies of the source form of the
+ software without restriction, provided that you duplicate all of the
+ original copyright notices and associated disclaimers.
+ .
+ 2. You may modify your copy of the software in any way, provided that
+ you do at least ONE of the following:
+ .
+ a) place your modifications in the Public Domain or otherwise
+ make them Freely Available, such as by posting said
+ modifications to Usenet or an equivalent medium, or by allowing
+ the author to include your modifications in the software.
+ .
+ b) use the modified software only within your corporation or
+ organization.
+ .
+ c) rename any non-standard executables so the names do not conflict
+ with standard executables, which must also be provided.
+ .
+ d) make other distribution arrangements with the author.
+ .
+ 3. You may distribute the software in object code or executable
+ form, provided that you do at least ONE of the following:
+ .
+ a) distribute the executables and library files of the software,
+ together with instructions (in the manual page or equivalent)
+ on where to get the original distribution.
+ .
+ b) accompany the distribution with the machine-readable source of
+ the software.
+ .
+ c) give non-standard executables non-standard names, with
+ instructions on where to get the original software distribution.
+ .
+ d) make other distribution arrangements with the author.
+ .
+ 4. You may modify and include the part of the software into any other
+ software (possibly commercial). But some files in the distribution
+ are not written by the author, so that they are not under this terms.
+ .
+ They are gc.c(partly), utils.c(partly), regex.[ch], st.[ch] and some
+ files under the ./missing directory. See each file for the copying
+ condition.
+ .
+ 5. The scripts and library files supplied as input to or produced as
+ output from the software do not automatically fall under the
+ copyright of the software, but belong to whomever generated them,
+ and may be sold commercially, and may be aggregated with this
+ software.
+ .
+ 6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE.
+
Files: debian/*
-Copyright: 2012 <375gnu at gmail.com>
-License:
- [LICENSE TEXT]
+Copyright: These files ain't copyrighted
+License: public-domain
+ These files are in Public Domain..
diff --git a/debian/unicorn.docs b/debian/unicorn.docs
index 786a9ba..1d7dea8 100644
--- a/debian/unicorn.docs
+++ b/debian/unicorn.docs
@@ -1,2 +1,15 @@
-# FIXME: READMEs found
-# README
+Application_Timeouts
+CONTRIBUTORS
+DESIGN
+FAQ
+HACKING
+ISSUES
+KNOWN_ISSUES
+Links
+NEWS
+PHILOSOPHY
+README
+SIGNALS
+Sandbox
+TODO
+TUNING
diff --git a/debian/unicorn.examples b/debian/unicorn.examples
index d970cc8..e39721e 100644
--- a/debian/unicorn.examples
+++ b/debian/unicorn.examples
@@ -1,3 +1 @@
-# FIXME: examples/ dir found in source. Consider installing the examples.
-# Examples:
-# examples/*
+examples/*
diff --git a/debian/unicorn.manpages b/debian/unicorn.manpages
index a6b707d..524e54d 100644
--- a/debian/unicorn.manpages
+++ b/debian/unicorn.manpages
@@ -1,3 +1,2 @@
-# FIXME: man/ dir found in source. Consider installing manpages
-# man/man1/unicorn.1
-# man/man1/unicorn_rails.1
+man/man1/unicorn.1
+man/man1/unicorn_rails.1
--
unicorn.git
More information about the Pkg-ruby-extras-commits
mailing list