diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | debian/copyright | 63 | ||||
| -rwxr-xr-x | debian/rules | 4 |
5 files changed, 39 insertions, 40 deletions
@@ -43,7 +43,7 @@ install: updateversion install -m755 sosreport $(DESTDIR)/usr/sbin/sosreport install -m644 sosreport.1.gz $(DESTDIR)/usr/share/man/man1/. install -m644 sos.conf.5.gz $(DESTDIR)/usr/share/man/man5/. - install -m644 AUTHORS LICENSE README.md $(DESTDIR)/usr/share/$(NAME)/. + install -m644 AUTHORS README.md $(DESTDIR)/usr/share/$(NAME)/. install -m644 $(NAME).conf $(DESTDIR)/etc/$(NAME).conf for d in $(SUBDIRS); do make DESTDIR=`cd $(DESTDIR); pwd` -C $$d install; [ $$? = 0 ] || exit 1; done diff --git a/debian/changelog b/debian/changelog index 2f5840cf..a7dde420 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -sosreport (2.3+git20130411-1) unstable; urgency=low +sosreport (2.3-0~git20130509) unstable; urgency=low - * Package updated from git rev 1baf743 + * Package updated from git rev 395ad13da8 Closes: #698329 - -- Adam Stokes <adam.stokes@ubuntu.com> Thu, 11 Apr 2013 20:55:56 -0400 + -- Adam Stokes <adam.stokes@ubuntu.com> Thu, 09 May 2013 20:06:50 -0400 diff --git a/debian/control b/debian/control index d82f284a..4d6de945 100644 --- a/debian/control +++ b/debian/control @@ -1,8 +1,8 @@ Source: sosreport Maintainer: Adam Stokes <adam.stokes@ubuntu.com> -Section: python +Section: admin Priority: optional -Standards-Version: 3.9.4 +Standards-Version: 3.9.3 Build-Depends: debhelper (>= 9), python (>=2.7), gettext, python-nose Homepage: https://github.com/sosreport/sosreport diff --git a/debian/copyright b/debian/copyright index a7cb4f00..fe323100 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,31 +1,32 @@ -This package was originally debianized by Adam Stokes -<adam.stokes@ubuntu.com> on Thu Apr 11 18:48:47 EST 2013 - -It was downloaded from https://github.com/sosreport/sosreport - -Author: Bryn Reeves: <bmr@redhat.com> - https://github.com/sosreport - -Copyright: 2007-2013 Red Hat, Inc. - -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. - -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, write to the -Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -MA 02110-1301, USA. - -On Debian systems, the complete text of the GNU General Public -License, version 2, can be found in /usr/share/common-licenses/GPL-2. - -The Debian packaging is (C) 2012-2013, Adam Stokes <adam.stokes@ubuntu.com> -and is licensed under the GPL, see above. - +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: sosreport +Upstream-Contact: Bryn M. Reeves <bmr@redhat.com> +Source: https://github.com/sosreport/sosreport + +Files: * +Copyright: 2012-2013 Bryn M. Reeves + 2007-2013 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; either version 2 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, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, + USA. + . + On Debian systems, the complete text of the GNU General Public + License, version 2, can be found in /usr/share/common-licenses/GPL-2. diff --git a/debian/rules b/debian/rules index 9ba428e9..15b7f5ec 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,4 @@ DH_ALWAYS_EXCLUDE=.git %: dh $@ --with python2 -override_dh_auto_install: - dh_auto_install - rm -f $(CURDIR)/debian/sosreport/usr/share/sos/LICENSE +override_dh_auto_test: |