[libosmocore] 02/03: 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 c2a22b5e380240addf615327fa28ee7051c2a4ed
Merge: 6a6037f 22c488b
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Tue Dec 8 21:14:51 2015 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...rd-attempt-of-fixing-the-big-endian-issue.patch | 41 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 include/osmocom/gsm/protocol/gsm_03_41.h           |  8 ++---
 4 files changed, 48 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index 6a15974,0000000..4c697aa
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
- 15f0458fb78be796007243b1967f3ae0ee903507
- 15f0458fb78be796007243b1967f3ae0ee903507
++22c488b367a2c931bd1df8f1f3152308bf1e1805
++22c488b367a2c931bd1df8f1f3152308bf1e1805
 +16ca4aeb70817af9c2739dc58e910ac67e9b0864
 +16ca4aeb70817af9c2739dc58e910ac67e9b0864
 +libosmocore_0.9.0.orig.tar.gz
 +705eca7a77d295fcaf08ed4c3d0feb8b696fe914
 +574737
diff --cc debian/patches/0005-Third-attempt-of-fixing-the-big-endian-issue.patch
index 0000000,0000000..65c7196
new file mode 100644
--- /dev/null
+++ b/debian/patches/0005-Third-attempt-of-fixing-the-big-endian-issue.patch
@@@ -1,0 -1,0 +1,41 @@@
++From 22c488b367a2c931bd1df8f1f3152308bf1e1805 Mon Sep 17 00:00:00 2001
++From: Ruben Undheim <ruben.undheim at gmail.com>
++Date: Tue, 8 Dec 2015 21:14:37 +0100
++Subject: Third attempt of fixing the big-endian issue
++
++---
++ include/osmocom/gsm/protocol/gsm_03_41.h | 8 ++++----
++ 1 file changed, 4 insertions(+), 4 deletions(-)
++
++diff --git a/include/osmocom/gsm/protocol/gsm_03_41.h b/include/osmocom/gsm/protocol/gsm_03_41.h
++index e4c077c..40051cd 100644
++--- a/include/osmocom/gsm/protocol/gsm_03_41.h
+++++ b/include/osmocom/gsm/protocol/gsm_03_41.h
++@@ -24,10 +24,10 @@ struct gsm341_ms_message {
++ 		uint8_t update:4;
++ 		uint8_t code_lo:4;
++ #else
++-		uint8_t code_lo:4;
++-		uint8_t update:4;
++ 		uint8_t gs:2;
++ 		uint8_t code_hi:6;
+++		uint8_t code_lo:4;
+++		uint8_t update:4;
++ #endif
++ 	} serial;
++ 	uint16_t msg_id;
++@@ -63,12 +63,12 @@ struct gsm341_etws_message {
++ 		uint8_t update:4;
++ 		uint8_t code_lo:4;
++ #else
++-		uint8_t code_lo:4;
++-		uint8_t update:4;
++ 		uint8_t gs:2;
++ 		uint8_t alert:1;
++ 		uint8_t popup:1;
++ 		uint8_t code_hi:4;
+++		uint8_t code_lo:4;
+++		uint8_t update:4;
++ #endif
++ 	} serial;
++ 	uint16_t msg_id;
diff --cc debian/patches/series
index a0d32c4,0ca407b..9d2aac4
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,1 +1,5 @@@
 -debian-changes-0.1.17-1
 +0001-Removed-illegal-pkg-config-directive.patch
 +0002-Some-spelling-errors-corrected.patch
 +0003-Setting-library-version-explicitly.patch
 +0004-Patched-struct-for-big-endian-architectures.patch
++0005-Third-attempt-of-fixing-the-big-endian-issue.patch

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