[Pkg-voip-commits] [sngrep] 01/01: Merge branch 'master' into wheezy-backports
Victor Seva Lopez
maniac-guest at moszumanska.debian.org
Wed Jul 15 07:30:07 UTC 2015
This is an automated email from the git hooks/post-receive script.
maniac-guest pushed a commit to branch wheezy-backports
in repository sngrep.
commit 8569dd4ab91c5653415056bfc49daab6c4c79285
Merge: 3bd7609 88cc2f7
Author: Victor Seva <linuxmaniac at torreviejawireless.org>
Date: Wed Jul 15 09:26:46 2015 +0200
Merge branch 'master' into wheezy-backports
Conflicts:
debian/changelog
.gitignore | 8 +-
ChangeLog | 38 ++
Makefile.am | 2 +-
TODO | 10 +-
bootstrap.sh | 38 +-
config/sngreprc | 2 +-
configure.ac | 3 +-
debian/changelog | 23 +-
debian/watch | 2 +-
doc/sngrep.8 | 12 +-
src/Makefile.am | 7 +-
src/capture.c | 258 +++++++----
src/capture.h | 153 ++++---
src/capture_tls.c | 58 ++-
src/capture_tls.h | 6 +-
src/capture_ws.c | 113 +++++
src/capture_ws.h | 52 +++
src/filter.c | 30 +-
src/filter.h | 11 +-
src/group.c | 183 +++++---
src/group.h | 23 +-
src/keybinding.c | 31 +-
src/keybinding.h | 5 +-
src/main.c | 39 +-
src/media.c | 111 +++++
src/media.h | 89 ++++
src/option.c | 182 +++-----
src/option.h | 76 +---
src/rtp.c | 229 ++++++++++
src/rtp.h | 100 +++++
src/setting.c | 222 +++++++++
src/setting.h | 174 ++++++++
src/sip.c | 916 ++++++++++++++------------------------
src/sip.h | 453 ++++---------------
src/sip_attr.c | 98 ++--
src/sip_attr.h | 52 ++-
src/sip_call.c | 251 +++++++++++
src/sip_call.h | 221 +++++++++
src/sip_msg.c | 156 +++++++
src/sip_msg.h | 226 ++++++++++
src/ui_call_flow.c | 707 +++++++++++++++++++++--------
src/ui_call_flow.h | 195 +++++++-
src/ui_call_list.c | 225 +++++-----
src/ui_call_list.h | 24 +-
src/ui_call_raw.c | 84 ++--
src/ui_call_raw.h | 22 +
src/ui_column_select.c | 55 ++-
src/ui_column_select.h | 14 +-
src/ui_filter.c | 49 +-
src/ui_filter.h | 14 +-
src/ui_manager.c | 279 +++++++++---
src/ui_manager.h | 59 ++-
src/ui_msg_diff.c | 30 +-
src/ui_save.c | 558 +++++++++++++++++++++++
src/{ui_save_pcap.h => ui_save.h} | 65 ++-
src/ui_save_pcap.c | 365 ---------------
src/ui_save_raw.c | 272 -----------
src/ui_save_raw.h | 145 ------
src/ui_settings.c | 517 +++++++++++++++++++++
src/ui_settings.h | 263 +++++++++++
src/util.c | 108 +++++
src/util.h | 67 +++
src/vector.c | 299 +++++++++++++
src/vector.h | 247 ++++++++++
tests/Makefile.am | 10 +
tests/README | 16 +
tests/aaa.pcap | Bin 0 -> 111077 bytes
tests/test_001.c | 36 ++
tests/test_002.c | 66 +++
tests/test_003.c | 74 +++
tests/test_004.c | 65 +++
tests/test_005.c | 63 +++
tests/test_006.c | 43 ++
tests/test_007.c | 79 ++++
tests/test_input.c | 80 ++++
75 files changed, 7043 insertions(+), 2815 deletions(-)
diff --cc debian/changelog
index 7abc477,7f661ab..7cb9650
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,21 +1,27 @@@
- sngrep (0.3.1-1~bpo7+1) wheezy-backports; urgency=medium
++sngrep (0.4.1-1~bpo7+1) wheezy-backports; urgency=medium
+
+ * Rebuild for wheezy-backports.
+
- -- Victor Seva <linuxmaniac at torreviejawireless.org> Sun, 17 May 2015 12:10:56 +0200
++ -- Victor Seva <linuxmaniac at torreviejawireless.org> Wed, 15 Jul 2015 09:25:39 +0200
++
+ sngrep (0.4.1-1) unstable; urgency=medium
+
+ * [3c853dd] Imported Upstream version 0.4.1
+
+ -- Victor Seva <linuxmaniac at torreviejawireless.org> Wed, 15 Jul 2015 09:09:16 +0200
+
+ sngrep (0.4.0-1) unstable; urgency=medium
+
+ * [9d1a9ce] Imported Upstream version 0.4.0
+
+ -- Victor Seva <linuxmaniac at torreviejawireless.org> Thu, 09 Jul 2015 21:38:08 +0200
+
+ sngrep (0.3.2-1) unstable; urgency=medium
+
+ * [6e1188f] debian/watch: fix upstream rc versions
+ * [c4eab72] Imported Upstream version 0.3.2
+
+ -- Victor Seva <linuxmaniac at torreviejawireless.org> Mon, 01 Jun 2015 14:53:20 +0200
sngrep (0.3.1-1) unstable; urgency=low
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/sngrep.git
More information about the Pkg-voip-commits
mailing list