Debian policy fixes

- Made sure to include both companies AND individuals in AUTHORS file.
- Fixed a copyright issue on kernelrt plugin which is GPL-2 and not GPL-2 (or later)
- Treat the sosreport package as a private python module (currently a public one
  as defined by the Debian python policy)

Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>

6 files changed, 42 insertions, 2 deletions

diff --git a/AUTHORS b/AUTHORS
index 57cd3b7f..8237a142 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,3 +1,5 @@
+Individuals
+-----------
 Adam Stokes <adam.stokes@ubuntu.com>
 Ben Turner <bturner@redhat.com>
 Bryn M. Reeves <bmr@redhat.com>
@@ -21,3 +23,10 @@ Sadique Puthen <sputhenp@redhat.com>
 Shijoe George <spanjikk@redhat.com>
 Steve Conklin <sconklin@redhat.com>
 Tomas Smetana <tsmetana@redhat.com>
+
+Companies
+---------
+Red Hat, Inc.
+Rackspace US, Inc.
+EMC Corporation
+Canonical Ltd.
diff --git a/debian/changelog b/debian/changelog
index 445bfafc..ca70525b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+sosreport (3.0-1) unstable; urgency=low
+
+  * New upstream release v3.0
+    Features include:
+    - Openstack, MAAS, Juju, and other cloud technologies
+    - Extended policies to allow for easier cross distribution support.
+    - Cross distribution support for Debian, Ubuntu, Fedora, and
+      Red Hat Enterprise Linux
+    - Increase execution speed of plugins
+
+ -- Adam Stokes <adam.stokes@ubuntu.com>  Sun, 21 Jul 2013 20:35:04 -0400
+
 sosreport (2.3~git20130509-1) unstable; urgency=low
 
   * Package updated from git rev 395ad13da8
diff --git a/debian/control b/debian/control
index 4d6de945..b00bbad5 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Priority: optional
 Standards-Version: 3.9.3
 Build-Depends: debhelper (>= 9), python (>=2.7), gettext, python-nose
 Homepage: https://github.com/sosreport/sosreport
+XS-Python-Version: 2.7
 
 Package: sosreport
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index fe323100..cd3ccbe3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,10 +8,29 @@ Copyright: 2012-2013 Bryn M. Reeves
 	   2007-2013 Red Hat, Inc.
 License: GPL-2+
 
+Files: sos/plugins/kernelrt.py
+Copyright: 2012 Red Hat, Inc.
+License: GPL-2
+
 Files: debian/*
 Copyright: 2013 Adam Stokes <adam.stokes@ubuntu.com>
 License: GPL-2+
 
+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; version 2.
+ .
+ This application 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, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ USA.
+
 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
diff --git a/debian/pkg.pyinstall b/debian/pkg.pyinstall
index b7005d31..8b68fc88 100644
--- a/debian/pkg.pyinstall
+++ b/debian/pkg.pyinstall
@@ -1 +1 @@
-sos/* /usr/share/pyshared/sos/
+sos/* /usr/share/sosreport/
diff --git a/debian/pyversions b/debian/pyversions
deleted file mode 100644
index 3ad2293e..00000000
--- a/debian/pyversions
+++ /dev/null
@@ -1 +0,0 @@
-2.7-