From: Sven Hoexter Date: Wed, 1 Feb 2012 19:43:00 +0000 (+0100) Subject: Merge branch 'master' of git.sven.stormbind.net:/home/sven/www/sven_htdocs/git/pflogsumm X-Git-Tag: debian/1.1.4-1~5 X-Git-Url: http://git.sven.stormbind.net/?p=sven%2Fpflogsumm.git;a=commitdiff_plain;h=d2455a9d42b435766b5eab181f775932a50d6c9e;hp=3137412731c34afbce14633f54a5b395d20d4af2 Merge branch 'master' of git.sven.stormbind.net:/home/sven/www/sven_htdocs/git/pflogsumm --- diff --git a/debian/changelog b/debian/changelog index 11b116d..bfff303 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ -pflogsumm (1.1.3-2) UNRELEASED; urgency=low +pflogsumm (1.1.3-2) unstable; urgency=low * Update Vcs-* to the new git repository. - * No longer create '.pl' compatiblity symlinks. + * No longer create '.pl' compatiblity symlinks. (Closes: #639012) * Add a NEWS file to state that the compatiblity symlinks are gone. * Increase Standards-Version up to 3.9.2 - no changes required. * Increase debhelper compat level to 8, build-depend on debhelper (>=8). @@ -10,6 +10,10 @@ pflogsumm (1.1.3-2) UNRELEASED; urgency=low * Add debian/patches/kill-dot-pl and a debian/README.source. Due to the removed '.pl' symlinks we've to do some s/pflogsumm.pl/pflogsumm/ in several files. + * Update debian/copyright: + - Refer to /usr/share/common-licenses/GPL-2 instead of the generic + GPL symlink. + - State that the copyright and license for the debian directory. -- Sven Hoexter Thu, 28 Apr 2011 20:46:12 +0200 diff --git a/debian/copyright b/debian/copyright index 3a4e158..ab429a5 100644 --- a/debian/copyright +++ b/debian/copyright @@ -12,8 +12,11 @@ Upstream Author: James S. Seymour Copyright: +The debian directory of this package is +Copyright 2010-2011 Sven Hoexter + All of the programs, applications, and utilities (hereinafter referred to -as "programs") on this page are Copyright (C) 1998-2010 James S. Seymour. +as "programs") are Copyright (C) 1998-2010 James S. Seymour. These programs are free software; you can redistribute them and/or modify them under the terms of the GNU General Public License as published by the @@ -26,9 +29,8 @@ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. On Debian GNU/Linux systems, the complete text of the GNU General -Public License may be found in `/usr/share/common-licenses/GPL'. +Public License may be found in `/usr/share/common-licenses/GPL-2'. You may receive a copy of the GNU General Public License along with these programs; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -