[hamradio-commits] [dump1090] 01/01: merge patch from Iain R. Learmonth <irl at fsfe.org>

[Matthew Ernisse]

This is an automated email from the git hooks/post-receive script.

mernisse-guest pushed a commit to branch master
in repository dump1090.

commit 66e8dd445bc367eb3004243fdee0a49d66ca2680
Author: Matthew Ernisse <mernisse at ub3rgeek.net>
Date:   Tue Nov 4 19:22:57 2014 -0500

    merge patch from Iain R. Learmonth <irl at fsfe.org>
---
 debian/copyright | 31 ++++---------------------------
 1 file changed, 4 insertions(+), 27 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 2252d73..2eeeace 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,34 +1,15 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: dump1090
-Source: git clone https://github.com/MalcolmRobb/dump1090
+Source: https://github.com/MalcolmRobb/dump1090
 
 Files: *
-Copyright: 2012 Salvatore Sanfilippo <antirez at gmail.com>
-           2014 Malcolm Robb <support at attavionics.com>
-License: BSD-3-clause
-
-Files: anet.*
 Copyright: 2006-2012 Salvatore Sanfilippo <antirez at gmail.com>
+           2014 Malcolm Robb <support at attavionics.com>
 License: BSD-3-clause
 
-Files: dump1090.*
-Copyright: 2012 Salvatore Sanfilippo <antirez at gmail.com>
-License: BSD-2-clause
-
-Files: interactive.*
-Copyright: 2012 Salvatore Sanfilippo <antirez at gmail.com>
-License: BSD-2-clause
-
-Files: mode_ac.*
-Copyright: 2012 Salvatore Sanfilippo <antirez at gmail.com>
-License: BSD-2-clause
-
-Files: net_io.*
+Files: dump1090.* interactive.* mode_ac.* net_io.* ppup1090.* view1090.*
 Copyright: 2012 Salvatore Sanfilippo <antirez at gmail.com>
-License: BSD-2-clause
-
-Files: ppup1090.*
-Copyright: 2013 Malcolm Robb <Support at ATTAvionics.com>
+           2013-2014 Malcolm Robb <Support at ATTAvionics.com>
 License: BSD-2-clause
 
 Files: pthreads/*
@@ -45,10 +26,6 @@ Copyright: 2012 Steve Markgraf <steve at steve-m.de>
            2012 Dimitri Stolnikov <horiz0n at gmx.net>
 License: GPL-2.0
 
-Files: view1090.*
-Copyright: 2014 Malcolm Robb <Support at ATTAvionics.com>
-License: BSD-2-clause
-
 Files: debian/*
 Copyright: 2014 Matthew Ernisse <mernisse at ub3rgeek.net>
 License: BSD-2-clause

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/dump1090.git