Packaging of logstash-event-1.1.

diff --git a/ruby-logstash-event-1.1/debian/changelog b/ruby-logstash-event-1.1/debian/changelog
index 59dc5df..3f7b27e 100644 (file)
--- a/ruby-logstash-event-1.1/debian/changelog
+++ b/ruby-logstash-event-1.1/debian/changelog
@@ -1,5 +1,5 @@
-ruby-logstash-event (1.1.5-1) UNRELEASED; urgency=medium
+ruby-logstash-event-1.1 (1.1.5-1) unstable; urgency=low
 
-  * Initial release (Closes: #nnnn)
+  * Initial release
 
- -- MAINTAINER <valtri@myriad14.zcu.cz>  Wed, 12 Mar 2014 14:58:16 +0100
+ -- František Dvořák <valtri@civ.zcu.cz>  Wed, 12 Mar 2014 14:58:16 +0100

diff --git a/ruby-logstash-event-1.1/debian/control b/ruby-logstash-event-1.1/debian/control
index 92164fa..da391a6 100644 (file)
--- a/ruby-logstash-event-1.1/debian/control
+++ b/ruby-logstash-event-1.1/debian/control
@@ -1,18 +1,23 @@
-Source: ruby-logstash-event
+Source: ruby-logstash-event-1.1
 Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers@lists.alioth.debian.org>
-Uploaders:  <>
+Uploaders: František Dvořák <valtri@civ.zcu.cz>
 Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.6.1~)
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 #Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-logstash-event.git
 #Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/ruby-logstash-event.git;a=summary
 Homepage: https://github.com/logstash/logstash
 XS-Ruby-Versions: all
 
-Package: ruby-logstash-event
+Package: ruby-logstash-event-1.1
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
+Provides: ruby-logstash-event
+Conflicts: ruby-logstash-event
 Description: Library that contains the classes required to create LogStash events
- Library that contains the classes required to create LogStash events
+ Library from Logstash project, that contains the classes required to create 
+ LogStash events.
+ .
+ This package provides the older version 1.1.x.

diff --git a/ruby-logstash-event-1.1/debian/copyright b/ruby-logstash-event-1.1/debian/copyright
index d514a3d..a9b88fd 100644 (file)
--- a/ruby-logstash-event-1.1/debian/copyright
+++ b/ruby-logstash-event-1.1/debian/copyright
@@ -1,35 +1,26 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: logstash-event
-Source: FIXME <http://example.com/>
+Source: https://github.com/elasticsearch/logstash
 
 Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: GPL-2+ (FIXME)
+Copyright: Copyright 2009-2011 Jordan Sissel, Pete Fritchman, and contributors.
+License: Apache 2.0
 
-Files: debian/*
-Copyright: 2014  <>
-License: GPL-2+ (FIXME)
-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: Apache 2.0
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
  .
- 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.
+      http://www.apache.org/licenses/LICENSE-2.0
  .
- 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
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
  .
- 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'.
+ On Debian systems, the full text of the Apache Software License version 2 can
+ be found in the file `/usr/share/common-licenses/Apache-2.0'.

diff --git a/ruby-logstash-event-1.1/debian/ruby-logstash-event.docs b/ruby-logstash-event-1.1/debian/ruby-logstash-event.docs
deleted file mode 100644 (file)
index d0ab95f..0000000
--- a/ruby-logstash-event-1.1/debian/ruby-logstash-event.docs
+++ /dev/null
@@ -1 +0,0 @@
-# FIXME: READMEs found