[osmo-bts] 01/01: Prepared packaging for upload - lintian clean
Ruben Undheim
rubund-guest at moszumanska.debian.org
Sat May 28 07:59:34 UTC 2016
This is an automated email from the git hooks/post-receive script.
rubund-guest pushed a commit to branch master
in repository osmo-bts.
commit c279cfa29caa6b8b6e58f863793424d06353de91
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date: Sat May 28 09:20:18 2016 +0200
Prepared packaging for upload - lintian clean
- Added copyright info
- Long description
- Generate patches with gbp-pq
- Added man page
- New patch for fixing spelling error
- Clean up all generated files in clean target
---
debian/control | 12 ++++
debian/copyright | 57 +++++++++++++++---
debian/man/genmanpages.sh | 4 ++
debian/man/osmobts-trx.txt | 45 +++++++++++++++
debian/osmo-bts.manpages | 1 +
.../patches/0003-Fixed-some-spelling-errors.patch | 67 ++++++++++++++++++++++
.../patches/01_location_of_gsm_data_shared.patch | 37 ++++--------
debian/patches/keep_up_with_openbscs_amr.patch | 61 +++++++++++---------
debian/patches/series | 1 +
debian/rules | 10 ++--
10 files changed, 231 insertions(+), 64 deletions(-)
diff --git a/debian/control b/debian/control
index c782b12..a32541f 100644
--- a/debian/control
+++ b/debian/control
@@ -23,3 +23,15 @@ Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
Description: Base Transceiver Station for GSM
+ OsmoBTS is a software implementation of Layer2/3 of a BTS. It implements the
+ following protocols/interfaces:
+ LAPDm (GSM 04.06)
+ RTP
+ A-bis/IP in IPA multiplex
+ OML (GSM TS 12.21)
+ RSL (GSM TS 08.58)
+ .
+ OsmoBTS is modular and has support for multiple back-ends. A back-end talks to
+ a specific L1/PHY implementation of the respective BTS hardware. Based on this
+ architecture, it should be relatively easy to add a new back-end to support
+ so-far unsupported GSM PHY/L1 and associated hardware.
diff --git a/debian/copyright b/debian/copyright
index 027230f..1e8147e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,27 +2,68 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: osmo-bts
Source: http://cgit.osmocom.org/osmo-bts/
-#Files: *
-#Copyright:
-#License: GPL-2
+Files: *
+Copyright: 2008-2014 Harald Welte <laforge at gnumonks.org>
+ 2009,2011,2013 Andreas Eversberg <jolly at eversberg.eu>
+ 2010,2011 On-Waves
+ 2012-2015 Holger Hans Peter Freyther
+ 2014 sysmocom s.f.m.c. Gmbh
+ 2015 Alexander Chemeris <Alexander.Chemeris at fairwaves.co>
+License: AGPL-3+
+
+Files: src/osmo-bts-sysmo/eeprom.c
+ src/osmo-bts-sysmo/eeprom.h
+Copyright: 2012 Nutaq
+License: MIT
+Comment: Yves Godin is the author
+
+Files: src/common/pcu_sock.c
+Copyright: 2008-2010 Harald Welte <laforge at gnumonks.org>
+ 2009-2012 Andreas Eversberg <jolly at eversberg.eu>
+ 2012 Holger Hans Peter Freyther
+License: GPL-2+
Files: debian/*
Copyright: 2015-2016 Ruben Undheim <ruben.undheim at gmail.com>
-License: GPL-2+
+License: AGPL-3+
+
+
+License: AGPL-3+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Affero 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 Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
License: GPL-2+
- This package is free software; you can redistribute it and/or modify
+ 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
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
.
- This package is distributed in the hope that it will be useful,
+ 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 <https://www.gnu.org/licenses/>
+ 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 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/debian/man/genmanpages.sh b/debian/man/genmanpages.sh
new file mode 100755
index 0000000..b8904c0
--- /dev/null
+++ b/debian/man/genmanpages.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+
+txt2man -d "${CHANGELOG_DATE}" -t OSMOBTS-TRX -s 1 osmobts-trx.txt > osmobts-trx.1
diff --git a/debian/man/osmobts-trx.txt b/debian/man/osmobts-trx.txt
new file mode 100644
index 0000000..f0187e1
--- /dev/null
+++ b/debian/man/osmobts-trx.txt
@@ -0,0 +1,45 @@
+NAME
+ osmobts-trx - Base Transceiver Station for GSM
+
+SYNOPSIS
+ osmobts-trx [options]
+
+DESCRIPTION
+ OsmoBTS is a software implementation of Layer2/3 of a BTS. It implements the
+ following protocols/interfaces: .
+ LAPDm (GSM 04.06)
+ RTP
+ A-bis/IP in IPA multiplex
+ OML (GSM TS 12.21)
+ RSL (GSM TS 08.58)
+
+ OsmoBTS is modular and has support for multiple back-ends. A back-end talks to
+ a specific L1/PHY implementation of the respective BTS hardware. Based on this
+ architecture, it should be relatively easy to add a new back-end to support
+ so-far unsupported GSM PHY/L1 and associated hardware.
+
+
+
+OPTIONS
+ -h,--help this text
+ -d,--debug MASK Enable debugging (e.g. -d DRSL:DOML:DLAPDM)
+ -D,--daemonize For the process into a background daemon
+ -c,--config-file Specify the filename of the config file
+ -s,--disable-color Don't use colors in stderr log output
+ -T,--timestamp Prefix every log line with a timestamp
+ -V,--version Print version information and exit
+ -e,--log-level Set a global log-level
+ -t,--trx-num Set number of TRX (default=1)
+ -i,--gsmtap-ip The destination IP used for GSMTAP.
+ -r,--realtime PRIO Set realtime scheduler with given prio
+ -I,--local-trx-ip Local IP for transceiver to connect (default=127.0.0.1)
+
+
+SEE ALSO
+ osmo-nitb(1), osmo-bsc(1), osmo-trx(1)
+
+AUTHOR
+ This manual page was written by Ruben Undheim <ruben.undheim at gmail.com> for the Debian project (and may be used by others).
+
+
+
diff --git a/debian/osmo-bts.manpages b/debian/osmo-bts.manpages
new file mode 100644
index 0000000..c63baa9
--- /dev/null
+++ b/debian/osmo-bts.manpages
@@ -0,0 +1 @@
+debian/man/osmobts-trx.1
diff --git a/debian/patches/0003-Fixed-some-spelling-errors.patch b/debian/patches/0003-Fixed-some-spelling-errors.patch
new file mode 100644
index 0000000..fdb15de
--- /dev/null
+++ b/debian/patches/0003-Fixed-some-spelling-errors.patch
@@ -0,0 +1,67 @@
+From: Ruben Undheim <ruben.undheim at gmail.com>
+Date: Sat, 28 May 2016 09:47:15 +0200
+Subject: Fixed some spelling errors
+
+---
+ src/common/amr.c | 2 +-
+ src/common/rsl.c | 6 +++---
+ src/osmo-bts-trx/trx_if.c | 2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/common/amr.c b/src/common/amr.c
+index 80c5fb6..16e3530 100644
+--- a/src/common/amr.c
++++ b/src/common/amr.c
+@@ -33,7 +33,7 @@ int amr_parse_mr_conf(struct amr_multirate_conf *amr_mrc,
+ int i, j = 0;
+
+ if (mr_version != 1) {
+- LOGP(DRSL, LOGL_ERROR, "AMR Multirate Version %u unknonw\n",
++ LOGP(DRSL, LOGL_ERROR, "AMR Multirate Version %u unknown\n",
+ mr_version);
+ goto ret_einval;
+ }
+diff --git a/src/common/rsl.c b/src/common/rsl.c
+index a225155..23f57db 100644
+--- a/src/common/rsl.c
++++ b/src/common/rsl.c
+@@ -1757,7 +1757,7 @@ static int rsl_rx_cchan(struct gsm_bts_trx *trx, struct msgb *msg)
+
+ msg->lchan = rsl_lchan_lookup(trx, cch->chan_nr);
+ if (!msg->lchan) {
+- LOGP(DRSL, LOGL_ERROR, "Rx RSL %s for unknow lchan\n",
++ LOGP(DRSL, LOGL_ERROR, "Rx RSL %s for unknown lchan\n",
+ rsl_msg_name(cch->c.msg_type));
+ msgb_free(msg);
+ return report_error(trx);
+@@ -1811,7 +1811,7 @@ static int rsl_rx_dchan(struct gsm_bts_trx *trx, struct msgb *msg)
+
+ msg->lchan = rsl_lchan_lookup(trx, dch->chan_nr);
+ if (!msg->lchan) {
+- LOGP(DRSL, LOGL_ERROR, "Rx RSL %s for unknow lchan\n",
++ LOGP(DRSL, LOGL_ERROR, "Rx RSL %s for unknown lchan\n",
+ rsl_msg_name(dch->c.msg_type));
+ msgb_free(msg);
+ return report_error(trx);
+@@ -1905,7 +1905,7 @@ static int rsl_rx_ipaccess(struct gsm_bts_trx *trx, struct msgb *msg)
+
+ msg->lchan = rsl_lchan_lookup(trx, dch->chan_nr);
+ if (!msg->lchan) {
+- LOGP(DRSL, LOGL_ERROR, "Rx RSL %s for unknow lchan\n",
++ LOGP(DRSL, LOGL_ERROR, "Rx RSL %s for unknown lchan\n",
+ rsl_msg_name(dch->c.msg_type));
+ msgb_free(msg);
+ return report_error(trx);
+diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c
+index 69ad841..479a172 100644
+--- a/src/osmo-bts-trx/trx_if.c
++++ b/src/osmo-bts-trx/trx_if.c
+@@ -416,7 +416,7 @@ static int trx_data_read_cb(struct osmo_fd *ofd, unsigned int what)
+ if (len <= 0)
+ return len;
+ if (len != 158) {
+- LOGP(DTRX, LOGL_NOTICE, "Got data message with invalid lenght "
++ LOGP(DTRX, LOGL_NOTICE, "Got data message with invalid length "
+ "'%d'\n", len);
+ return -EINVAL;
+ }
diff --git a/debian/patches/01_location_of_gsm_data_shared.patch b/debian/patches/01_location_of_gsm_data_shared.patch
index a7e0301..b0a1499 100644
--- a/debian/patches/01_location_of_gsm_data_shared.patch
+++ b/debian/patches/01_location_of_gsm_data_shared.patch
@@ -1,31 +1,18 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- osmo-bts (0.4.0-1) unstable; urgency=low
- .
- * Initial release (Closes: #806584)
-Author: Ruben Undheim <ruben.undheim at gmail.com>
-Bug-Debian: https://bugs.debian.org/806584
+From: Ruben Undheim <ruben.undheim at gmail.com>
+Date: Sat, 28 May 2016 09:38:56 +0200
+Subject: In order to build osmo-bts,
+ some files shared with openbsc needs to be available. This replaces
+ the search path for these files so that they are picked from the openbsc-dev
+ package.
---
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
+ src/common/gsm_data_shared.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: https://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- osmo-bts-0.4.0.orig/src/common/gsm_data_shared.c
-+++ osmo-bts-0.4.0/src/common/gsm_data_shared.c
+diff --git a/src/common/gsm_data_shared.c b/src/common/gsm_data_shared.c
+index 706892d..932d71f 100644
+--- a/src/common/gsm_data_shared.c
++++ b/src/common/gsm_data_shared.c
@@ -1 +1 @@
-#include "../../../openbsc/openbsc/src/libcommon/gsm_data_shared.c"
+#include "/usr/src/osmocom/openbsc/libcommon/gsm_data_shared.c"
diff --git a/debian/patches/keep_up_with_openbscs_amr.patch b/debian/patches/keep_up_with_openbscs_amr.patch
index 38d1d46..b040964 100644
--- a/debian/patches/keep_up_with_openbscs_amr.patch
+++ b/debian/patches/keep_up_with_openbscs_amr.patch
@@ -1,13 +1,20 @@
-Description: This patch has been cherry picked from the upstream
- git repo for making it compatible with newer versions of
- openbsc.
-Author: Ruben Undheim <ruben.undheim at gmail.com>
+From: Ruben Undheim <ruben.undheim at gmail.com>
+Date: Sat, 28 May 2016 09:35:55 +0200
+Subject: This patch has been cherry picked from the upstream git repo for
+ making it compatible with newer versions of openbsc.
-Index: osmo-bts/src/common/amr.c
-===================================================================
---- osmo-bts.orig/src/common/amr.c 2016-02-21 09:59:46.298277208 +0100
-+++ osmo-bts/src/common/amr.c 2016-02-21 09:59:46.294277057 +0100
-@@ -16,9 +16,9 @@
+---
+ src/common/amr.c | 20 ++++++++++----------
+ src/osmo-bts-sysmo/tch.c | 2 +-
+ src/osmo-bts-trx/l1_if.c | 16 ++++++++--------
+ src/osmo-bts-trx/loops.c | 6 +++---
+ 4 files changed, 22 insertions(+), 22 deletions(-)
+
+diff --git a/src/common/amr.c b/src/common/amr.c
+index b0ff1b9..80c5fb6 100644
+--- a/src/common/amr.c
++++ b/src/common/amr.c
+@@ -16,9 +16,9 @@ void amr_log_mr_conf(int ss, int logl, const char *pfx,
for (i = 0; i < amr_mrc->num_modes; i++)
LOGPC(ss, logl, ", mode[%u] = %u/%u/%u",
@@ -20,7 +27,7 @@ Index: osmo-bts/src/common/amr.c
LOGPC(ss, logl, "\n");
}
-@@ -64,23 +64,23 @@
+@@ -64,23 +64,23 @@ int amr_parse_mr_conf(struct amr_multirate_conf *amr_mrc,
for (i = 0; i < 8; i++) {
if (mr_conf[1] & (1 << i)) {
@@ -51,11 +58,11 @@ Index: osmo-bts/src/common/amr.c
}
return num_codecs;
-Index: osmo-bts/src/osmo-bts-sysmo/tch.c
-===================================================================
---- osmo-bts.orig/src/osmo-bts-sysmo/tch.c 2016-02-21 09:59:46.298277208 +0100
-+++ osmo-bts/src/osmo-bts-sysmo/tch.c 2016-02-21 09:59:46.294277057 +0100
-@@ -313,7 +313,7 @@
+diff --git a/src/osmo-bts-sysmo/tch.c b/src/osmo-bts-sysmo/tch.c
+index 7cf49e3..1ab36d0 100644
+--- a/src/osmo-bts-sysmo/tch.c
++++ b/src/osmo-bts-sysmo/tch.c
+@@ -313,7 +313,7 @@ int get_amr_mode_idx(const struct amr_multirate_conf *amr_mrc, uint8_t cmi)
{
unsigned int i;
for (i = 0; i < amr_mrc->num_modes; i++) {
@@ -64,11 +71,11 @@ Index: osmo-bts/src/osmo-bts-sysmo/tch.c
return i;
}
return -EINVAL;
-Index: osmo-bts/src/osmo-bts-trx/l1_if.c
-===================================================================
---- osmo-bts.orig/src/osmo-bts-trx/l1_if.c 2016-02-21 09:59:44.646216742 +0100
-+++ osmo-bts/src/osmo-bts-trx/l1_if.c 2016-02-21 10:00:07.655276973 +0100
-@@ -549,10 +549,10 @@
+diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c
+index 42cb17b..f3cb5bf 100644
+--- a/src/osmo-bts-trx/l1_if.c
++++ b/src/osmo-bts-trx/l1_if.c
+@@ -549,10 +549,10 @@ int bts_model_l1sap_down(struct gsm_bts_trx *trx, struct osmo_phsap_prim *l1sap)
trx_sched_set_mode(l1h, chan_nr,
lchan->rsl_cmode, lchan->tch_mode,
lchan->tch.amr_mr.num_modes,
@@ -83,7 +90,7 @@ Index: osmo-bts/src/osmo-bts-trx/l1_if.c
amr_get_initial_mode(lchan),
(lchan->ho.active == 1));
/* init lapdm */
-@@ -577,10 +577,10 @@
+@@ -577,10 +577,10 @@ int bts_model_l1sap_down(struct gsm_bts_trx *trx, struct osmo_phsap_prim *l1sap)
trx_sched_set_mode(l1h, chan_nr,
lchan->rsl_cmode, lchan->tch_mode,
lchan->tch.amr_mr.num_modes,
@@ -98,11 +105,11 @@ Index: osmo-bts/src/osmo-bts-trx/l1_if.c
amr_get_initial_mode(lchan),
0);
break;
-Index: osmo-bts/src/osmo-bts-trx/loops.c
-===================================================================
---- osmo-bts.orig/src/osmo-bts-trx/loops.c 2016-02-21 09:59:44.646216742 +0100
-+++ osmo-bts/src/osmo-bts-trx/loops.c 2016-02-21 10:00:07.655276973 +0100
-@@ -286,7 +286,7 @@
+diff --git a/src/osmo-bts-trx/loops.c b/src/osmo-bts-trx/loops.c
+index fa38055..52ac170 100644
+--- a/src/osmo-bts-trx/loops.c
++++ b/src/osmo-bts-trx/loops.c
+@@ -286,7 +286,7 @@ int trx_loop_amr_input(struct trx_l1h *l1h, uint8_t chan_nr,
if (chan_state->dl_cmr > 0) {
/* degrade, if ber is above threshold FIXME: C/I */
if (ber >
@@ -111,7 +118,7 @@ Index: osmo-bts/src/osmo-bts-trx/loops.c
LOGP(DLOOP, LOGL_DEBUG, "Degrading due to BER %.6f "
"from codec id %d to %d of trx=%u "
"chan_nr=0x%02x\n", ber, chan_state->dl_cmr,
-@@ -301,8 +301,8 @@
+@@ -301,8 +301,8 @@ int trx_loop_amr_input(struct trx_l1h *l1h, uint8_t chan_nr,
if (chan_state->dl_cmr < chan_state->codecs - 1) {
/* degrade, if ber is above threshold FIXME: C/I*/
if (ber <
diff --git a/debian/patches/series b/debian/patches/series
index cf8b7df..81650fc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
01_location_of_gsm_data_shared.patch
keep_up_with_openbscs_amr.patch
+0003-Fixed-some-spelling-errors.patch
diff --git a/debian/rules b/debian/rules
index 471a810..61008c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,14 +10,16 @@ CHANGELOG_DATE ?= $(shell date -d "`dpkg-parsechangelog --show-field Date`" +"%d
%:
dh $@ --with autoreconf
-override_dh_auto_clean:
- dh_auto_clean
-
override_dh_auto_configure:
dh_auto_configure -- --with-openbsc=/usr/include/osmocom --enable-trx
#dh_auto_configure -- --with-openbsc=/usr/include/osmocom --enable-trx --enable-sysmocom-bts
override_dh_installman:
- #cd debian/man ; CHANGELOG_DATE="$(CHANGELOG_DATE)" ./genmanpages.sh
+ cd debian/man ; CHANGELOG_DATE="$(CHANGELOG_DATE)" ./genmanpages.sh
dh_installman
+override_dh_clean:
+ dh_clean
+ $(RM) debian/man/osmobts-trx.1
+ $(RM) tests/package.m4
+ $(RM) tests/testsuite
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/osmo-bts.git
More information about the debian-science-commits
mailing list