From 66d86312953e0a4e32aa75139c7f49d4e11c43a6 Mon Sep 17 00:00:00 2001 From: Arturo Borrero Gonzalez Date: Thu, 25 Sep 2014 12:47:55 +0200 Subject: d/copyright: fix overriding of file matching More general paragraphs should therefore be given first, followed by more specific overrides. Signed-off-by: Arturo Borrero Gonzalez --- debian/copyright | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'debian') diff --git a/debian/copyright b/debian/copyright index 36fc273..d737cdd 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,9 +3,12 @@ Upstream-Name: conntrack-tools Upstream-Contact: Pablo Neira Ayuso Source: http://conntrack-tools.netfilter.org/downloads.html -Files: src/cache.c src/cache-ct.c src/cache-exp.c src/external_cache.c src/external_inject.c src/internal_bypass.c -Files: src/internal_cache.c src/main.c src/netlink.c src/network.c src/parse.c src/run.c src/stats-mode.c -Files: src/sync-alarm.c src/sync-ftfw.c src/sync-mode.c src/sync-notrack.c +Files: * +Copyright: 2005-2012 Pablo Neira Ayuso + Harald Welte +License: GPL-2+ + +Files: src/cache.c src/cache-ct.c src/cache-exp.c src/external_cache.c src/external_inject.c src/internal_bypass.c src/internal_cache.c src/main.c src/netlink.c src/network.c src/parse.c src/run.c src/stats-mode.c src/sync-alarm.c src/sync-ftfw.c src/sync-mode.c src/sync-notrack.c Copyright: 2006-2011 Pablo Neira Ayuso 2011 Vyatta Inc. License: GPL-2+ @@ -29,11 +32,6 @@ Copyright: (C) 2005-2012 by Pablo Neira Ayuso (C) 2012 by Intra2net AG License: GPL-2+ -Files: * -Copyright: 2005-2012 Pablo Neira Ayuso - Harald Welte -License: GPL-2+ - License: GPL-2+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -- cgit v1.2.3