[DRE-commits] [unicorn] 01/02: Merge tag 'debian/4.8.3-1' into wheezy-backports

[Jérémy Bobbio]

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

lunar pushed a commit to branch wheezy-backports
in repository unicorn.

commit 17dc1dfe68b4e83e64a7f339596b9957a3ffc6d9
Merge: a3ac39f 75da6cb
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Fri Jun 20 17:48:38 2014 +0200

    Merge tag 'debian/4.8.3-1' into wheezy-backports
    
    unicorn Debian release 4.8.3-1
    
    Conflicts:
    	debian/control

 .manifest                                          |   4 +-
 .wrongdoc.yml                                      |   3 +-
 ChangeLog                                          | 335 ++++++++++++++++++++-
 Documentation/unicorn.1.txt                        |   4 +-
 Documentation/unicorn_rails.1.txt                  |   4 +-
 GIT-VERSION-FILE                                   |   2 +-
 GIT-VERSION-GEN                                    |   2 +-
 GNUmakefile                                        |   3 +-
 HACKING                                            |  11 +-
 ISSUES                                             |  56 +++-
 LATEST                                             |  59 ++--
 Links                                              |  12 +-
 NEWS                                               |  90 ++++++
 PHILOSOPHY                                         |   2 +-
 README                                             |  13 +-
 SIGNALS                                            |  13 +-
 archive/.gitignore                                 |   3 +
 archive/slrnpull.conf                              |   4 +
 checksums.yaml.gz                                  | Bin 0 -> 268 bytes
 debian/changelog                                   |  17 ++
 debian/control                                     |   2 +-
 ...explicitly-use-escaped-minus-in-man-pages.patch | 212 ++++---------
 ...O_REUSEPORT-tests-for-old-Linux-and-non-L.patch |  23 --
 debian/patches/series                              |   1 -
 lib/unicorn.rb                                     |   5 +
 lib/unicorn/http_server.rb                         | 114 +++----
 lib/unicorn/oob_gc.rb                              |  10 +
 lib/unicorn/ssl_configurator.rb                    |   2 +-
 lib/unicorn/stream_input.rb                        |   5 +-
 lib/unicorn/version.rb                             |   2 +-
 lib/unicorn/worker.rb                              |  64 ++++
 man/man1/unicorn.1                                 | 138 ++++-----
 man/man1/unicorn_rails.1                           | 149 +++++----
 metadata.yml                                       | 149 ++++-----
 script/isolate_for_tests                           |   5 +-
 t/.gitignore                                       |   1 -
 t/GNUmakefile                                      |   6 +-
 t/sslgen.sh                                        |  71 -----
 t/t0300-no-default-middleware.sh                   |   7 +-
 t/t0600-https-server-basic.sh                      |  48 ---
 test/unit/test_socket_helper.rb                    |   6 +-
 unicorn.gemspec                                    |   4 +-
 42 files changed, 951 insertions(+), 710 deletions(-)

diff --cc debian/changelog
index aa932ed,f56cf66..a213337
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,20 +1,27 @@@
+ unicorn (4.8.3-1) unstable; urgency=medium
+ 
+   * New upstream version.
+   * Rebuild with newer version of gem2deb.
+   * Refresh patches.
+ 
+  -- Hleb Valoshka <375gnu at gmail.com>  Sat, 31 May 2014 17:44:05 +0300
+ 
+ unicorn (4.8.2-1) unstable; urgency=medium
+ 
+   * New upstream version.
+   * Bump Standards-Version to 3.9.5 (no changes).
+   * Drop backported patch
+     0002-tests-fix-SO_REUSEPORT-tests-for-old-Linux-and-non-L.patch.
+ 
+  -- Hleb Valoshka <375gnu at gmail.com>  Tue, 15 Apr 2014 08:20:16 +0300
+ 
 +unicorn (4.7.0-1~bpo70+1) wheezy-backports; urgency=low
 +
 +  * Rebuild for wheezy-backports:
 +    - Lower minimum gem2deb version.
 +
 + -- Jérémy Bobbio <lunar at debian.org>  Sat, 10 May 2014 17:50:39 +0200
 +
  unicorn (4.7.0-1) unstable; urgency=low
  
    * New upstream version.
diff --cc debian/control
index 8014c0e,9665231..791d98c
--- a/debian/control
+++ b/debian/control
@@@ -3,8 -3,8 +3,8 @@@ Section: rub
  Priority: optional
  Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
  Uploaders: Hleb Valoshka <375gnu at gmail.com>
 -Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.5.0~), ruby-raindrops (>= 0.12.0-1~), ruby-kgio (>= 2.8.1-1~), ruby-rack, curl
 +Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), ruby-raindrops (>= 0.12.0-1~), ruby-kgio (>= 2.8.1-1~), ruby-rack, curl
- Standards-Version: 3.9.4
+ Standards-Version: 3.9.5
  Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/unicorn.git
  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/unicorn.git;a=summary
  Homepage: http://unicorn.bogomips.org/

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