[MERGED] osmo-sgsn[master]: deb: fix copyright file issues

Harald Welte gerrit-no-reply at lists.osmocom.org
Wed Oct 4 13:02:44 UTC 2017


Harald Welte has submitted this change and it was merged.

Change subject: deb: fix copyright file issues
......................................................................


deb: fix copyright file issues

* remove non-existent files
* fix ax_check_compile_flag.m4 license to match autoconf-archive
* fix various .py license to match OpenBSC description

Change-Id: I6881c0a16017d80d142a6cfa756a9c153bee94d3
Related: OS#2527
---
M debian/copyright
1 file changed, 8 insertions(+), 93 deletions(-)

Approvals:
  Neels Hofmeyr: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/debian/copyright b/debian/copyright
index ad911c0..97b890e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,72 +11,25 @@
            README.vty-tests
            configure.ac
            contrib/Makefile.am
-           contrib/a-link/sccp-split-by-con.lua
-           contrib/bsc-test/README
-           contrib/bsc-test/all_dial
-           contrib/bsc-test/dial.sh
-           contrib/bsc-test/drop-oml.sh
-           contrib/bsc-test/drop.sh
-           contrib/bsc-test/hangup
-           contrib/bsc-test/msc.sh
-           contrib/bsc_control.py
-           contrib/bt.py
-           contrib/convert_to_enum.py
-           contrib/ctrl2sse.py
            contrib/gprs/gb-proxy-unblock-bug.py
            contrib/gprs/gprs-bssgp-histogram.lua
            contrib/gprs/gprs-buffer-count.lua
            contrib/gprs/gprs-split-trace-by-tlli.lua
            contrib/gprs/gprs-verify-nu.lua
-           contrib/hlr-remove-old.sql
-           contrib/hlrsync/hlrsync.py
            contrib/ipa.py
            contrib/jenkins.sh
-           contrib/mgcp_server.py
-           contrib/nat/test_regexp.c
-           contrib/nat/ussd_example.py
-           contrib/rtp/gen_rtp_header.erl
-           contrib/rtp/rtp_replay.st
-           contrib/rtp/rtp_replay_shared.st
-           contrib/rtp/rtp_replay_sip.st
-           contrib/rtp/timestamp_rtp.lua
-           contrib/sms/fill-hlr.st
-           contrib/sms/hlr-query.st
-           contrib/sms/sqlite-probe.tap.d
            contrib/soap.py
-           contrib/systemd/osmo-bsc-mgcp.service
-           contrib/systemd/osmo-bsc.service
            contrib/systemd/osmo-gbproxy.service
-           contrib/systemd/osmo-msc.service
-           contrib/systemd/osmo-nitb.service
            contrib/systemd/osmo-sgsn.service
-           contrib/testconv/Makefile
-           contrib/testconv/testconv_main.c
            contrib/twisted_ipa.py
-           doc/BS11-OML.txt
            doc/Makefile.am
-           doc/call-routing.txt
-           doc/channel_release.txt
-           doc/e1-data-model.txt
            doc/examples/Makefile.am
-           doc/examples/osmo-bsc/osmo-bsc.cfg
-           doc/examples/osmo-bsc_mgcp/mgcp.cfg
-           doc/examples/osmo-bsc_nat/black-list.cfg
-           doc/examples/osmo-bsc_nat/bscs.cfg
-           doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg
            doc/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg
            doc/examples/osmo-gbproxy/osmo-gbproxy.cfg
            doc/examples/osmo-gtphub/gtphub-example.txt
            doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg
            doc/examples/osmo-gtphub/osmo-gtphub.cfg
-           doc/examples/osmo-msc/osmo-msc.cfg
            doc/examples/osmo-sgsn/osmo-sgsn.cfg
-           doc/gsm-hopping.txt
-           doc/handover.txt
-           doc/ipa-sccp.txt
-           doc/oml-interface.txt
-           doc/osmo-nitb-data_structures.dot
-           doc/paging.txt
            include/Makefile.am
            include/osmocom/sgsn/Makefile.am
            include/osmocom/sgsn/common.h
@@ -108,9 +61,6 @@
            tests/gprs/gprs_test.ok
            tests/gtphub/Makefile.am
            tests/gtphub/gtphub_test.ok
-           tests/libiudummy/Makefile.am
-           tests/libiudummy/README
-           tests/libiudummy/iudummy.c
            tests/oap/Makefile.am
            tests/oap/oap_client_test.err
            tests/oap/oap_client_test.ok
@@ -125,7 +75,6 @@
            tests/v42bis/v42bis_test.ok
            tests/xid/Makefile.am
            tests/xid/xid_test.ok
-           tools/hlrstat.pl
 Copyright: __NO_COPYRIGHT_NOR_LICENSE__
 License:   __NO_COPYRIGHT_NOR_LICENSE__
 
@@ -214,7 +163,6 @@
 
 Files:     src/gprs/gtphub_ares.c
            src/gprs/gtphub_sock.c
-           tests/ctrl_test_runner.py
            tests/gbproxy/gbproxy_test.c
 Copyright: 2013 Jacob Erlbeck <jerlbeck at sysmocom.de>
            2013 sysmocom s.f.m.c. GmbH
@@ -244,26 +192,13 @@
  On Debian systems, the complete text of the GNU Lesser General Public License
  Version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
 
-Files:     osmoappdesc.py
-Copyright: 2013 Katerina Barone-Adesi <kat.obsc at gmail.com>
-License:   GPL-3.0+
- 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 3 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, see <http://www.gnu.org/licenses/>
- .
- Most systems won't be able to use these, so they're separated out
- .
- On Debian systems, the complete text of the GNU General Public License
- Version 3 can be found in `/usr/share/common-licenses/GPL-3'.
+Files: osmoappdesc.py
+       tests/ctrl_test_runner.py
+       tests/vty_test_runner.py
+Copyright: 2013         Katerina Barone-Adesi <kat.obsc at gmail.com>
+           2013         Jacob Erlbeck <jerlbeck at sysmocom.de>
+           2013-2014    Holger Hans Peter Freyther <zecke at selfish.org>
+License: GPL-3+
 
 Files:     git-version-gen
 Copyright: 2007-2010 Free Software Foundation, Inc.
@@ -315,26 +250,6 @@
  automatically be up-to-date each time configure is run (and note that
  since configure.ac no longer includes a version string, Makefile rules
  should not depend on configure.ac for version updates).
- .
- On Debian systems, the complete text of the GNU General Public License
- Version 3 can be found in `/usr/share/common-licenses/GPL-3'.
-
-Files:     tests/vty_test_runner.py
-Copyright: 2013 Holger Hans Peter Freyther
-           2013 Katerina Barone-Adesi <kat.obsc at gmail.com>
-License:   GPL-3.0+
- 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 3 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, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the complete text of the GNU General Public License
  Version 3 can be found in `/usr/share/common-licenses/GPL-3'.
@@ -421,7 +336,7 @@
 Files:     m4/ax_check_compile_flag.m4
 Copyright: 2008 Guido U. Draheim <guidod at gmx.de>
            2011 Maarten Bosmans <mkbosmans at gmail.com>
-License:   GPL-3.0+ with unknown exception *** check multiple exceptions ***
+License:   GNU-All-Permissive-License
  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 3 of the License, or (at your

-- 
To view, visit https://gerrit.osmocom.org/4137
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6881c0a16017d80d142a6cfa756a9c153bee94d3
Gerrit-PatchSet: 2
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Owner: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Holger Freyther <holger at freyther.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>


More information about the gerrit-log mailing list