[libosmocore] 16/40: merge patched into master

[Ruben Undheim]

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

rubund-guest pushed a commit to branch master
in repository libosmocore.

commit 9a671b884e6dfdb7ff8e427d24a4ab80a4e997c4
Merge: 5bd72a5 ea0f2ef
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Wed Sep 16 19:02:53 2015 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 .../0002-Some-spelling-errors-corrected.patch      | 36 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 src/logging.c                                      |  2 +-
 src/sim/card_fs_tetra.c                            |  2 +-
 5 files changed, 41 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index b746bb3,0000000..fa2425f
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
- 24bf5889ca5f902a2bda6c80bd273db99a5f39a6
- 24bf5889ca5f902a2bda6c80bd273db99a5f39a6
++ea0f2efc86386cde70f4475cbdca6140a78dc778
++ea0f2efc86386cde70f4475cbdca6140a78dc778
 +d452a48ac66d8e99a562c91660f371270d9c6b21
 +d452a48ac66d8e99a562c91660f371270d9c6b21
 +libosmocore_0.8.3.orig.tar.gz
 +9d5552fb9928dc89d13d4f77aab4fbcceaae7e36
 +564575
diff --cc debian/patches/0002-Some-spelling-errors-corrected.patch
index 0000000,0000000..de2c4aa
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Some-spelling-errors-corrected.patch
@@@ -1,0 -1,0 +1,36 @@@
++From ea0f2efc86386cde70f4475cbdca6140a78dc778 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
++--- a/src/logging.c
+++++ b/src/logging.c
++@@ -125,7 +125,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,
diff --cc debian/patches/series
index ffcb485,0ca407b..5edaf1c
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,1 +1,2 @@@
 -debian-changes-0.1.17-1
 +0001-Removed-illegal-pkg-config-directive.patch
++0002-Some-spelling-errors-corrected.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libosmocore.git