[Python-modules-commits] [python-gammu] 02/05: Merge tag 'upstream/2.6'

[Michal Cihar]

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

nijel pushed a commit to branch master
in repository python-gammu.

commit 64c137e022f0bce7d67be3a2cac508f6e0774d9d
Merge: 7d7b7cb 7c89a1f
Author: Michal Čihař <michal at cihar.com>
Date:   Tue May 24 13:17:39 2016 +0200

    Merge tag 'upstream/2.6'
    
    Upstream version 2.6
    
    # gpg: Podpis vytvořen Út 24. květen 2016, 13:17:38 CEST pomocí klíče RSA s ID uživatele 42B7511D
    # gpg: Dobrý podpis od "Michal Čihař <michal at cihar.com>"
    # gpg:                 alias "Michal Čihař <nijel at users.sourceforge.net>"
    # gpg:                 alias "Michal Čihař <nijel at debian.org>"
    # gpg:                 alias "[jpeg image of size 8848]"

 NEWS.rst                          |   6 ++++++
 PKG-INFO                          |   7 +++++--
 README.rst                        |   5 ++++-
 examples/__init__.py              |   2 +-
 examples/addcontacts.py           |   2 +-
 examples/addfile.py               |   2 +-
 examples/backup_convertor.py      |   2 +-
 examples/batteryinfo.py           |   2 +-
 examples/debugging.py             |   2 +-
 examples/dialvoice.py             |   2 +-
 examples/doc-exceptions.py        |   2 +-
 examples/dummy_phone.py           |   2 +-
 examples/filesystem_test.py       |   2 +-
 examples/getallcalendar.py        |   2 +-
 examples/getallmemory.py          |   2 +-
 examples/getallmemory_nonext.py   |   2 +-
 examples/getallsms.py             |   2 +-
 examples/getallsms_decode.py      |   2 +-
 examples/getalltodo.py            |   2 +-
 examples/getdiverts.py            |   2 +-
 examples/incoming.py              |   2 +-
 examples/listfilesystem.py        |   2 +-
 examples/mass_sms.py              |   2 +-
 examples/pdu_decoder.py           |   2 +-
 examples/read_sms_backup.py       |   2 +-
 examples/savesmspercontact.py     |   2 +-
 examples/sendlongsms.py           |   2 +-
 examples/sendsms.py               |   2 +-
 examples/service_numbers.py       |   2 +-
 examples/setdiverts.py            |   2 +-
 examples/sms_replier.py           |   2 +-
 examples/smsbackup.py             |   2 +-
 examples/smsd_inject.py           |   2 +-
 examples/smsd_state.py            |   2 +-
 examples/vcs.py                   |   2 +-
 examples/worker.py                |   2 +-
 gammu/__init__.py                 |   2 +-
 gammu/data.py                     |   2 +-
 gammu/exception.py                |   2 +-
 gammu/smsd.py                     |   2 +-
 gammu/src/convertors/backup.c     |   2 +-
 gammu/src/convertors/base.c       |   2 +-
 gammu/src/convertors/bitmap.c     |   2 +-
 gammu/src/convertors/calendar.c   |   2 +-
 gammu/src/convertors/call.c       |   2 +-
 gammu/src/convertors/diverts.c    |   2 +-
 gammu/src/convertors/file.c       |   2 +-
 gammu/src/convertors/memory.c     |  25 +++++++++++++------------
 gammu/src/convertors/misc.c       |   2 +-
 gammu/src/convertors/ringtone.c   |   2 +-
 gammu/src/convertors/sms.c        |   2 +-
 gammu/src/convertors/string.c     |   2 +-
 gammu/src/convertors/time.c       |   2 +-
 gammu/src/convertors/todo.c       |   2 +-
 gammu/src/convertors/wap.c        |   2 +-
 gammu/src/data.c                  |   2 +-
 gammu/src/errors.c                |   2 +-
 gammu/src/gammu.c                 |   2 +-
 gammu/src/misc.c                  |   2 +-
 gammu/src/smsd.c                  |   2 +-
 gammu/worker.py                   |   2 +-
 include/convertors.h              |   2 +-
 include/data.h                    |   2 +-
 include/errors.h                  |   2 +-
 include/misc.h                    |   2 +-
 python_gammu.egg-info/PKG-INFO    |   7 +++++--
 python_gammu.egg-info/SOURCES.txt |   1 -
 setup.py                          |   4 ++--
 test/__init__.py                  |   2 +-
 test/data/.sqlite.sql.swp         | Bin 16384 -> 0 bytes
 test/test_backup.py               |   2 +-
 test/test_config.py               |   5 ++++-
 test/test_data.py                 |   2 +-
 test/test_dummy.py                |  20 ++++++++++++++++++--
 test/test_errors.py               |   2 +-
 test/test_sms.py                  |   2 +-
 test/test_smsd.py                 |   5 ++++-
 test/test_worker.py               |   2 +-
 78 files changed, 128 insertions(+), 91 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-gammu.git