rev 7012 - in kde-extras/kmobiletools/trunk/debian: . patches
Fathi Boudra
fboudra-guest at alioth.debian.org
Wed Aug 8 20:20:35 UTC 2007
Author: fboudra-guest
Date: 2007-08-08 20:20:35 +0000 (Wed, 08 Aug 2007)
New Revision: 7012
Added:
kde-extras/kmobiletools/trunk/debian/patches/12_use_gammu_112.diff
Modified:
kde-extras/kmobiletools/trunk/debian/changelog
kde-extras/kmobiletools/trunk/debian/copyright
kde-extras/kmobiletools/trunk/debian/patches/series
kde-extras/kmobiletools/trunk/debian/rules
Log:
* Update copyright.
* Port to gammu 1.12.x
Modified: kde-extras/kmobiletools/trunk/debian/changelog
===================================================================
--- kde-extras/kmobiletools/trunk/debian/changelog 2007-08-08 19:50:15 UTC (rev 7011)
+++ kde-extras/kmobiletools/trunk/debian/changelog 2007-08-08 20:20:35 UTC (rev 7012)
@@ -1,6 +1,8 @@
kmobiletools (0.5.0~beta3-1) unstable; urgency=low
* New upstream release.
+ * Update copyright file.
+ * Add patch for gammu 1.12.x port.
-- Fathi Boudra <fboudra at free.fr> Fri, 03 Aug 2007 20:27:18 +0200
Modified: kde-extras/kmobiletools/trunk/debian/copyright
===================================================================
--- kde-extras/kmobiletools/trunk/debian/copyright 2007-08-08 19:50:15 UTC (rev 7011)
+++ kde-extras/kmobiletools/trunk/debian/copyright 2007-08-08 20:20:35 UTC (rev 7012)
@@ -3,18 +3,110 @@
It was downloaded from http://www.kmobiletools.org
-Upstream Author(s):
+Upstream Authors:
Marco Gulino <marco at kmobiletools.org>
Stefan Bogner <bochi at kmobiletools.org>
+ Matthias Lechner <matthias at lmme.de>
Copyright:
(C) 2004-2007 Marco Gulino <marco at kmobiletools.org>
(C) 2005-2007 Stefan Bogner <bochi at kmobiletools.org>
+ (C) 2007 Matthias Lechner <matthias at lmme.de>
-License:
+Copyright for SMSFolderListViewItem::paintCell and SMSListViewItem::paintCell
+methods partially derived from akregator - articlelistview.cpp:
+ (C) 2007 Frank Osterfeld <frank.osterfeld at kdemail.net>
+
+Copyright for StatusBarScrollView::resizeContents method from KDEPIM
+libkdepim/progressdialog.cpp:
+
+ (C) 2004 Till Adam <adam at kde.org>
+ (C) 2004 David Faure <faure at kde.org>
+
+Copyright for at engine:
+
+ (C) 2007 Alexander Rensmann <zerraxys at gmx.net>
+
+Copyright for gammu engine:
+
+ (C) 2005-2006 Stefan Bogner <bochi at kmobiletools.org>
+ (C) 2007 Matthias Lechner <matthias at lmme.de>
+
+Copyright for kmobiletools kontact plugin:
+
+ (C) 2004 Tobias Koenig <tokoe at kde.org>
+
+Copyright for crash handler:
+
+ (C) 2007 Sérgio Gomes <sergiomdgomes at gmail.com>
+ Original work by Max Howell <max.howell at methylblue.com> in Amarok
+
+Copyright for libkmobiletools/deviceaddress.cpp and
+libkmobiletools/rfcommsocketdevice.cpp:
+
+ (C) 2003 by Fred Schaettgen <kdebluetooth at schaettgen.de>
+
+Copyright for overlay widget:
+
+ (C) 2004 David Faure <faure at kde.org>
+
+Copyright for some methods in libkmobiletools/qserial.cpp derived from cutecom:
+
+ (C) 2007-2005 Alexander Neundorf <neundorf at kde.org>
+
+Copyright for the Weaver, Job and Thread classes:
+
+ (C) 2004 Mirko Boehm <mirko at kde.org>
+
+Copyright for the KDE Blutooth BlueMonitor:
+
+ (C) 2007 Tom Patzig <tpatzig at suse.de>
+
+Copyright for kmtsetup widget:
+
+ (C) 2006 by Davide Bettio <davide.bettio at kdemail.net>
+
+Copyright for mobile kioslaves:
+
+ (C) 2004 Kevin Ottens <ervin ipsquad net>
+
+Weaver, Job and Thread license:
+
+ LGPL with the following explicit clarification:
+ This code may be linked against any version of the Qt toolkit
+ from Troll Tech, Norway.
+
+overlay widget license:
+
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of this program with any edition of
+ * the Qt library by Trolltech AS, Norway (or with modified versions
+ * of Qt that use the same license as Qt), and distribute linked
+ * combinations including the two. You must obey the GNU General
+ * Public License in all respects for all of the code used other than
+ * Qt. If you modify this file, you may extend this exception to
+ * your version of the file, but you are not obligated to do so. If
+ * you do not wish to do so, delete this exception statement from
+ * your version.
+
+kmobiletools license:
+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
Added: kde-extras/kmobiletools/trunk/debian/patches/12_use_gammu_112.diff
===================================================================
--- kde-extras/kmobiletools/trunk/debian/patches/12_use_gammu_112.diff (rev 0)
+++ kde-extras/kmobiletools/trunk/debian/patches/12_use_gammu_112.diff 2007-08-08 20:20:35 UTC (rev 7012)
@@ -0,0 +1,387 @@
+--- kmobiletools-0.5.0~beta3.orig/kmobiletools/kmobiletools/engines/gammu_engine/device.cpp
++++ kmobiletools-0.5.0~beta3/kmobiletools/kmobiletools/engines/gammu_engine/device.cpp
+@@ -107,14 +107,16 @@
+
+ kdDebug() << "Gammu engine: initialising phone" << endl;
+
+- // initialise gammu's state machine
+- m_stateMachine.opened = false;
++ // allocate gammu's state machine
++ m_stateMachine = GSM_AllocStateMachine();
++
++ GSM_InitLocales(NULL);
+
+ // read-in gammu configuration
+ parseConfiguration();
+
+ // connect to the phone
+- m_error = GSM_InitConnection( &m_stateMachine, 3 );
++ m_error = GSM_InitConnection( m_stateMachine, 3 );
+ if( m_error != ERR_NONE ) {
+ printErrorMessage( m_error, "initPhone" );
+ return;
+@@ -123,17 +125,17 @@
+ kdDebug() << "Gammu engine: phone connected!" << endl;
+ m_isConnected = true;
+
+- // this provides easy access to phone functions
+- m_phoneFunctions = m_stateMachine.Phone.Functions;
+-
+ emit connected();
+ }
+
+ void Device::terminatePhone() {
+ if( m_isConnected ) {
+- m_error = GSM_TerminateConnection( &m_stateMachine );
++ m_error = GSM_TerminateConnection( m_stateMachine );
+ printErrorMessage( m_error, "terminatePhone" );
+
++ // free gammu's state machine
++ GSM_FreeStateMachine( m_stateMachine );
++
+ emit disconnected();
+ }
+ }
+@@ -155,14 +157,16 @@
+ if( !m_model.isEmpty() )
+ return m_model;
+
++ char model[100];
++
+ m_mutex.lock();
+- m_error = m_phoneFunctions->GetModel( &m_stateMachine );
++ m_error = GSM_GetModel( m_stateMachine, model );
+ if( m_error != ERR_NONE ) {
+ printErrorMessage( m_error, "model" );
+ m_mutex.unlock();
+ return QString();
+ }
+- m_model = m_stateMachine.Phone.Data.ModelInfo->model;
++ m_model = model;
+ m_mutex.unlock();
+
+ return m_model;
+@@ -176,14 +180,16 @@
+ if( !m_manufacturer.isEmpty() )
+ return m_manufacturer;
+
++ char manufacturer[100];
++
+ m_mutex.lock();
+- m_error = m_phoneFunctions->GetManufacturer( &m_stateMachine );
++ m_error = GSM_GetManufacturer( m_stateMachine, manufacturer );
+ if( m_error != ERR_NONE ) {
+ printErrorMessage( m_error, "manufacturer" );
+ m_mutex.unlock();
+ return QString();
+ }
+- m_manufacturer = m_stateMachine.Phone.Data.Manufacturer;
++ m_manufacturer = manufacturer;
+ m_mutex.unlock();
+
+ return m_manufacturer;
+@@ -197,14 +203,16 @@
+ if( !m_version.isEmpty() )
+ return m_version;
+
++ char version[100];
++
+ m_mutex.lock();
+- m_error = m_phoneFunctions->GetFirmware( &m_stateMachine );
++ m_error = GSM_GetFirmware( m_stateMachine, version, NULL, NULL );
+ if( m_error != ERR_NONE ) {
+ printErrorMessage( m_error, "version" );
+ m_mutex.unlock();
+ return QString();
+ }
+- m_version = m_stateMachine.Phone.Data.Version;
++ m_version = version;
+ m_mutex.unlock();
+
+ return m_version;
+@@ -218,14 +226,16 @@
+ if( !m_imei.isEmpty() )
+ return m_imei;
+
++ char imei[100];
++
+ m_mutex.lock();
+- m_error = m_phoneFunctions->GetIMEI( &m_stateMachine );
++ m_error = GSM_GetIMEI( m_stateMachine, imei );
+ if( m_error != ERR_NONE ) {
+ printErrorMessage( m_error, "imei" );
+ m_mutex.unlock();
+ return QString();
+ }
+- m_imei = m_stateMachine.Phone.Data.IMEI;
++ m_imei = imei;
+ m_mutex.unlock();
+
+ return m_imei;
+@@ -240,7 +250,7 @@
+
+ m_mutex.lock();
+ smsc.Location = 1;
+- m_error = m_phoneFunctions->GetSMSC( &m_stateMachine, &smsc );
++ m_error = GSM_GetSMSC( m_stateMachine, &smsc );
+ if( m_error != ERR_NONE ) {
+ printErrorMessage( m_error, "smsc" );
+ m_mutex.unlock();
+@@ -262,7 +272,7 @@
+ int batteryStatus = 0;
+
+ m_mutex.lock();
+- m_error = m_phoneFunctions->GetBatteryCharge( &m_stateMachine, &batteryCharge );
++ m_error = GSM_GetBatteryCharge( m_stateMachine, &batteryCharge );
+ if( m_error != ERR_NONE ) {
+ printErrorMessage( m_error, "battery" );
+ m_mutex.unlock();
+@@ -282,7 +292,7 @@
+ QString networkName;
+
+ m_mutex.lock();
+- m_error = m_phoneFunctions->GetNetworkInfo( &m_stateMachine, &networkInfo );
++ m_error = GSM_GetNetworkInfo( m_stateMachine, &networkInfo );
+ if( m_error != ERR_NONE ) {
+ printErrorMessage( m_error, "networkName" );
+ m_mutex.unlock();
+@@ -303,7 +313,7 @@
+ int signal = 0;
+
+ m_mutex.lock();
+- m_error = m_phoneFunctions->GetSignalQuality( &m_stateMachine, &signalQuality );
++ m_error = GSM_GetSignalQuality( m_stateMachine, &signalQuality );
+ if( m_error != ERR_NONE ) {
+ printErrorMessage( m_error, "signalQuality" );
+ m_mutex.unlock();
+@@ -323,7 +333,7 @@
+ int unreadSMS = 0;
+
+ m_mutex.lock();
+- m_error = m_phoneFunctions->GetSMSStatus( &m_stateMachine, &smsMemoryStatus );
++ m_error = GSM_GetSMSStatus( m_stateMachine, &smsMemoryStatus );
+ if( m_error != ERR_NONE ) {
+ printErrorMessage( m_error, "unreadSMS" );
+ m_mutex.unlock();
+@@ -348,7 +358,7 @@
+ int totalSMS = 0;
+
+ m_mutex.lock();
+- m_error = m_phoneFunctions->GetSMSStatus( &m_stateMachine, &smsMemoryStatus );
++ m_error = GSM_GetSMSStatus( m_stateMachine, &smsMemoryStatus );
+ if( m_error != ERR_NONE ) {
+ printErrorMessage( m_error, "totalSMS" );
+ m_mutex.unlock();
+@@ -382,7 +392,7 @@
+ bool ringing = false;
+
+ m_mutex.lock();
+- m_error = m_phoneFunctions->GetDisplayStatus( &m_stateMachine, &displayFeatures );
++ m_error = GSM_GetDisplayStatus( m_stateMachine, &displayFeatures );
+ if( m_error == ERR_NONE ) {
+ // loop through the phone's features and look for active call
+ for ( int i=0; i<displayFeatures.Number; i++ ) {
+@@ -412,13 +422,13 @@
+
+ // test slot ME
+ memoryEntry.MemoryType = MEM_ME;
+- m_error = m_phoneFunctions->GetNextMemory( &m_stateMachine, &memoryEntry, true );
++ m_error = GSM_GetNextMemory( m_stateMachine, &memoryEntry, true );
+ if( m_error == ERR_NONE )
+ m_phonebookSlots << "ME";
+
+ // test slot SM
+ memoryEntry.MemoryType = MEM_SM;
+- m_error = m_phoneFunctions->GetNextMemory( &m_stateMachine, &memoryEntry, true );
++ m_error = GSM_GetNextMemory( m_stateMachine, &memoryEntry, true );
+ if( m_error == ERR_NONE )
+ m_phonebookSlots << "SM";
+
+@@ -445,7 +455,7 @@
+
+ bool start = true;
+ while( m_error == ERR_NONE ) {
+- m_error = m_phoneFunctions->GetNextMemory( &m_stateMachine, &memoryEntry, start );
++ m_error = GSM_GetNextMemory( m_stateMachine, &memoryEntry, start );
+ if( m_error == ERR_NONE ) {
+ phonebook.push_back( toKAbc( memoryEntry ) );
+ KABC::Addressee& currentAddressee = phonebook.last();
+@@ -467,7 +477,7 @@
+ m_error = ERR_NONE;
+ start = true;
+ while( m_error == ERR_NONE ) {
+- m_error = m_phoneFunctions->GetNextMemory( &m_stateMachine, &memoryEntry, start );
++ m_error = GSM_GetNextMemory( m_stateMachine, &memoryEntry, start );
+ if( m_error == ERR_NONE ) {
+ phonebook.push_back( toKAbc( memoryEntry ) );
+ KABC::Addressee& currentAddressee = phonebook.last();
+@@ -502,7 +512,7 @@
+ /// @todo add fail-safe implementation if addMemory is not implemented in gammu's phone protocol
+ memoryEntry.MemoryType = (GSM_MemoryType) (*it).custom( "KMobileTools", "memslot" ).toInt();
+
+- m_error = m_phoneFunctions->AddMemory( &m_stateMachine, &memoryEntry );
++ m_error = GSM_AddMemory( m_stateMachine, &memoryEntry );
+
+ m_mutex.unlock();
+
+@@ -529,7 +539,7 @@
+ newMemoryEntry.Location = oldAddressee->custom( "KMobileTools", "index" ).toInt();
+ newMemoryEntry.MemoryType = (GSM_MemoryType) oldAddressee->custom( "KMobileTools", "memslot" ).toInt();
+
+- m_error = m_phoneFunctions->SetMemory( &m_stateMachine, &newMemoryEntry );
++ m_error = GSM_SetMemory( m_stateMachine, &newMemoryEntry );
+
+ if( m_error != ERR_NONE )
+ printErrorMessage( m_error, "editAddressee" );
+@@ -552,7 +562,7 @@
+ memoryEntry.Location = (*it).custom( "KMobileTools", "index" ).toInt();
+ memoryEntry.MemoryType = (GSM_MemoryType) (*it).custom( "KMobileTools", "memslot" ).toInt();
+
+- m_error = m_phoneFunctions->DeleteMemory( &m_stateMachine, &memoryEntry );
++ m_error = GSM_DeleteMemory( m_stateMachine, &memoryEntry );
+
+ m_mutex.unlock();
+
+@@ -572,7 +582,7 @@
+ GSM_CallShowNumber showNumber = GSM_CALL_DefaultNumberPresence;
+
+ m_mutex.lock();
+- m_error = m_phoneFunctions->DialVoice( &m_stateMachine, (number.utf8().data() ),
++ m_error = GSM_DialVoice( m_stateMachine, (number.utf8().data() ),
+ showNumber );
+ if( m_error != ERR_NONE ) {
+ printErrorMessage( m_error, "dial" );
+@@ -589,7 +599,7 @@
+ return false;
+
+ m_mutex.lock();
+- m_error = m_phoneFunctions->CancelCall( &m_stateMachine, 0, true );
++ m_error = GSM_CancelCall( m_stateMachine, 0, true );
+ if( m_error != ERR_NONE ) {
+ printErrorMessage( m_error, "hangup" );
+ m_mutex.unlock();
+@@ -980,7 +990,7 @@
+ GSM_MultiSMSMessage sms;
+
+ m_mutex.lock();
+- m_error = m_phoneFunctions->GetSMSFolders( &m_stateMachine, &folders );
++ m_error = GSM_GetSMSFolders( m_stateMachine, &folders );
+ if( m_error != ERR_NONE ) {
+ printErrorMessage( m_error, "smsList" );
+ m_mutex.unlock();
+@@ -990,7 +1000,7 @@
+ bool start = true;
+ while ( m_error == ERR_NONE ) {
+ sms.SMS[0].Folder=0x00;
+- m_error= m_phoneFunctions->GetNextSMS( &m_stateMachine, &sms, start );
++ m_error= GSM_GetNextSMS( m_stateMachine, &sms, start );
+ switch ( m_error ) {
+ case ERR_EMPTY:
+ break;
+@@ -1087,7 +1097,7 @@
+ _sms.Folder = sms->folder();
+ _sms.Location = sms->location();
+
+- m_error = m_phoneFunctions->DeleteSMS( &m_stateMachine, &_sms );
++ m_error = GSM_DeleteSMS( m_stateMachine, &_sms );
+ if( m_error != ERR_NONE ) {
+ printErrorMessage( m_error, "deleteSMS" );
+ m_mutex.unlock();
+@@ -1109,7 +1119,7 @@
+
+ m_mutex.lock();
+ for( int i=0; i<_sms.Number; i++ ) {
+- m_error = m_phoneFunctions->AddSMS( &m_stateMachine, &_sms.SMS[i]);
++ m_error = GSM_AddSMS( m_stateMachine, &_sms.SMS[i]);
+ printErrorMessage( m_error, "AddSMS" );
+ }
+ m_mutex.unlock();
+@@ -1123,7 +1133,7 @@
+
+ m_mutex.lock();
+
+- m_error = m_phoneFunctions->SendSavedSMS( &m_stateMachine, sms->folder(), sms->location() );
++ m_error = GSM_SendSavedSMS( m_stateMachine, sms->folder(), sms->location() );
+ if( m_error != ERR_NONE ) {
+ printErrorMessage( m_error, "SendSavedSMS" );
+ m_mutex.unlock();
+@@ -1145,7 +1155,7 @@
+
+ m_mutex.lock();
+ for( int i=0; i<_sms.Number; i++ ) {
+- m_error = m_phoneFunctions->SendSMS( &m_stateMachine, &_sms.SMS[i]);
++ m_error = GSM_SendSMS( m_stateMachine, &_sms.SMS[i]);
+ printErrorMessage( m_error, "SendSMS" );
+ }
+ m_mutex.unlock();
+@@ -1162,7 +1172,7 @@
+
+ m_mutex.lock();
+
+- m_error = m_phoneFunctions->GetSMSFolders( &m_stateMachine, &folders );
++ m_error = GSM_GetSMSFolders( m_stateMachine, &folders );
+ if( m_error != ERR_NONE ) {
+ printErrorMessage( m_error, "GetSMSFolders" );
+ m_mutex.unlock();
+@@ -1208,7 +1218,7 @@
+ GSM_SMSC smsc;
+ smsc.Location = 0x01;
+
+- m_error = m_phoneFunctions->GetSMSC( &m_stateMachine, &smsc );
++ m_error = GSM_GetSMSC( m_stateMachine, &smsc );
+ if( m_error != ERR_NONE ) {
+ printErrorMessage( m_error, "GetSMSC" );
+ m_mutex.unlock();
+@@ -1238,32 +1248,21 @@
+ }
+
+ void Device::parseConfiguration() {
+- GSM_Config *config = &m_stateMachine.Config[0];
+- m_stateMachine.ConfigNum = 1;
++ GSM_Config *config = GSM_GetConfig( m_stateMachine, 0 );
++ GSM_SetConfigNum( m_stateMachine, 1 );
+
+ // logging enabled?
+ if( DeviceConfigInstance( m_deviceName )->gammu_logging() ) {
++ GSM_Debug_Info *di;
++ di = GSM_GetGlobalDebug();
++
+ config->UseGlobalDebugFile = true;
+
+- // di (Debug_Info) is a global from gammu
+ QString debugLevel = DeviceConfigInstance( m_deviceName )->gammu_loglevel().lower();
+- if( debugLevel == "nothing" )
+- di.dl = DL_NONE;
+- else if( debugLevel == "text" )
+- di.dl = DL_TEXT;
+- else if( debugLevel == "textall" )
+- di.dl = DL_TEXTALL;
+- else if( debugLevel == "errors" )
+- di.dl = DL_TEXTERROR;
+- else if( debugLevel == "binary" )
+- di.dl = DL_BINARY;
+- else
+- di.dl = DL_NONE;
+-
+- di.was_lf = true;
++ GSM_SetDebugLevel( debugLevel.latin1(), di );
+
+ config->DebugFile = strdup( DeviceConfigInstance( m_deviceName )->gammu_logfile().utf8() );
+- m_error = GSM_SetDebugFile( config->DebugFile, &di );
++ m_error = GSM_SetDebugFile( config->DebugFile, di );
+ }
+
+ // setting model, connection and device
+--- kmobiletools-0.5.0~beta3.orig/kmobiletools/kmobiletools/engines/gammu_engine/device.h
++++ kmobiletools-0.5.0~beta3/kmobiletools/kmobiletools/engines/gammu_engine/device.h
+@@ -241,8 +241,8 @@
+ bool m_isConnected;
+ QMutex m_mutex;
+
+- GSM_Phone_Functions *m_phoneFunctions;
+- GSM_StateMachine m_stateMachine;
++ // gammu
++ GSM_StateMachine *m_stateMachine;
+ GSM_Error m_error;
+
+ QMap<int,QString> m_errorCodes;
Modified: kde-extras/kmobiletools/trunk/debian/patches/series
===================================================================
--- kde-extras/kmobiletools/trunk/debian/patches/series 2007-08-08 19:50:15 UTC (rev 7011)
+++ kde-extras/kmobiletools/trunk/debian/patches/series 2007-08-08 20:20:35 UTC (rev 7012)
@@ -6,3 +6,4 @@
06_disable_no_undefined.diff
10_remove_kbluetoothpairingwizard.diff
11_add_gammu_include.diff
+12_use_gammu_112.diff
Modified: kde-extras/kmobiletools/trunk/debian/rules
===================================================================
--- kde-extras/kmobiletools/trunk/debian/rules 2007-08-08 19:50:15 UTC (rev 7011)
+++ kde-extras/kmobiletools/trunk/debian/rules 2007-08-08 20:20:35 UTC (rev 7012)
@@ -6,5 +6,4 @@
include /usr/share/cdbs/1/rules/utils.mk
DEB_INSTALL_MANPAGES_kmobiletools := debian/kmobiletools.1
-DEB_CONFIGURE_EXTRA_FLAGS := --without-gammu
More information about the pkg-kde-commits
mailing list