diff options
author | Jonas Smedegaard <dr@jones.dk> | 2008-06-09 10:45:05 (GMT) |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2008-06-09 10:45:05 (GMT) |
commit | 6a7ec285c216d9e19d485066328037fc4de6df5e (patch) | |
tree | 96197baa10ee01fe65ee40e6abfcb5df624bca31 | |
parent | caca205e119d2610aeaf17c4d9ae92d13433d6b8 (diff) |
New upstream release. Cosmetic changes to debian/copyright.debian/0.81.1-1
* New upstream release.
* Reorganize debian/copyright to only mention each license once.
-rw-r--r-- | debian/changelog | 7 | ||||
-rw-r--r-- | debian/copyright | 19 | ||||
-rwxr-xr-x | debian/rules | 2 |
3 files changed, 14 insertions, 14 deletions
diff --git a/debian/changelog b/debian/changelog index 2db61e3..533e258 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +sugar-presence-service (0.81.1-1) unstable; urgency=low + + * New upstream release. + * Reorganize debian/copyright to only mention each license once. + + -- Jonas Smedegaard <dr@jones.dk> Mon, 09 Jun 2008 12:43:04 +0200 + sugar-presence-service (0.79.3-2) unstable; urgency=low * Have python-gobject build-dependency fallback to python-gtk2 older diff --git a/debian/copyright b/debian/copyright index 61ffb51..928a417 100644 --- a/debian/copyright +++ b/debian/copyright @@ -9,32 +9,19 @@ Upstream author: Red Hat, Inc. Files: debian/* Copyright: © 2008 Jonas Smedegaard <dr@jones.dk> License: GPL-2+ - The Debian packaging information is under the GPL, version 2 or later. Files: * Copyright: © 2007, Red Hat, Inc. © 2007, Collabora Ltd. 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. Files: src/sugar-presence-service.in Copyright: © 2008, Red Hat, Inc. 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. Files: src/main.py Copyright: © 2006, Red Hat, Inc. 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. Files: install-sh Copyright: © 1994 X Consortium @@ -63,6 +50,12 @@ License: other . FSF changes to this file are in the public domain. +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. + On Debian systems, the complete text of the GNU General Public License can be found in file "/usr/share/common-licenses/GPL", and the complete text of the GNU Lesser General Public License can be found in file diff --git a/debian/rules b/debian/rules index 5b87360..be8e29a 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,7 @@ pkg = sugar-presence-service DEB_UPSTREAM_URL = http://dev.laptop.org/pub/sugar/sources/$(DEB_UPSTREAM_PACKAGE) DEB_UPSTREAM_TARBALL_EXTENSION = tar.bz2 -DEB_UPSTREAM_TARBALL_MD5 = 3eb8ba37206621bf02ee23307cf544da +DEB_UPSTREAM_TARBALL_MD5 = 8f3913aa15c57307b002507b05282978 DEB_MAKE_CHECK_TARGET = check |