Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (9bf9a5ba3a6af94abfb7584d02367181062febf3)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (9bf9a5ba3a6af94abfb7584d02367181062febf3)
  • Date: Mon, 9 Apr 2007 08:19:42 -0500

GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

dev/null |binary
kde-apps/kdebluetooth/BUILD | 4
kde-apps/kdebluetooth/DEPENDS | 2
kde-apps/kdebluetooth/DETAILS | 4
kde-apps/kdebluetooth/HISTORY | 5
kde-apps/kdebluetooth/kde3.5.x.patch | 102
-----------------
kde-apps/kdebluetooth/obex-pkgconfig.diff | 96
----------------
kde-apps/kmobiletools/DEPENDS | 4
kde-apps/kmobiletools/DETAILS | 4
kde-apps/kmobiletools/HISTORY | 4
kde-apps/kmobiletools/kmobiletools-0.4.3.3.tar.bz2.sig | 0
11 files changed, 16 insertions(+), 209 deletions(-)

New commits:
commit 9bf9a5ba3a6af94abfb7584d02367181062febf3
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

kmobiletools: 0.5.0-beta2

commit a618e01acab49e818a9cf8a48d5ea5c5f9a28600
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

kdebluetooth: beta2

diff --git a/kde-apps/kdebluetooth/BUILD b/kde-apps/kdebluetooth/BUILD
deleted file mode 100755
index 966ec94..0000000
--- a/kde-apps/kdebluetooth/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-patch -p1 < $SCRIPT_DIRECTORY/obex-pkgconfig.diff &&
-patch -p1 < $SCRIPT_DIRECTORY/kde3.5.x.patch &&
-default_build
-
diff --git a/kde-apps/kdebluetooth/DEPENDS b/kde-apps/kdebluetooth/DEPENDS
old mode 100644
new mode 100755
index fab7209..87151a7
--- a/kde-apps/kdebluetooth/DEPENDS
+++ b/kde-apps/kdebluetooth/DEPENDS
@@ -1,4 +1,4 @@
-depends kdebase &&
+depends kdebase --without-arts &&
depends openobex &&
depends bluez-utils &&

diff --git a/kde-apps/kdebluetooth/DETAILS b/kde-apps/kdebluetooth/DETAILS
index 179e182..2525977 100755
--- a/kde-apps/kdebluetooth/DETAILS
+++ b/kde-apps/kdebluetooth/DETAILS
@@ -1,9 +1,9 @@
SPELL=kdebluetooth
- VERSION=1.0_beta1
+ VERSION=1.0_beta2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/kde-bluetooth/$SOURCE
-
SOURCE_HASH=sha512:f900c2bffeb742255e44c3673423dcf4315b27ff2f01456e0731df62986fa5041405315145fcf368fc6188889aa891a0e3cb2800e47267df6021ade380a90f38
+
SOURCE_HASH=sha512:7c53d1953aeb9e17c4e506bfe9293c94b81c4d2f9b04c9118380a2f9844e89cb98431f950f91c4fc4bdaec407d9875df5e79bb90af159b38368cf9307e3c504c
WEB_SITE=http://kde-bluetooth.sourceforge.net
ENTERED=20050321
LICENSE[0]=GPL
diff --git a/kde-apps/kdebluetooth/HISTORY b/kde-apps/kdebluetooth/HISTORY
index e19a0d9..6563db5 100644
--- a/kde-apps/kdebluetooth/HISTORY
+++ b/kde-apps/kdebluetooth/HISTORY
@@ -1,3 +1,8 @@
+2007-04-09 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * obex-pkgconfig.diff, BUILD, kde3.5.x.patch: removed, fixed upstream
+ * DETAILS: updated spell to 1.0_beta2
+ * DEPENDS: was missing the executive bit
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/kde-apps/kdebluetooth/kde3.5.x.patch
b/kde-apps/kdebluetooth/kde3.5.x.patch
deleted file mode 100644
index f1fe51f..0000000
--- a/kde-apps/kdebluetooth/kde3.5.x.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -rNur
kdebluetooth-1.0_beta1.old/kdebluetooth/kdebluetooth-common/mimetypes/computer-device-class.desktop

kdebluetooth-1.0_beta1/kdebluetooth/kdebluetooth-common/mimetypes/computer-device-class.desktop
----
kdebluetooth-1.0_beta1.old/kdebluetooth/kdebluetooth-common/mimetypes/computer-device-class.desktop
2005-03-21 03:16:48.000000000 +1030
-+++
kdebluetooth-1.0_beta1/kdebluetooth/kdebluetooth-common/mimetypes/computer-device-class.desktop
2006-04-08 22:55:57.000000000 +0930
-@@ -3,6 +3,7 @@
- Type=MimeType
- MimeType=bluetooth/computer-device-class
- Icon=konsole
-+X-KDE-IsAlso=inode/directory
- Comment=Computer/PDA Bluetooth Device
- Comment[bg]=Компютърно/PDA устройство Bluetooth
- Comment[bs]=Računar/PDA Bluetooth uređaj
-diff -rNur
kdebluetooth-1.0_beta1.old/kdebluetooth/kdebluetooth-common/mimetypes/misc-device-class.desktop

kdebluetooth-1.0_beta1/kdebluetooth/kdebluetooth-common/mimetypes/misc-device-class.desktop
----
kdebluetooth-1.0_beta1.old/kdebluetooth/kdebluetooth-common/mimetypes/misc-device-class.desktop
2005-03-21 03:16:48.000000000 +1030
-+++
kdebluetooth-1.0_beta1/kdebluetooth/kdebluetooth-common/mimetypes/misc-device-class.desktop
2006-04-08 22:55:31.000000000 +0930
-@@ -3,6 +3,7 @@
- Type=MimeType
- MimeType=bluetooth/misc-device-class
- Icon=kdebluetooth
-+X-KDE-IsAlso=inode/directory
- Comment=Miscellaneous Bluetooth Device
- Comment[bg]=Разни устройства Bluetooth
- Comment[da]=Diverse Bluetooth-enheder
-diff -rNur
kdebluetooth-1.0_beta1.old/kdebluetooth/kdebluetooth-common/mimetypes/phone-device-class.desktop

kdebluetooth-1.0_beta1/kdebluetooth/kdebluetooth-common/mimetypes/phone-device-class.desktop
----
kdebluetooth-1.0_beta1.old/kdebluetooth/kdebluetooth-common/mimetypes/phone-device-class.desktop
2005-03-21 03:16:48.000000000 +1030
-+++
kdebluetooth-1.0_beta1/kdebluetooth/kdebluetooth-common/mimetypes/phone-device-class.desktop
2006-04-08 22:54:46.000000000 +0930
-@@ -3,6 +3,7 @@
- Type=MimeType
- MimeType=bluetooth/phone-device-class
- Icon=kaddressbook
-+X-KDE-IsAlso=inode/directory
- Comment=Phone Bluetooth Device
- Comment[bg]=Телефонно устройство Bluetooth
- Comment[da]=Telefon Bluetooth-enhed
-diff -rNur
kdebluetooth-1.0_beta1.old/kdebluetooth/kioslave/bluetooth/bluetooth.protocol
kdebluetooth-1.0_beta1/kdebluetooth/kioslave/bluetooth/bluetooth.protocol
----
kdebluetooth-1.0_beta1.old/kdebluetooth/kioslave/bluetooth/bluetooth.protocol
2005-03-21 03:16:48.000000000 +1030
-+++
kdebluetooth-1.0_beta1/kdebluetooth/kioslave/bluetooth/bluetooth.protocol
2006-04-08 22:56:36.000000000 +0930
-@@ -4,6 +4,7 @@
- input=none
- output=filesystem
- reading=true
-+listing=Name,Type,Size,Date,AccessDate,Access,Owner,Group,Link
- Icon=kdebluetooth
- Description=Bluetooth inquiry protocol
- Description[da]=Bluetooth forespørgselsprotokol
-diff -rNur
kdebluetooth-1.0_beta1.old/kdebluetooth/kioslave/bluetooth/kiobluetooth.cpp
kdebluetooth-1.0_beta1/kdebluetooth/kioslave/bluetooth/kiobluetooth.cpp
----
kdebluetooth-1.0_beta1.old/kdebluetooth/kioslave/bluetooth/kiobluetooth.cpp
2005-03-21 03:16:48.000000000 +1030
-+++ kdebluetooth-1.0_beta1/kdebluetooth/kioslave/bluetooth/kiobluetooth.cpp
2006-04-08 22:58:56.000000000 +0930
-@@ -64,6 +64,7 @@
- if (url.hasHost() == false && path == "/")
- {
- createDirEntry(entry, "Bluetooth neighbourhood");
-+ statEntry(entry);
- finished();
- }
- else {
-@@ -284,7 +285,8 @@
-
- addAtom(entry, UDS_MIME_TYPE, mimeType);
- addAtom(entry, UDS_FILE_TYPE, S_IFDIR);
-- addAtom(entry, UDS_GUESSED_MIME_TYPE, "inode/folder");
-+ // No more necessary
-+ // addAtom(entry, UDS_GUESSED_MIME_TYPE, "inode/folder");
-
- return true;
- }
-diff -rNur kdebluetooth-1.0_beta1.old/kdebluetooth/kioslave/sdp/btsdp.cpp
kdebluetooth-1.0_beta1/kdebluetooth/kioslave/sdp/btsdp.cpp
---- kdebluetooth-1.0_beta1.old/kdebluetooth/kioslave/sdp/btsdp.cpp
2005-03-21 03:16:48.000000000 +1030
-+++ kdebluetooth-1.0_beta1/kdebluetooth/kioslave/sdp/btsdp.cpp 2006-04-08
23:06:53.000000000 +0930
-@@ -131,12 +131,21 @@
- if (path == "/")
- {
- createDirEntry(entry, "Bluetooth neighbourhood");
-+ statEntry(entry);
- finished();
- }
- else
- {
-- error(KIO::ERR_SLAVE_DEFINED,
-+ QRegExp reg = QRegExp("^/uuid-(0x[a-f,A-F,0-9:]+)/");
-+ if (reg.search(path) >= 0) {
-+ createDirEntry(entry, "More services");
-+ statEntry(entry);
-+ finished();
-+ }
-+ else {
-+ error(KIO::ERR_SLAVE_DEFINED,
- i18n("Could not stat %1. Unknown device").arg(url.url()));
-+ }
- }
- }
- else {
-diff -rNur
kdebluetooth-1.0_beta1.old/kdebluetooth/kioslave/sdp/btsdp.protocol
kdebluetooth-1.0_beta1/kdebluetooth/kioslave/sdp/btsdp.protocol
---- kdebluetooth-1.0_beta1.old/kdebluetooth/kioslave/sdp/btsdp.protocol
2005-03-21 03:16:48.000000000 +1030
-+++ kdebluetooth-1.0_beta1/kdebluetooth/kioslave/sdp/btsdp.protocol
2006-04-08 22:59:38.000000000 +0930
-@@ -5,6 +5,7 @@
- output=filesystem
- reading=true
- Icon=kdebluetooth
-+listing=Name,Type,Size,Date,AccessDate,Access,Owner,Group,Link
- Description=Bluetooth service discovery protocol
- Description[da]=Bluetooth-protokol til opdagelse af serviceydelser
- Description[et]=Bluetoothi teenuste avastamise protokoll
diff --git a/kde-apps/kdebluetooth/obex-pkgconfig.diff
b/kde-apps/kdebluetooth/obex-pkgconfig.diff
deleted file mode 100644
index efe8a86..0000000
--- a/kde-apps/kdebluetooth/obex-pkgconfig.diff
+++ /dev/null
@@ -1,96 +0,0 @@
-diff -rNu2 kdebluetooth-1.0_beta1.orig/configure
kdebluetooth-1.0_beta1/configure
---- kdebluetooth-1.0_beta1.orig/configure 2006-04-27 20:50:31.000000000
+0100
-+++ kdebluetooth-1.0_beta1/configure 2006-04-27 20:50:55.000000000 +0100
-@@ -32607,5 +32607,5 @@
- esac
- fi
--OPENOBEX_CONFIG=$ac_cv_path_OPENOBEX_CONFIG
-+OPENOBEX_CONFIG="pkg-config openobex"
-
- if test -n "$OPENOBEX_CONFIG"; then
-@@ -32619,6 +32619,6 @@
-
- if test "$OPENOBEX_CONFIG" = "no" ; then
-- { echo "$as_me:$LINENO: WARNING: openobex-config not found. Pehaps
openobex is not installed." >&5
--echo "$as_me: WARNING: openobex-config not found. Pehaps openobex is not
installed." >&2;}
-+ { echo "$as_me:$LINENO: WARNING: pkg-config not found. Pehaps
openobex is not installed." >&5
-+echo "$as_me: WARNING: pkg-config not found. Pehaps openobex is not
installed." >&2;}
- DO_NOT_COMPILE="$DO_NOT_COMPILE kdebluetooth"
- OPENOBEX_CONFIG="false"
-@@ -32626,14 +32626,4 @@
-
- OPENOBEX_CFLAGS=`$OPENOBEX_CONFIG --cflags`
--openobex_inc_dir=`echo $OPENOBEX_CFLAGS | cut -dI -f2`
--if test -f "$openobex_inc_dir/obex.h" ; then
-- :
--else
-- if test -f "$openobex_inc_dir/openobex/obex.h" ; then
-- OPENOBEX_CFLAGS="$OPENOBEX_CFLAGS/openobex"
-- else
-- DO_NOT_COMPILE="$DO_NOT_COMPILE kdebluetooth"
-- fi
--fi
- OPENOBEX_LIBS=`$OPENOBEX_CONFIG --libs`
-
-@@ -32641,34 +32631,12 @@
- echo "$as_me:$LINENO: checking for openobex - version >= $min_obex_version"
>&5
- echo $ECHO_N "checking for openobex - version >= $min_obex_version...
$ECHO_C" >&6
--obex_config_version=`$OPENOBEX_CONFIG --version`
-
--obex_config_major_version=`$OPENOBEX_CONFIG --version | \
-- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
--obex_config_minor_version=`$OPENOBEX_CONFIG --version | \
-- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
--obex_config_micro_version=`$OPENOBEX_CONFIG --version | \
-- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
--
--obex_req_major_version=`echo $min_obex_version | \
-- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
--obex_req_minor_version=`echo $min_obex_version | \
-- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
--obex_req_micro_version=`echo $min_obex_version | \
-- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
--
--if test -n "$obex_req_major_version" && test -n
"$obex_config_minor_version" ; then
-- if test $obex_req_major_version -lt $obex_config_major_version ; then
-- obex_config_version_ok="yes"
-- fi
-- if test $obex_req_major_version -eq $obex_config_major_version ; then
-- if test $obex_req_minor_version -lt
$obex_config_minor_version ; then
-- obex_config_version_ok="yes"
-- fi
-- if test $obex_req_minor_version -eq
$obex_config_minor_version ; then
-- if test $obex_req_micro_version -le
$obex_config_micro_version ; then
-- obex_config_version_ok="yes"
-- fi
-- fi
-- fi
-+$OPENOBEX_CONFIG --atleast-version $min_obex_version openobex
-+vcheck=$?
-+
-+if test "$vcheck" = "0"; then
-+ obex_config_version_ok="yes"
-+else
-+ obex_config_version=`$OPENOBEX_CONFIG --modversion`
- fi
-
-diff -rNu2 kdebluetooth-1.0_beta1.orig/kdebluetooth/libkobex/kobex.h
kdebluetooth-1.0_beta1/kdebluetooth/libkobex/kobex.h
---- kdebluetooth-1.0_beta1.orig/kdebluetooth/libkobex/kobex.h 2006-04-27
20:50:31.000000000 +0100
-+++ kdebluetooth-1.0_beta1/kdebluetooth/libkobex/kobex.h 2006-04-27
20:50:34.000000000 +0100
-@@ -31,5 +31,5 @@
- #include <sys/socket.h>
- #include <bluetooth/bluetooth.h>
--#include <obex.h>
-+#include <openobex/obex.h>
- }
-
-diff -rNu2 kdebluetooth-1.0_beta1.orig/kdebluetooth/libkobex/kobexheader.h
kdebluetooth-1.0_beta1/kdebluetooth/libkobex/kobexheader.h
---- kdebluetooth-1.0_beta1.orig/kdebluetooth/libkobex/kobexheader.h
2006-04-27 20:50:31.000000000 +0100
-+++ kdebluetooth-1.0_beta1/kdebluetooth/libkobex/kobexheader.h 2006-04-27
20:50:34.000000000 +0100
-@@ -21,5 +21,5 @@
-
- extern "C" {
-- #include <obex.h>
-+ #include <openobex/obex.h>
- }
-
diff --git a/kde-apps/kmobiletools/DEPENDS b/kde-apps/kmobiletools/DEPENDS
index fee88e0..497de63 100755
--- a/kde-apps/kmobiletools/DEPENDS
+++ b/kde-apps/kmobiletools/DEPENDS
@@ -1,2 +1,2 @@
-depends kdelibs
-
+depends kdelibs --without-arts &&
+optional_depends kdebluetooth "" "" "for kdebluetooth integration"
diff --git a/kde-apps/kmobiletools/DETAILS b/kde-apps/kmobiletools/DETAILS
index 0b52039..33a9e58 100755
--- a/kde-apps/kmobiletools/DETAILS
+++ b/kde-apps/kmobiletools/DETAILS
@@ -1,9 +1,9 @@
SPELL=kmobiletools
- VERSION=0.4.3.3
+ VERSION=0.5.0-beta2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.berlios.de/$SPELL/$SOURCE
- SOURCE_GPG="gurus.gpg:$SOURCE.sig"
+
SOURCE_HASH=sha512:c1bdd030cac18f80c8fd67d81905b1f3e35c75937b86bc674cebcf3c6e2a6426af14616e7c1905f21a87e2e382e9d6ec9990032e49b8b2f62d5fc93a1dda7cef
WEB_SITE=http://kmobiletools.berlios.de/
ENTERED=20040919
LICENSE[0]=GPL
diff --git a/kde-apps/kmobiletools/HISTORY b/kde-apps/kmobiletools/HISTORY
index 81f8d5f..86a84ed 100644
--- a/kde-apps/kmobiletools/HISTORY
+++ b/kde-apps/kmobiletools/HISTORY
@@ -1,3 +1,7 @@
+2007-04-09 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: disable arts, added optional kdebluetooth
+ * DETAILS: updated spell to 0.5.0-beta2
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/kde-apps/kmobiletools/kmobiletools-0.4.3.3.tar.bz2.sig
b/kde-apps/kmobiletools/kmobiletools-0.4.3.3.tar.bz2.sig
deleted file mode 100644
index 5217228..0000000
Binary files a/kde-apps/kmobiletools/kmobiletools-0.4.3.3.tar.bz2.sig and
/dev/null differ



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (9bf9a5ba3a6af94abfb7584d02367181062febf3), Jaka Kranjc, 04/09/2007

Archive powered by MHonArc 2.6.24.

Top of Page