[libosmocore] 04/05: merge patched into master
Ruben Undheim
rubund-guest at moszumanska.debian.org
Sun Nov 29 13:33:05 UTC 2015
This is an automated email from the git hooks/post-receive script.
rubund-guest pushed a commit to branch master
in repository libosmocore.
commit d9e894283526f058e4d6b8a3387da23f4240f24f
Merge: da79952 eea84e9
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date: Sun Nov 29 14:20:16 2015 +0100
merge patched into master
.gitignore | 1 +
configure.ac | 2 +-
debian/.git-dpm | 6 +-
...0001-Removed-illegal-pkg-config-directive.patch | 2 +-
.../0002-Some-spelling-errors-corrected.patch | 6 +-
include/Makefile.am | 3 +
include/osmocom/core/bitXXgen.h.tpl | 4 +-
include/osmocom/core/linuxlist.h | 3 +-
include/osmocom/core/logging.h | 3 +-
include/osmocom/core/rate_ctr.h | 21 +
include/osmocom/core/stat_item.h | 130 ++++
include/osmocom/core/statistics.h | 8 +-
include/osmocom/core/stats.h | 112 ++++
include/osmocom/core/timer.h | 8 +-
include/osmocom/gprs/gprs_ns.h | 2 +
include/osmocom/gsm/protocol/ipaccess.h | 1 +
include/osmocom/vty/command.h | 10 +
include/osmocom/vty/misc.h | 8 +-
include/osmocom/vty/ports.h | 3 +-
include/osmocom/vty/stats.h | 3 +
src/Makefile.am | 2 +-
src/gb/gprs_bssgp.c | 2 +
src/gb/gprs_ns.c | 38 ++
src/gb/gprs_ns_vty.c | 4 +-
src/gsm/Makefile.am | 8 +-
src/gsm/tlv_parser.c | 4 +-
src/logging.c | 5 +
src/rate_ctr.c | 41 ++
src/stat_item.c | 268 ++++++++
src/statistics.c | 8 +
src/stats.c | 697 +++++++++++++++++++++
src/timer.c | 7 +-
src/utils.c | 1 +
src/vty/Makefile.am | 4 +-
src/vty/stats_vty.c | 430 +++++++++++++
src/vty/utils.c | 125 +++-
tests/Makefile.am | 21 +-
tests/stats/stats_test.c | 213 +++++++
tests/stats/stats_test.ok | 0
tests/testsuite.at | 6 +
tests/vty/vty_test.ok | 6 +-
41 files changed, 2171 insertions(+), 55 deletions(-)
diff --cc debian/.git-dpm
index 2f211d5,0000000..680afbd
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
+# see git-dpm(1) from git-dpm package
- ea0f2efc86386cde70f4475cbdca6140a78dc778
- ea0f2efc86386cde70f4475cbdca6140a78dc778
- d452a48ac66d8e99a562c91660f371270d9c6b21
++eea84e9052b80269899641d5c2a72176ba1873bf
++eea84e9052b80269899641d5c2a72176ba1873bf
++16ca4aeb70817af9c2739dc58e910ac67e9b0864
+16ca4aeb70817af9c2739dc58e910ac67e9b0864
+libosmocore_0.9.0.orig.tar.gz
+705eca7a77d295fcaf08ed4c3d0feb8b696fe914
+574737
diff --cc debian/patches/0001-Removed-illegal-pkg-config-directive.patch
index 79e613d,0000000..579a86f
mode 100644,000000..100644
--- a/debian/patches/0001-Removed-illegal-pkg-config-directive.patch
+++ b/debian/patches/0001-Removed-illegal-pkg-config-directive.patch
@@@ -1,21 -1,0 +1,21 @@@
- From 24bf5889ca5f902a2bda6c80bd273db99a5f39a6 Mon Sep 17 00:00:00 2001
++From 26760c41e836f0efd4e7fc0d6fd0a2ade31b799f Mon Sep 17 00:00:00 2001
+From: Ruben Undheim <ruben.undheim at gmail.com>
+Date: Wed, 16 Sep 2015 19:01:00 +0200
+Subject: Removed illegal pkg-config directive
+
+Gets rid of pkg-config-bad-directive lintian
+---
+ libosmogb.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libosmogb.pc.in b/libosmogb.pc.in
+index 33cacaf..4fc2547 100644
+--- a/libosmogb.pc.in
++++ b/libosmogb.pc.in
+@@ -7,5 +7,5 @@ Name: Osmocom GPRS Gb Library
+ Description: Osmocom GPRS Gb Interface (NS/BSSGP) Library
+ Version: @VERSION@
+ Libs: -L${libdir} -losmogb -losmovty
+-Cflags: -I${includedir}/ -fno-strict-aliasing
++Cflags: -I${includedir}/
+
diff --cc debian/patches/0002-Some-spelling-errors-corrected.patch
index de2c4aa,0000000..255ae0e
mode 100644,000000..100644
--- a/debian/patches/0002-Some-spelling-errors-corrected.patch
+++ b/debian/patches/0002-Some-spelling-errors-corrected.patch
@@@ -1,36 -1,0 +1,36 @@@
- From ea0f2efc86386cde70f4475cbdca6140a78dc778 Mon Sep 17 00:00:00 2001
++From eea84e9052b80269899641d5c2a72176ba1873bf Mon Sep 17 00:00:00 2001
+From: Ruben Undheim <ruben.undheim at gmail.com>
+Date: Wed, 16 Sep 2015 19:02:35 +0200
+Subject: Some spelling errors corrected
+
+---
+ src/logging.c | 2 +-
+ src/sim/card_fs_tetra.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/logging.c b/src/logging.c
- index 20b0596..899d4b6 100644
++index 876964a..b71d103 100644
+--- a/src/logging.c
++++ b/src/logging.c
- @@ -125,7 +125,7 @@ const char *loglevel_descriptions[LOGLEVEL_DEFS+1] = {
++@@ -130,7 +130,7 @@ const char *loglevel_descriptions[LOGLEVEL_DEFS+1] = {
+ "Don't use. It doesn't log anything",
+ "Log debug messages and higher levels",
+ "Log informational messages and higher levels",
+- "Log noticable messages and higher levels",
++ "Log noticeable messages and higher levels",
+ "Log error messages and higher levels",
+ "Log only fatal messages",
+ NULL,
+diff --git a/src/sim/card_fs_tetra.c b/src/sim/card_fs_tetra.c
+index 625adbd..657e55f 100644
+--- a/src/sim/card_fs_tetra.c
++++ b/src/sim/card_fs_tetra.c
+@@ -204,7 +204,7 @@ static const struct osim_file_desc sim_ef_in_tetra[] = {
+ EF_LIN_FIX_N(0x6F2B, SFI_NONE, "EF.MSGEXT", F_OPTIONAL, 16, 16,
+ "Message Extension"),
+ EF_LIN_FIX_N(0x6F2C, SFI_NONE, "EF.EADDR", 0, 17, 17,
+- "Emergency adresses"),
++ "Emergency addresses"),
+ EF_TRANSP_N(0x6F2D, SFI_NONE, "EF.EINFO", 0, 2, 2,
+ "Emergency call information"),
+ EF_LIN_FIX_N(0x6F2E, SFI_NONE, "EF.DMOCh", F_OPTIONAL, 4, 4,
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libosmocore.git
More information about the debian-science-commits
mailing list