Hello community,
here is the log from the commit of package python-gammu
checked in at Wed Oct 3 17:01:58 CEST 2007.
--------
--- python-gammu/python-gammu.changes 2007-06-19 10:30:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/python-gammu/python-gammu.changes 2007-09-25 12:22:26.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Sep 25 12:21:59 CEST 2007 - prusnak@suse.cz
+
+- update to 0.22
+ * complete support for managing calls
+ * compatibility with current gammu
+
+-------------------------------------------------------------------
Old:
----
python-gammu-0.21.tar.bz2
New:
----
python-gammu-0.22.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-gammu.spec ++++++
--- /var/tmp/diff_new_pack.L27275/_old 2007-10-03 17:01:52.000000000 +0200
+++ /var/tmp/diff_new_pack.L27275/_new 2007-10-03 17:01:52.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package python-gammu (Version 0.21)
+# spec file for package python-gammu (Version 0.22)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,13 +13,13 @@
Name: python-gammu
BuildRequires: gammu-devel >= 1.11.91
BuildRequires: python-devel
-Version: 0.21
+Version: 0.22
Release: 1
Requires: python-gammu python-wxGTK
-Autoreqprov: on
+AutoReqProv: on
Group: Development/Libraries/Python
-License: GNU General Public License (GPL)
-URL: http://www.cihar.com/gammu/python/
+License: GPL v2 or later
+Url: http://www.cihar.com/gammu/python/
Summary: Python Module to Communicate with Mobile Phones
Source0: %{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -27,7 +27,7 @@
%description
This provides the gammu module that can work with any phone supported
-by Gammu, for example, many from Nokia, Siemens, and Alcatel.
+by Gammu (many phones from Nokia, Siemens, and Alcatel).
@@ -51,8 +51,11 @@
%files -f INSTALLED_FILES
%defattr(-,root,root)
%doc AUTHORS COPYING README NEWS examples
-
%changelog
+* Tue Sep 25 2007 - prusnak@suse.cz
+- update to 0.22
+ * complete support for managing calls
+ * compatibility with current gammu
* Tue Jun 19 2007 - prusnak@suse.cz
- update to 0.21:
* Added suport for nick name in phonebook
++++++ python-gammu-0.21.tar.bz2 -> python-gammu-0.22.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.21/convertors/base.c new/python-gammu-0.22/convertors/base.c
--- old/python-gammu-0.21/convertors/base.c 2007-01-06 13:24:11.000000000 +0100
+++ new/python-gammu-0.22/convertors/base.c 2007-06-26 11:54:22.000000000 +0200
@@ -189,7 +189,7 @@
return ps;
}
-char *GetDataFromDict(PyObject *dict, char *key, int *len) {
+char *GetDataFromDict(PyObject *dict, char *key, Py_ssize_t *len) {
PyObject *o;
char *ps;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.21/convertors/file.c new/python-gammu-0.22/convertors/file.c
--- old/python-gammu-0.21/convertors/file.c 2007-05-29 14:35:55.000000000 +0200
+++ new/python-gammu-0.22/convertors/file.c 2007-06-26 11:48:37.000000000 +0200
@@ -250,7 +250,7 @@
if (file->Used == INT_INVALID) {
file->Used = i;
} else if (file->Used != i) {
- PyErr_Format(PyExc_ValueError, "Used and Buffer size mismatch in File (%i != %i)!", file->Used, i);
+ PyErr_Format(PyExc_ValueError, "Used and Buffer size mismatch in File (%zi != %i)!", file->Used, i);
return 0;
}
file->Buffer = (unsigned char *)malloc(i * sizeof(unsigned char));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.21/convertors/memory.c new/python-gammu-0.22/convertors/memory.c
--- old/python-gammu-0.21/convertors/memory.c 2007-06-01 09:32:10.000000000 +0200
+++ new/python-gammu-0.22/convertors/memory.c 2007-08-06 06:43:15.000000000 +0200
@@ -200,6 +200,9 @@
case PBK_Text_UserID:
convert_text("Text_UserID");
break;
+ case PBK_Text_PictureName:
+ convert_text("Text_PictureName");
+ break;
case PBK_RingtoneID:
f = Py_BuildValue("{s:s,s:O}", "Type", "RingtoneID", "Value", PyLong_FromUnsignedLong(entry->Entries[i].Number));
break;
@@ -209,6 +212,9 @@
case PBK_CallLength:
f = Py_BuildValue("{s:s,s:i}", "Type", "CallLength", "Value", entry->Entries[i].CallLength);
break;
+ case PBK_PushToTalkID:
+ convert_text("PushToTalkID");
+ break;
}
if (f == Py_None) {
@@ -442,6 +448,9 @@
} else if (strcmp("Text_UserID", type) == 0) {
valuetype = 't';
entry->Entries[i].EntryType = PBK_Text_UserID;
+ } else if (strcmp("Text_PictureName", type) == 0) {
+ valuetype = 't';
+ entry->Entries[i].EntryType = PBK_Text_PictureName;
} else if (strcmp("RingtoneID", type) == 0) {
valuetype = 'n';
entry->Entries[i].EntryType = PBK_RingtoneID;
@@ -451,6 +460,9 @@
} else if (strcmp("CallLength", type) == 0) {
valuetype = 'c';
entry->Entries[i].EntryType = PBK_CallLength;
+ } else if (strcmp("PushToTalkID", type) == 0) {
+ valuetype = 't';
+ entry->Entries[i].EntryType = PBK_PushToTalkID;
} else {
PyErr_Format(PyExc_ValueError, "Element %i in Entries has bad type: %s", i, type);
return 0;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.21/convertors.h new/python-gammu-0.22/convertors.h
--- old/python-gammu-0.21/convertors.h 2007-06-11 12:15:01.000000000 +0200
+++ new/python-gammu-0.22/convertors.h 2007-07-16 15:49:02.000000000 +0200
@@ -18,6 +18,9 @@
* vim: expandtab sw=4 ts=4 sts=4:
*/
+#ifndef __pyg_convertors_h__
+#define __pyg_convertors_h__
+
/* Python includes */
#include
@@ -26,6 +29,8 @@
#include
+#include "misc.h"
+
/* Needed for Python 2.3, 2.4 has same included */
#ifndef Py_RETURN_NONE
# define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
@@ -169,7 +174,7 @@
/**
* Gets char* with length (may contain NULs) from dictionary dict with key key. (doesn't allocate it!)
*/
-char *GetDataFromDict(PyObject *dict, char *key, int *len);
+char *GetDataFromDict(PyObject *dict, char *key, Py_ssize_t *len);
/**
* Gets GSM_MemoryType from dictionary dict with key key.
@@ -386,3 +391,4 @@
*/
int WAPBookmarkFromPython(PyObject* dict, GSM_WAPBookmark *wap);
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.21/errors.c new/python-gammu-0.22/errors.c
--- old/python-gammu-0.21/errors.c 2007-06-11 12:15:01.000000000 +0200
+++ new/python-gammu-0.22/errors.c 2007-08-07 06:33:08.000000000 +0200
@@ -75,6 +75,7 @@
PyObject *PyERR_FOLDERPART;
PyObject *PyERR_FOLDERNOTEMPTY;
PyObject *PyERR_DATACONVERTED;
+PyObject *PyERR_UNCONFIGURED;
int checkError(GSM_StateMachine *s, GSM_Error error, char *where) {
PyObject *val;
@@ -136,6 +137,7 @@
case ERR_FOLDERPART: err = PyERR_FOLDERPART; break;
case ERR_FOLDERNOTEMPTY: err = PyERR_FOLDERNOTEMPTY; break;
case ERR_DATACONVERTED: err = PyERR_DATACONVERTED; break;
+ case ERR_UNCONFIGURED: err = PyERR_UNCONFIGURED; break;
}
msg = GSM_ErrorString(error);
@@ -273,6 +275,7 @@
CREATE_ERROR(ERR_FOLDERPART)
CREATE_ERROR(ERR_FOLDERNOTEMPTY)
CREATE_ERROR(ERR_DATACONVERTED)
+ CREATE_ERROR(ERR_UNCONFIGURED)
PyDict_SetItemString(d, "Errors", error_list);
Py_DECREF(error_list);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.21/errors.h new/python-gammu-0.22/errors.h
--- old/python-gammu-0.21/errors.h 2007-01-01 16:07:32.000000000 +0100
+++ new/python-gammu-0.22/errors.h 2007-07-16 15:49:30.000000000 +0200
@@ -18,6 +18,9 @@
* vim: expandtab sw=4 ts=4 sts=4:
*/
+#ifndef __pyg_errors_h__
+#define __pyg_errors_h__
+
#include
#include
@@ -66,3 +69,5 @@
int checkError(GSM_StateMachine *s, GSM_Error error, char *where);
int gammu_create_errors(PyObject *d);
+
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.21/gammu/Data.py new/python-gammu-0.22/gammu/Data.py
--- old/python-gammu-0.21/gammu/Data.py 2007-06-01 09:32:10.000000000 +0200
+++ new/python-gammu-0.22/gammu/Data.py 2007-08-06 06:43:15.000000000 +0200
@@ -100,6 +100,7 @@
'LastModified',
'Text_NickName',
'Text_FormalName',
+ 'PushToTalkID',
]
CalendarTypes = [
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.21/gammu/__init__.py new/python-gammu-0.22/gammu/__init__.py
--- old/python-gammu-0.21/gammu/__init__.py 2007-05-21 12:42:26.000000000 +0200
+++ new/python-gammu-0.22/gammu/__init__.py 2007-07-16 15:44:34.000000000 +0200
@@ -32,16 +32,10 @@
'Data',
'Worker',
'Core',
- '__author__',
- '__email__',
- '__license__',
- '__version__',
- '__gammu_version__',
]
# Conveniency and backward compatibility import
from gammu.Core import *
import gammu.Core
-__version__ = gammu.Core.Version()[1]
-__gammu_version__ = gammu.Core.Version()[0]
+__version__ = 'Gammu %s, python-gammu %s' % gammu.Core.Version()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.21/gammu/Worker.py new/python-gammu-0.22/gammu/Worker.py
--- old/python-gammu-0.21/gammu/Worker.py 2007-05-09 16:45:49.000000000 +0200
+++ new/python-gammu-0.22/gammu/Worker.py 2007-08-01 16:09:52.000000000 +0200
@@ -158,7 +158,7 @@
Initialises thread data.
@param queue: Queue with events.
- @type queue: L{Queue.Queue} object.
+ @type queue: Queue.Queue object.
@param config: Gammu configuration, same as
L{StateMachine.SetConfig} accepts.
@@ -212,7 +212,7 @@
task = GammuTask('Init', ['Init'])
start = False
else:
- # Wait one second for next command
+ # Wait at most ten seconds for next command
task = self._queue.get(False, 10)
try:
while True:
@@ -230,6 +230,8 @@
# This works since python 2.5
pass
except Queue.Empty:
+ # Read the device to catch possible incoming events
+ self._sm.ReadDevice()
if self._terminate:
break
@@ -331,10 +333,10 @@
self._thread = GammuThread(self._queue, self._config, self._callback)
self._thread.start()
- def terminate(self):
+ def terminate(self, timeout=None):
'''
Terminates phone connection.
'''
self.enqueue('Terminate')
- self._thread.join()
+ self._thread.join(timeout)
self._thread = None
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.21/gammu.c new/python-gammu-0.22/gammu.c
--- old/python-gammu-0.21/gammu.c 2007-05-29 14:35:55.000000000 +0200
+++ new/python-gammu-0.22/gammu.c 2007-08-01 15:06:31.000000000 +0200
@@ -766,6 +766,45 @@
}
+static char StateMachine_ReadDevice__doc__[] =
+"ReadDevice(Wait)\n\n"
+"Reads data from device.\n\n"
+"@param Wait: Whether to wait, default is not to wait.\n"
+"@type Wait: bool\n"
+"@return: Number of bytes read\n"
+"@rtype: int\n"
+;
+
+static PyObject *
+StateMachine_ReadDevice(StateMachineObject *self, PyObject *args, PyObject *kwds)
+{
+ static char *kwlist[] = {"Wait", NULL};
+ PyObject *o = Py_None;
+ bool wait;
+ long int result;
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O", kwlist, &o))
+ return NULL;
+
+ if (o == Py_None) {
+ wait = false;
+ } else if (o == Py_False) {
+ wait = false;
+ } else if (o == Py_True) {
+ wait = true;
+ } else {
+ PyErr_SetString(PyExc_TypeError, "use None or bool as Wait!");
+ return NULL;
+ }
+
+ BEGIN_PHONE_COMM
+ result = GSM_ReadDevice(self->s, wait);
+ END_PHONE_COMM
+
+ return PyInt_FromLong(result);
+}
+
+
/*******************/
/* GetManufacturer */
/*******************/
@@ -2970,21 +3009,44 @@
Py_RETURN_NONE;
}
-#if 0
/**************/
/* AnswerCall */
/**************/
static char StateMachine_AnswerCall__doc__[] =
-"Accept current incoming call."
+"AnswerCall(ID, All)\n\n"
+"Accept current incoming call.\n"
+"@param ID: ID of call\n"
+"@type ID: integer\n"
+"@param All: Answer all calls?\n"
+"@type All: bool\n"
+"@return: None\n"
+"@rtype: None\n"
;
static PyObject *
StateMachine_AnswerCall(StateMachineObject *self, PyObject *args, PyObject *kwds) {
GSM_Error error;
+ static char *kwlist[] = {"ID", "All", NULL};
+ int id;
+ bool all;
+ PyObject *o = Py_None;
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwds, "iO", kwlist,
+ &id, &o))
+ return NULL;
+
+ if (o == Py_False) {
+ all = false;
+ } else if (o == Py_True) {
+ all = true;
+ } else {
+ PyErr_SetString(PyExc_TypeError, "use bool as All!");
+ return NULL;
+ }
BEGIN_PHONE_COMM
- error = GSM_AnswerCall(self->s);
+ error = GSM_AnswerCall(self->s, id, all);
END_PHONE_COMM
if (!checkError(self->s, error, "AnswerCall")) return NULL;
@@ -2997,15 +3059,39 @@
/**************/
static char StateMachine_CancelCall__doc__[] =
-"Deny current incoming call."
+"CancelCall(ID, All)\n\n"
+"Deny current incoming call.\n"
+"@param ID: ID of call\n"
+"@type ID: integer\n"
+"@param All: Cancel all calls?\n"
+"@type All: bool\n"
+"@return: None\n"
+"@rtype: None\n"
;
static PyObject *
StateMachine_CancelCall(StateMachineObject *self, PyObject *args, PyObject *kwds) {
GSM_Error error;
+ static char *kwlist[] = {"ID", "All", NULL};
+ int id;
+ bool all;
+ PyObject *o = Py_None;
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwds, "iO", kwlist,
+ &id, &o))
+ return NULL;
+
+ if (o == Py_False) {
+ all = false;
+ } else if (o == Py_True) {
+ all = true;
+ } else {
+ PyErr_SetString(PyExc_TypeError, "use bool as All!");
+ return NULL;
+ }
BEGIN_PHONE_COMM
- error = GSM_CancelCall(self->s);
+ error = GSM_CancelCall(self->s, id, all);
END_PHONE_COMM
if (!checkError(self->s, error, "CancelCall")) return NULL;
@@ -3018,15 +3104,26 @@
/************/
static char StateMachine_HoldCall__doc__[] =
-"Holds call."
+"HoldCall(ID)\n\n"
+"Holds call.\n"
+"@param ID: ID of call\n"
+"@type ID: integer\n"
+"@return: None\n"
+"@rtype: None\n"
;
static PyObject *
StateMachine_HoldCall(StateMachineObject *self, PyObject *args, PyObject *kwds) {
GSM_Error error;
+ static char *kwlist[] = {"ID", NULL};
+ int id;
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwds, "i", kwlist,
+ &id))
+ return NULL;
BEGIN_PHONE_COMM
- error = GSM_HoldCall(self->s);
+ error = GSM_HoldCall(self->s, id);
END_PHONE_COMM
if (!checkError(self->s, error, "HoldCall")) return NULL;
@@ -3039,15 +3136,27 @@
/**************/
static char StateMachine_UnholdCall__doc__[] =
-"Unholds call."
+"UnholdCall(ID)\n\n"
+"Unholds call.\n"
+"@param ID: ID of call\n"
+"@type ID: integer\n"
+"@return: None\n"
+"@rtype: None\n"
;
static PyObject *
StateMachine_UnholdCall(StateMachineObject *self, PyObject *args, PyObject *kwds) {
GSM_Error error;
+ static char *kwlist[] = {"ID", NULL};
+ int id;
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwds, "i", kwlist,
+ &id))
+ return NULL;
+
BEGIN_PHONE_COMM
- error = GSM_UnholdCall(self->s);
+ error = GSM_UnholdCall(self->s, id);
END_PHONE_COMM
if (!checkError(self->s, error, "UnholdCall")) return NULL;
@@ -3060,15 +3169,27 @@
/******************/
static char StateMachine_ConferenceCall__doc__[] =
-"Initiates conference call."
+"ConferenceCall(ID)\n\n"
+"Initiates conference call.\n"
+"@param ID: ID of call\n"
+"@type ID: integer\n"
+"@return: None\n"
+"@rtype: None\n"
;
static PyObject *
StateMachine_ConferenceCall(StateMachineObject *self, PyObject *args, PyObject *kwds) {
GSM_Error error;
+ static char *kwlist[] = {"ID", NULL};
+ int id;
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwds, "i", kwlist,
+ &id))
+ return NULL;
+
BEGIN_PHONE_COMM
- error = GSM_ConferenceCall(self->s);
+ error = GSM_ConferenceCall(self->s, id);
END_PHONE_COMM
if (!checkError(self->s, error, "ConferenceCall")) return NULL;
@@ -3081,15 +3202,27 @@
/*************/
static char StateMachine_SplitCall__doc__[] =
-"Splits call."
+"SplitCall(ID)\n\n"
+"Splits call.\n"
+"@param ID: ID of call\n"
+"@type ID: integer\n"
+"@return: None\n"
+"@rtype: None\n"
;
static PyObject *
StateMachine_SplitCall(StateMachineObject *self, PyObject *args, PyObject *kwds) {
GSM_Error error;
+ static char *kwlist[] = {"ID", NULL};
+ int id;
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwds, "i", kwlist,
+ &id))
+ return NULL;
+
BEGIN_PHONE_COMM
- error = GSM_SplitCall(self->s);
+ error = GSM_SplitCall(self->s, id);
END_PHONE_COMM
if (!checkError(self->s, error, "SplitCall")) return NULL;
@@ -3102,15 +3235,37 @@
/****************/
static char StateMachine_TransferCall__doc__[] =
-"Transfers call."
+"TransferCall(ID, Next)\n\n"
+"Transfers call.\n"
+"@param ID: ID of call\n"
+"@type ID: integer\n"
+"@return: None\n"
+"@rtype: None\n"
;
static PyObject *
StateMachine_TransferCall(StateMachineObject *self, PyObject *args, PyObject *kwds) {
GSM_Error error;
+ static char *kwlist[] = {"ID", "Next", NULL};
+ int id;
+ bool next;
+ PyObject *o = Py_None;
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwds, "iO", kwlist,
+ &id, &o))
+ return NULL;
+
+ if (o == Py_False) {
+ next = false;
+ } else if (o == Py_True) {
+ next = true;
+ } else {
+ PyErr_SetString(PyExc_TypeError, "use bool as Next!");
+ return NULL;
+ }
BEGIN_PHONE_COMM
- error = GSM_TransferCall(self->s);
+ error = GSM_TransferCall(self->s, id, next);
END_PHONE_COMM
if (!checkError(self->s, error, "TransferCall")) return NULL;
@@ -3123,15 +3278,37 @@
/**************/
static char StateMachine_SwitchCall__doc__[] =
-"Switches call."
+"SwitchCall(ID, Next)\n\n"
+"Switches call.\n"
+"@param ID: ID of call\n"
+"@type ID: integer\n"
+"@return: None\n"
+"@rtype: None\n"
;
static PyObject *
StateMachine_SwitchCall(StateMachineObject *self, PyObject *args, PyObject *kwds) {
GSM_Error error;
+ static char *kwlist[] = {"ID", "Next", NULL};
+ int id;
+ bool next;
+ PyObject *o = Py_None;
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwds, "iO", kwlist,
+ &id, &o))
+ return NULL;
+
+ if (o == Py_False) {
+ next = false;
+ } else if (o == Py_True) {
+ next = true;
+ } else {
+ PyErr_SetString(PyExc_TypeError, "use bool as Next!");
+ return NULL;
+ }
BEGIN_PHONE_COMM
- error = GSM_SwitchCall(self->s);
+ error = GSM_SwitchCall(self->s, id, next);
END_PHONE_COMM
if (!checkError(self->s, error, "SwitchCall")) return NULL;
@@ -3139,6 +3316,7 @@
Py_RETURN_NONE;
}
+#if 0
/*****************/
/* GetCallDivert */
/*****************/
@@ -4944,6 +5122,7 @@
{"GetConfig", (PyCFunction)StateMachine_GetConfig, METH_VARARGS|METH_KEYWORDS, StateMachine_GetConfig__doc__},
{"Init", (PyCFunction)StateMachine_Init, METH_VARARGS|METH_KEYWORDS, StateMachine_Init__doc__},
{"Terminate", (PyCFunction)StateMachine_Terminate, METH_VARARGS|METH_KEYWORDS, StateMachine_Terminate__doc__},
+ {"ReadDevice", (PyCFunction)StateMachine_ReadDevice, METH_VARARGS|METH_KEYWORDS, StateMachine_ReadDevice__doc__},
{"GetManufacturer", (PyCFunction)StateMachine_GetManufacturer, METH_VARARGS|METH_KEYWORDS, StateMachine_GetManufacturer__doc__},
{"GetModel", (PyCFunction)StateMachine_GetModel, METH_VARARGS|METH_KEYWORDS, StateMachine_GetModel__doc__},
{"GetFirmware", (PyCFunction)StateMachine_GetFirmware, METH_VARARGS|METH_KEYWORDS, StateMachine_GetFirmware__doc__},
@@ -5001,7 +5180,6 @@
{"DeleteSMSFolder", (PyCFunction)StateMachine_DeleteSMSFolder, METH_VARARGS|METH_KEYWORDS, StateMachine_DeleteSMSFolder__doc__},
{"DialVoice", (PyCFunction)StateMachine_DialVoice, METH_VARARGS|METH_KEYWORDS, StateMachine_DialVoice__doc__},
{"DialService", (PyCFunction)StateMachine_DialService, METH_VARARGS|METH_KEYWORDS, StateMachine_DialService__doc__},
-#if 0
{"AnswerCall", (PyCFunction)StateMachine_AnswerCall, METH_VARARGS|METH_KEYWORDS, StateMachine_AnswerCall__doc__},
{"CancelCall", (PyCFunction)StateMachine_CancelCall, METH_VARARGS|METH_KEYWORDS, StateMachine_CancelCall__doc__},
{"HoldCall", (PyCFunction)StateMachine_HoldCall, METH_VARARGS|METH_KEYWORDS, StateMachine_HoldCall__doc__},
@@ -5010,6 +5188,7 @@
{"SplitCall", (PyCFunction)StateMachine_SplitCall, METH_VARARGS|METH_KEYWORDS, StateMachine_SplitCall__doc__},
{"TransferCall", (PyCFunction)StateMachine_TransferCall, METH_VARARGS|METH_KEYWORDS, StateMachine_TransferCall__doc__},
{"SwitchCall", (PyCFunction)StateMachine_SwitchCall, METH_VARARGS|METH_KEYWORDS, StateMachine_SwitchCall__doc__},
+#if 0
{"GetCallDivert", (PyCFunction)StateMachine_GetCallDivert, METH_VARARGS|METH_KEYWORDS, StateMachine_GetCallDivert__doc__},
{"SetCallDivert", (PyCFunction)StateMachine_SetCallDivert, METH_VARARGS|METH_KEYWORDS, StateMachine_SetCallDivert__doc__},
{"CancelAllDiverts", (PyCFunction)StateMachine_CancelAllDiverts, METH_VARARGS|METH_KEYWORDS, StateMachine_CancelAllDiverts__doc__},
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.21/mingw-cross/Core.def new/python-gammu-0.22/mingw-cross/Core.def
--- old/python-gammu-0.21/mingw-cross/Core.def 1970-01-01 01:00:00.000000000 +0100
+++ new/python-gammu-0.22/mingw-cross/Core.def 2007-05-13 20:37:48.000000000 +0200
@@ -0,0 +1,3 @@
+LIBRARY Core.pyd
+EXPORTS
+ initCore
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.21/mingw-cross/Makefile new/python-gammu-0.22/mingw-cross/Makefile
--- old/python-gammu-0.21/mingw-cross/Makefile 2007-05-21 12:26:31.000000000 +0200
+++ new/python-gammu-0.22/mingw-cross/Makefile 2007-06-16 21:12:11.000000000 +0200
@@ -14,9 +14,9 @@
DLLWRAP=i586-mingw32msvc-dllwrap
DLLTOOL=i586-mingw32msvc-dlltool
-INCLUDES=-I$(PYDIR)/include -I./ -I../ -I$(GAMMUDIR)/include -I$(GAMMUDIR)/../include
+INCLUDES=-I$(PYDIR)/include -I./ -I../ -I$(GAMMUDIR)/include
MINGWLD=-L$(MINGWDIR) -L$(MINGWDIR)/../../../../i586-mingw32msvc/lib
-LDFLAGS=$(MINGWLD) -L$(PYDIR)/libs -L$(GAMMUDIR) -L$(GETTEXTDIR)/lib -lGammu -lws2_32 -lsetupapi -ladvapi32 -lintl -lmsvcrt -lkernel32 -lshell32 -lmoldname -lmingwex -lmingw32 -lgcc -lmoldname -lmingwex -lmsvcrt -luser32 -lkernel32 -ladvapi32 -lshell32 -lmingw32 -lmoldname -lmingwex
+LDFLAGS=$(MINGWLD) -L$(PYDIR)/libs -L$(GAMMUDIR)/common -L$(GETTEXTDIR)/lib -lGammu -lws2_32 -lsetupapi -ladvapi32 -lintl -lmsvcrt -lkernel32 -lshell32 -lmoldname -lmingwex -lmingw32 -lgcc -lmoldname -lmingwex -lmsvcrt -luser32 -lkernel32 -ladvapi32 -lshell32 -lmingw32 -lmoldname -lmingwex
LIBS=-lpython$(PYVER)
CFLAGS=-fno-strict-aliasing -DNDEBUG -g -O3 -Wall -Wstrict-prototypes $(INCLUDES)
LIB2DEF=./lib2def.py
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.21/misc.h new/python-gammu-0.22/misc.h
--- old/python-gammu-0.21/misc.h 2007-01-01 16:07:32.000000000 +0100
+++ new/python-gammu-0.22/misc.h 2007-07-16 15:49:02.000000000 +0200
@@ -18,6 +18,12 @@
* vim: expandtab sw=4 ts=4 sts=4:
*/
+#ifndef __pyg_misc_h__
+#define __pyg_misc_h__
+
+/* Python includes */
+#include
+
/**
* Copies at most n chars from src to dest, dest will be \0 terminated.
*/
@@ -25,3 +31,11 @@
#define pyg_error(...) printf("python-gammu: ERROR: " __VA_ARGS__)
#define pyg_warning(...) printf("python-gammu: WARNING: " __VA_ARGS__)
+
+
+/* Compatiblity with older python releases */
+#if PY_VERSION_HEX < 0x02050000
+typedef int Py_ssize_t;
+#endif
+
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.21/NEWS new/python-gammu-0.22/NEWS
--- old/python-gammu-0.21/NEWS 2007-06-15 21:16:24.000000000 +0200
+++ new/python-gammu-0.22/NEWS 2007-08-25 14:59:24.000000000 +0200
@@ -4,6 +4,12 @@
Major changes for each release are described here. Detailed changes between
two versions can be retrieved from Subversion.
+0.22
+==== (2007-08-25)
+
+* Complete support for managing calls.
+* Compatibility with current gammu.
+
0.21
==== (2007-06-15)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.21/PKG-INFO new/python-gammu-0.22/PKG-INFO
--- old/python-gammu-0.21/PKG-INFO 2007-06-15 21:27:50.000000000 +0200
+++ new/python-gammu-0.22/PKG-INFO 2007-08-25 15:41:02.000000000 +0200
@@ -1,13 +1,18 @@
Metadata-Version: 1.0
Name: python-gammu
-Version: 0.21
+Version: 0.22
Summary: Gammu bindings
Home-page: http://cihar.com/gammu/python
Author: Michal Čihař
Author-email: michal@cihar.com
License: GPL
+Download-URL: http://cihar.com/gammu/python
Description: Bindings to libGammu, which allows access many phones.
-Platform: UNKNOWN
+Keywords: mobile,phone,SMS,contact,gammu,calendar,todo
+Platform: Linux
+Platform: Mac OSX
+Platform: Windows XP/2000/NT
+Platform: Windows 95/98/ME
Classifier: Development Status :: 5 - Production/Stable
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Operating System :: Microsoft :: Windows :: Windows 95/98/2000
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.21/python-gammu.spec new/python-gammu-0.22/python-gammu.spec
--- old/python-gammu-0.21/python-gammu.spec 2007-05-29 14:35:55.000000000 +0200
+++ new/python-gammu-0.22/python-gammu.spec 2007-07-18 18:04:26.000000000 +0200
@@ -15,7 +15,7 @@
%endif
Packager: Michal Cihar
Vendor: Michal Cihar
-BuildRequires: gammu-devel >= 1.11.91
+BuildRequires: gammu-devel >= 1.12.91
Url: http://cihar.com/gammu/wammu
Buildroot: %{_tmppath}/%name-%version-root
%if %{_vendor} != redhat
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.21/setup.py new/python-gammu-0.22/setup.py
--- old/python-gammu-0.21/setup.py 2007-05-29 14:35:55.000000000 +0200
+++ new/python-gammu-0.22/setup.py 2007-08-01 14:18:25.000000000 +0200
@@ -44,7 +44,7 @@
# some defines
MAJOR_VERSION = 0
-MINOR_VERSION = 21
+MINOR_VERSION = 22
EXTRA_VERSION = None
if EXTRA_VERSION == None:
@@ -52,7 +52,7 @@
else:
VERSION = '%d.%d.%d' % (MAJOR_VERSION, MINOR_VERSION, EXTRA_VERSION)
-GAMMU_REQUIRED = (1,11,91)
+GAMMU_REQUIRED = (1,12,91)
PYTHON_REQUIRED = (2,3)
ADDITIONAL_PARAMS = [
@@ -345,7 +345,7 @@
header.write('#endif\n')
header.write('#endif\n')
-if sys.argv[1] == '--dump-config':
+if len(sys.argv) > 1 and sys.argv[1] == '--dump-config':
dumpconfig(sys.stdout)
sys.exit(0)
@@ -379,8 +379,11 @@
author_email = 'gammu@cihar.com',
maintainer = "Michal Čihař",
maintainer_email = "michal@cihar.com",
+ platforms = ['Linux','Mac OSX','Windows XP/2000/NT','Windows 95/98/ME'],
+ keywords = ['mobile', 'phone', 'SMS', 'contact', 'gammu', 'calendar', 'todo'],
license = 'GPL',
url = 'http://cihar.com/gammu/python',
+ download_url = 'http://cihar.com/gammu/python',
classifiers = [
'Development Status :: 5 - Production/Stable',
'License :: OSI Approved :: GNU General Public License (GPL)',
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org