--- libsocialweb-0.24.0.orig/debian/libsocialweb-client1.symbols +++ libsocialweb-0.24.0/debian/libsocialweb-client1.symbols @@ -0,0 +1,52 @@ +libsocialweb-client.so.1 libsocialweb-client1 #MINVER# + _sw_client_item_view_new_for_path@Base 0.23.1 + _sw_client_service_setup@Base 0.23.1 + _sw_client_service_setup_proxy_for_iface@Base 0.23.1 + _sw_client_view_new_for_path@Base 0.23.1 + sw_client_get_service@Base 0.23.1 + sw_client_get_services@Base 0.23.1 + sw_client_get_type@Base 0.23.1 + sw_client_hide_item@Base 0.23.1 + sw_client_is_online@Base 0.23.1 + sw_client_item_view_get_type@Base 0.23.1 + sw_client_item_view_refresh@Base 0.23.1 + sw_client_item_view_start@Base 0.23.1 + sw_client_lastfm_get_type@Base 0.23.1 + sw_client_lastfm_new@Base 0.23.1 + sw_client_lastfm_now_playing@Base 0.23.1 + sw_client_lastfm_submit_track@Base 0.23.1 + sw_client_new@Base 0.23.1 + sw_client_open_view@Base 0.23.1 + sw_client_open_view_for_service@Base 0.23.1 + sw_client_service_get_dynamic_capabilities@Base 0.23.1 + sw_client_service_get_name@Base 0.23.1 + sw_client_service_get_static_capabilities@Base 0.23.1 + sw_client_service_get_type@Base 0.23.1 + sw_client_service_query_open_view@Base 0.23.1 + sw_client_service_request_avatar@Base 0.23.1 + sw_client_service_update_status@Base 0.23.1 + sw_client_service_update_status_with_fields@Base 0.24.0 + sw_client_view_get_sorted_items@Base 0.23.1 + sw_client_view_get_type@Base 0.23.1 + sw_client_view_refresh@Base 0.23.1 + sw_client_view_start@Base 0.23.1 + sw_item_free@Base 0.23.1 + sw_item_get_type@Base 0.23.1 + sw_item_get_value@Base 0.23.1 + sw_item_has_key@Base 0.23.1 + sw_item_is_from_cache@Base 0.23.1 + sw_item_new@Base 0.23.1 + sw_item_ref@Base 0.23.1 + sw_item_unref@Base 0.23.1 + sw_marshal_VOID__BOOLEAN_BOOLEAN_BOOLEAN@Base 0.23.1 + sw_marshal_VOID__BOXED_BOXED@Base 0.23.1 + sw_marshal_VOID__BOXED_POINTER@Base 0.23.1 + sw_marshal_VOID__BOXED_UINT_POINTER@Base 0.23.1 + sw_marshal_VOID__STRING_BOXED@Base 0.23.1 + sw_marshal_VOID__STRING_BOXED_POINTER@Base 0.24.0 + sw_marshal_VOID__STRING_INT64_BOXED@Base 0.23.1 + sw_marshal_VOID__STRING_POINTER@Base 0.23.1 + sw_marshal_VOID__STRING_STRING@Base 0.23.1 + sw_marshal_VOID__STRING_STRING_INT64_BOXED@Base 0.23.1 + sw_marshal_VOID__STRING_STRING_STRING_INT64_STRING_STRING_UINT_UINT_STRING_POINTER@Base 0.23.1 + sw_marshal_VOID__STRING_STRING_STRING_UINT_UINT_STRING_POINTER@Base 0.23.1 --- libsocialweb-0.24.0.orig/debian/libsocialweb0.symbols +++ libsocialweb-0.24.0/debian/libsocialweb0.symbols @@ -0,0 +1,162 @@ +libsocialweb-keyfob.so.0 libsocialweb0 #MINVER# + sw_keyfob_flickr@Base 0.23.1 + sw_keyfob_flickr_sync@Base 0.23.1 + sw_keyfob_oauth@Base 0.23.1 + sw_keyfob_oauth_sync@Base 0.23.1 +libsocialweb-keystore.so.0 libsocialweb0 #MINVER# + sw_keystore_get_key@Base 0.23.1 + sw_keystore_get_key_secret@Base 0.23.1 +libsocialweb.so.0 libsocialweb0 #MINVER# + _sw_item_to_value_array@Base 0.23.1 + client_monitor_add@Base 0.23.1 + client_monitor_init@Base 0.23.1 + client_monitor_remove@Base 0.23.1 + item_equal@Base 0.23.1 + sw_avatar_iface_emit_avatar_retrieved@Base 0.23.1 + sw_avatar_iface_get_type@Base 0.23.1 + sw_avatar_iface_implement_request_avatar@Base 0.23.1 + sw_ban_load@Base 0.23.1 + sw_ban_save@Base 0.23.1 + sw_cache_drop@Base 0.23.1 + sw_cache_load@Base 0.23.1 + sw_cache_save@Base 0.23.1 + sw_call_list_add@Base 0.23.1 + sw_call_list_cancel_all@Base 0.23.1 + sw_call_list_free@Base 0.23.1 + sw_call_list_is_empty@Base 0.23.1 + sw_call_list_new@Base 0.23.1 + sw_call_list_remove@Base 0.23.1 + sw_core_dup_singleton@Base 0.23.1 + sw_core_get_connection@Base 0.23.1 + sw_core_get_type@Base 0.23.1 + sw_core_iface_emit_online_changed@Base 0.23.1 + sw_core_iface_get_type@Base 0.23.1 + sw_core_iface_implement_get_services@Base 0.23.1 + sw_core_iface_implement_hide_item@Base 0.23.1 + sw_core_iface_implement_is_online@Base 0.23.1 + sw_core_iface_implement_open_view@Base 0.23.1 + sw_core_is_item_banned@Base 0.23.1 + sw_core_new@Base 0.23.1 + sw_core_run@Base 0.23.1 + sw_date_to_iso@Base 0.23.1 + sw_debug_flags@Base 0.23.1 + sw_debug_init@Base 0.23.1 + sw_hash_string_dict@Base 0.23.1 + sw_is_online@Base 0.23.1 + sw_item_compare_date_newer@Base 0.23.1 + sw_item_compare_date_older@Base 0.23.1 + sw_item_dump@Base 0.23.1 + sw_item_get@Base 0.23.1 + sw_item_get_mtime@Base 0.23.1 + sw_item_get_ready@Base 0.23.1 + sw_item_get_service@Base 0.23.1 + sw_item_get_type@Base 0.23.1 + sw_item_new@Base 0.23.1 + sw_item_peek_hash@Base 0.23.1 + sw_item_pop_pending@Base 0.23.1 + sw_item_push_pending@Base 0.23.1 + sw_item_put@Base 0.23.1 + sw_item_request_image_fetch@Base 0.23.1 + sw_item_set_new@Base 0.23.1 + sw_item_set_service@Base 0.23.1 + sw_item_take@Base 0.23.1 + sw_item_touch@Base 0.23.1 + sw_item_view_add_from_set@Base 0.23.1 + sw_item_view_add_item@Base 0.23.1 + sw_item_view_add_items@Base 0.23.1 + sw_item_view_get_object_path@Base 0.23.1 + sw_item_view_get_service@Base 0.23.1 + sw_item_view_get_type@Base 0.23.1 + sw_item_view_iface_emit_items_added@Base 0.23.1 + sw_item_view_iface_emit_items_changed@Base 0.23.1 + sw_item_view_iface_emit_items_removed@Base 0.23.1 + sw_item_view_iface_get_type@Base 0.23.1 + sw_item_view_iface_implement_close@Base 0.23.1 + sw_item_view_iface_implement_refresh@Base 0.23.1 + sw_item_view_iface_implement_start@Base 0.23.1 + sw_item_view_iface_implement_stop@Base 0.23.1 + sw_item_view_remove_from_set@Base 0.23.1 + sw_item_view_remove_item@Base 0.23.1 + sw_item_view_remove_items@Base 0.23.1 + sw_item_view_set_from_set@Base 0.23.1 + sw_item_view_update_item@Base 0.23.1 + sw_item_view_update_items@Base 0.23.1 + sw_lastfm_iface_get_type@Base 0.23.1 + sw_lastfm_iface_implement_now_playing@Base 0.23.1 + sw_lastfm_iface_implement_submit_track@Base 0.23.1 + sw_marshal_VOID__BOOLEAN_BOOLEAN_BOOLEAN@Base 0.23.1 + sw_marshal_VOID__BOXED_BOXED@Base 0.23.1 + sw_marshal_VOID__BOXED_POINTER@Base 0.23.1 + sw_marshal_VOID__BOXED_UINT_POINTER@Base 0.23.1 + sw_marshal_VOID__STRING_BOXED@Base 0.23.1 + sw_marshal_VOID__STRING_BOXED_POINTER@Base 0.24.0 + sw_marshal_VOID__STRING_INT64_BOXED@Base 0.23.1 + sw_marshal_VOID__STRING_POINTER@Base 0.23.1 + sw_marshal_VOID__STRING_STRING@Base 0.23.1 + sw_marshal_VOID__STRING_STRING_INT64_BOXED@Base 0.23.1 + sw_marshal_VOID__STRING_STRING_STRING_INT64_STRING_STRING_UINT_UINT_STRING_POINTER@Base 0.23.1 + sw_marshal_VOID__STRING_STRING_STRING_UINT_UINT_STRING_POINTER@Base 0.23.1 + sw_online_add_notify@Base 0.23.1 + sw_online_remove_notify@Base 0.23.1 + sw_query_iface_get_type@Base 0.23.1 + sw_query_iface_implement_open_view@Base 0.23.1 + sw_service_emit_avatar_retrieved@Base 0.23.1 + sw_service_emit_capabilities_changed@Base 0.23.1 + sw_service_emit_refreshed@Base 0.23.1 + sw_service_emit_user_changed@Base 0.23.1 + sw_service_error_quark@Base 0.23.1 + sw_service_get_name@Base 0.23.1 + sw_service_get_param@Base 0.23.1 + sw_service_get_type@Base 0.23.1 + sw_service_iface_emit_avatar_retrieved@Base 0.23.1 + sw_service_iface_emit_capabilities_changed@Base 0.23.1 + sw_service_iface_emit_user_changed@Base 0.23.1 + sw_service_iface_get_type@Base 0.23.1 + sw_service_iface_implement_credentials_updated@Base 0.23.1 + sw_service_iface_implement_get_dynamic_capabilities@Base 0.23.1 + sw_service_iface_implement_get_static_capabilities@Base 0.23.1 + sw_service_iface_implement_request_avatar@Base 0.23.1 + sw_service_ready@Base 0.23.1 + sw_service_refresh@Base 0.23.1 + sw_service_start@Base 0.23.1 + sw_set_add@Base 0.23.1 + sw_set_add_from@Base 0.23.1 + sw_set_as_list@Base 0.23.1 + sw_set_difference@Base 0.23.1 + sw_set_empty@Base 0.23.1 + sw_set_filter@Base 0.23.1 + sw_set_foreach@Base 0.23.1 + sw_set_foreach_remove@Base 0.23.1 + sw_set_from_list@Base 0.23.1 + sw_set_get_type@Base 0.23.1 + sw_set_has@Base 0.23.1 + sw_set_is_empty@Base 0.23.1 + sw_set_new@Base 0.23.1 + sw_set_new_full@Base 0.23.1 + sw_set_ref@Base 0.23.1 + sw_set_remove@Base 0.23.1 + sw_set_remove_from@Base 0.23.1 + sw_set_size@Base 0.23.1 + sw_set_union@Base 0.23.1 + sw_set_unref@Base 0.23.1 + sw_status_update_iface_emit_status_updated@Base 0.23.1 + sw_status_update_iface_get_type@Base 0.23.1 + sw_status_update_iface_implement_update_status@Base 0.23.1 + sw_time_t_from_string@Base 0.23.1 + sw_time_t_to_string@Base 0.23.1 + sw_view_add_service@Base 0.23.1 + sw_view_get_type@Base 0.23.1 + sw_view_iface_emit_items_added@Base 0.23.1 + sw_view_iface_emit_items_changed@Base 0.23.1 + sw_view_iface_emit_items_removed@Base 0.23.1 + sw_view_iface_get_type@Base 0.23.1 + sw_view_iface_implement_close@Base 0.23.1 + sw_view_iface_implement_refresh@Base 0.23.1 + sw_view_iface_implement_start@Base 0.23.1 + sw_view_iface_implement_stop@Base 0.23.1 + sw_view_new@Base 0.23.1 + sw_view_recalculate@Base 0.23.1 + sw_web_download_image@Base 0.23.1 + sw_web_download_image_async@Base 0.23.1 + sw_web_make_async_session@Base 0.23.1 + sw_web_make_sync_session@Base 0.23.1 --- libsocialweb-0.24.0.orig/debian/libsocialweb-dev.install +++ libsocialweb-0.24.0/debian/libsocialweb-dev.install @@ -0,0 +1,9 @@ +usr/include/libsocialweb/libsocialweb/ +usr/include/libsocialweb/libsocialweb-keyfob/ +usr/include/libsocialweb/libsocialweb-keystore/ +usr/lib/libsocialweb.so +usr/lib/libsocialweb-keyfob.so +usr/lib/libsocialweb-keystore.so +usr/lib/pkgconfig/libsocialweb-keystore.pc +usr/lib/pkgconfig/libsocialweb-module.pc +libsocialweb/sw-core.h usr/include/libsocialweb/libsocialweb --- libsocialweb-0.24.0.orig/debian/compat +++ libsocialweb-0.24.0/debian/compat @@ -0,0 +1 @@ +7 --- libsocialweb-0.24.0.orig/debian/copyright +++ libsocialweb-0.24.0/debian/copyright @@ -0,0 +1,58 @@ +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 +Name: libsocialweb +Source: http://moblin.org/projects/libsocialweb +Maintainer: Ross Burton + Rob Bradford + +Files: * +Copyright: 2008-2009, Intel Corporation +License: LGPL-2.1 + +Files: tools/*.py +Copyright: 2006-2008, Collabora Limited +License: LGPL-2.1+ + +Files: debian/* +Copyright: 2010, Ying-Chun Liu (PaulLiu) +License: LGPL-2.1+ + +Files: INSTALL +Copyright: 1994-2007, Free Software Foundation, Inc. +License: + This file is free documentation; the Free Software Foundation gives + unlimited permission to copy, distribute and modify it. + +License: LGPL-2.1 + This program is free software; you can redistribute it and/or modify it + under the terms and conditions of the GNU Lesser General Public License, + version 2.1, as published by the Free Software Foundation. + + This program is distributed in the hope it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for + more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. + + On Debian systems the full text of the GNU Lesser General Public Licnse, + version 2.1, can be found in the /usr/share/common-licenses/LGPL-2.1 file. + +License: LGPL-2.1+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + On Debian systems the full text of the GNU Lesser General Public Licnse, + version 2.1, can be found in the /usr/share/common-licenses/LGPL-2.1 file. --- libsocialweb-0.24.0.orig/debian/control +++ libsocialweb-0.24.0/debian/control @@ -0,0 +1,81 @@ +Source: libsocialweb +Section: web +Priority: optional +Maintainer: Ying-Chun Liu (PaulLiu) +Build-Depends: debhelper (>= 7), cdbs, libglib2.0-dev, libgconf2-dev, + libsoup2.4-dev, libdbus-glib-1-dev, librest-dev (>= 0.6), + librest-extras-dev, libjson-glib-dev, libsoup-gnome2.4-dev, + libgtk2.0-dev, libgnome-keyring-dev, autoconf, automake, + intltool, libtool, + libnm-glib-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386] +Standards-Version: 3.8.4 +Homepage: http://moblin.org/projects/libsocialweb + +Package: libsocialweb0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: libsocialweb-client1 +Description: socialweb library to fetch data from social service + A social data server which will fetch data from the "social web", such as + blog posts and photos, upcoming events, recently played tracks, and pending + auctions. It also provides a service to update status on supported web + services such as Facebook and Twitter. Libsocialweb can be accessed via D-Bus, + or with a custom socialweb client. + +Package: libsocialweb-dev +Section: libdevel +Architecture: any +Depends: libglib2.0-dev, librest-dev, librest-extras-dev, libsocialweb0 (= ${binary:Version}), ${misc:Depends} +Description: socialweb library to fetch data from social service (dev. headers) + A social data server which will fetch data from the "social web", such as + blog posts and photos, upcoming events, recently played tracks, and pending + auctions. It also provides a service to update status on supported web + services such as Facebook and Twitter. Libsocialweb can be accessed via D-Bus, + or with a custom socialweb client. + . + This package contains the development headers + +Package: libsocialweb0-dbg +Architecture: any +Section: debug +Priority: extra +Depends: libsocialweb0 (= ${binary:Version}), ${misc:Depends} +Description: socialweb library to fetch data from social service (debug symbols) + A social data server which will fetch data from the "social web", such as + blog posts and photos, upcoming events, recently played tracks, and pending + auctions. It also provides a service to update status on supported web + services such as Facebook and Twitter. Libsocialweb can be accessed via D-Bus, + or with a custom socialweb client. + . + This package contains the debug symbols. + +Package: libsocialweb-client1 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: libsocialweb0 +Description: client library to access socialweb server + This library allows programmatic access to information available from the + socialweb social data server. + +Package: libsocialweb-client-dev +Section: libdevel +Architecture: any +Depends: libglib2.0-dev, libdbus-glib-1-dev, libsocialweb-client1 (= ${binary:Version}), ${misc:Depends} +Description: client library to access socialweb server (development headers) + This library allows programmatic access to information available from the + socialweb social data server. + . + This package contains the development headers + +Package: libsocialweb-client1-dbg +Architecture: any +Section: debug +Priority: extra +Depends: libsocialweb-client1 (= ${binary:Version}), ${misc:Depends} +Description: client library to access socialweb server (debug symbols) + This library allows programmatic access to information available from the + socialweb social data server. + . + This package contains the debug symbols --- libsocialweb-0.24.0.orig/debian/watch +++ libsocialweb-0.24.0/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts=dversionmangle=s/.git\d*// \ +http://git.moblin.org/cgit.cgi/libsocialweb/ snapshot/libsocialweb-([\d\.]*).tar.gz --- libsocialweb-0.24.0.orig/debian/libsocialweb0.shlibs +++ libsocialweb-0.24.0/debian/libsocialweb0.shlibs @@ -0,0 +1,3 @@ +libsocialweb 0 libsocialweb0 +libsocialweb-keystore 0 libsocialweb0 +libsocialweb-keyfob 0 libsocialweb0 --- libsocialweb-0.24.0.orig/debian/libsocialweb0.dirs +++ libsocialweb-0.24.0/debian/libsocialweb0.dirs @@ -0,0 +1 @@ +usr/share/libsocialweb/keys --- libsocialweb-0.24.0.orig/debian/clean +++ libsocialweb-0.24.0/debian/clean @@ -0,0 +1,43 @@ +configure +config.h.in +INSTALL +aclocal.m4 +build-aux/compile +build-aux/config.guess +build-aux/config.sub +build-aux/depcomp +build-aux/install-sh +build-aux/ltmain.sh +build-aux/missing +m4/libtool.m4 +m4/ltoptions.m4 +m4/ltsugar.m4 +m4/ltversion.m4 +m4/lt~obsolete.m4 +m4/intltool.m4 +Makefile.in +libsocialweb/Makefile.in +libsocialweb-client/Makefile.in +src/Makefile.in +tests/Makefile.in +libsocialweb-keyfob/Makefile.in +tools/Makefile.in +services/Makefile.in +services/lastfm/Makefile.in +services/dummy/Makefile.in +services/myspace/Makefile.in +services/skeleton/Makefile.in +services/flickr/Makefile.in +services/twitter/Makefile.in +services/digg/Makefile.in +libsocialweb-keystore/Makefile.in +examples/Makefile.in +po/Makefile.in.in +interfaces/Makefile.in +tools/*.pyc +libsocialweb-client/libsocialweb-client-marshals.c +libsocialweb-client/libsocialweb-client-marshals.h +libsocialweb-client/libsocialweb-view-bindings.h +libsocialweb-client/libsocialweb-core-bindings.h +libsocialweb-client/libsocialweb-service-bindings.h +intltool-*.in --- libsocialweb-0.24.0.orig/debian/libsocialweb-client-dev.install +++ libsocialweb-0.24.0/debian/libsocialweb-client-dev.install @@ -0,0 +1,3 @@ +usr/include/libsocialweb/libsocialweb-client/ +usr/lib/libsocialweb-client.so +usr/lib/pkgconfig/libsocialweb-client.pc --- libsocialweb-0.24.0.orig/debian/changelog +++ libsocialweb-0.24.0/debian/changelog @@ -0,0 +1,11 @@ +libsocialweb (0.24.0-1) unstable; urgency=low + + * New upstream release + + -- Ying-Chun Liu (PaulLiu) Sat, 27 Feb 2010 00:39:42 +0800 + +libsocialweb (0.23.1-1) unstable; urgency=low + + * Initial release (Closes: #568387) + + -- Ying-Chun Liu (PaulLiu) Tue, 09 Feb 2010 15:40:08 +0800 --- libsocialweb-0.24.0.orig/debian/rules +++ libsocialweb-0.24.0/debian/rules @@ -0,0 +1,23 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +DEB_CONFIGURE_SCRIPT = $(CURDIR)/$(DEB_SRCDIR)/autogen.sh +DEB_CONFIGURE_EXTRA_FLAGS = --enable-gtk-doc \ + --enable-digg --enable-flickr --enable-lastfm --enable-myspace \ + --enable-twitter \ + --with-gnome \ + --disable-static + +DEB_BUILD_ARCH_OS ?=$(shell dpkg-architecture -qDEB_BUILD_ARCH_OS) + +ifeq ($(DEB_BUILD_ARCH_OS),linux) + DEB_CONFIGURE_EXTRA_FLAGS += --with-online=fallback_connman_nm +else + DEB_CONFIGURE_EXTRA_FLAGS += --with-online=always +endif + +common-binary-predeb-arch:: list-missing --- libsocialweb-0.24.0.orig/debian/README.Debian +++ libsocialweb-0.24.0/debian/README.Debian @@ -0,0 +1,28 @@ +libsocialweb for Debian +================== + += API Key = + +To enable flickr, digg, myspace, ...etc, you have to get an API key and/or +common secrets if there is. After you get the API key and common secrets, +please make a file which is named by "SERVICE". And the first line +of the file is the API key and the second line of the file is the common +secret. + +For example, if you want to enable support for flickr. First you go to +http://www.flickr.com/services/api/misc.api_keys.html +Following the instruction and you can get a key and a secret. + +If you get, +Key: f45714e3c2ba8c379f22c274d02124c3 +Secret: 2c889d4402c4058c + +Then you create a file called 'flickr' with the following content: +f45714e3c2ba8c379f22c274d02124c3 +2c889d4402c4058c + +Move the file to ~/.config/libsocialweb/keys/flickr and libsocialweb should be +able to work with flickr. If you want to provide a system-wide API key for all +the users, you can put the file to /usr/share/libsocialweb/keys/ directory. + + -- Ying-Chun Liu (PaulLiu) Tue, 26 Jan 2010 02:07:19 +0800 --- libsocialweb-0.24.0.orig/debian/libsocialweb0.install +++ libsocialweb-0.24.0/debian/libsocialweb0.install @@ -0,0 +1,5 @@ +usr/lib/libsocialweb/ +usr/lib/libsocialweb.so.* +usr/lib/libsocialweb-keyfob.so.* +usr/lib/libsocialweb-keystore.so.* +usr/share/ --- libsocialweb-0.24.0.orig/debian/libsocialweb-client1.shlibs +++ libsocialweb-0.24.0/debian/libsocialweb-client1.shlibs @@ -0,0 +1 @@ +libsocialweb-client 1 libsocialweb-client1 (>= 0.23.1) --- libsocialweb-0.24.0.orig/debian/libsocialweb-client1.install +++ libsocialweb-0.24.0/debian/libsocialweb-client1.install @@ -0,0 +1 @@ +usr/lib/libsocialweb-client.so.* --- libsocialweb-0.24.0.orig/debian/patches/01_detect_NM_and_ConnMan.patch +++ libsocialweb-0.24.0/debian/patches/01_detect_NM_and_ConnMan.patch @@ -0,0 +1,253 @@ +# +# Debian: http://bugs.debian.org/547163 +# Description: Add --with-online=fallback_connman_nm to use ConnMan and then +# fallback to NM +# +diff -Nur -x '*.orig' -x '*~' libsocialweb-0.23.1/configure.ac libsocialweb-0.23.1.new/configure.ac +--- libsocialweb-0.23.1/configure.ac 2010-02-09 14:16:34.553202639 +0800 ++++ libsocialweb-0.23.1.new/configure.ac 2010-02-09 14:16:44.421200452 +0800 +@@ -84,6 +84,13 @@ + AC_DEFINE([WITH_ONLINE_TEST], 1, [Test UI online detection]) + ], + ++ [test "$with_online" = "fallback_connman_nm"], ++ [ ++ AC_MSG_RESULT([Fallback with ConnMan and NM]) ++ PKG_CHECK_MODULES(NM, libnm_glib >= 0.7) ++ AC_DEFINE([WITH_ONLINE_FALLBACK_CONNMAN_NM], 1, [Fallback with ConnMan and NM detection]) ++ ], ++ + [AC_MSG_ERROR([Unknown argument to --with-online])] + ) + +diff -Nur -x '*.orig' -x '*~' libsocialweb-0.23.1/libsocialweb/sw-online.c libsocialweb-0.23.1.new/libsocialweb/sw-online.c +--- libsocialweb-0.23.1/libsocialweb/sw-online.c 2010-02-09 14:16:34.553202639 +0800 ++++ libsocialweb-0.23.1.new/libsocialweb/sw-online.c 2010-02-09 14:21:28.913200763 +0800 +@@ -290,3 +290,227 @@ + #if WITH_ONLINE_TEST + #include "sw-online-testui.c" + #endif ++ ++#if WITH_ONLINE_FALLBACK_CONNMAN_NM ++#include ++#include ++#include ++ ++/* ++ * Use NMClient since it correctly handles the NetworkManager service ++ * appearing and disappearing, as can happen at boot time, or during ++ * a network subsystem restart. ++ */ ++static NMClient *nmclient = NULL; ++static gboolean NM_sw_is_online (void); ++ ++static gboolean ++NM_we_are_online (gpointer user_data) ++{ ++ emit_notify (NM_sw_is_online ()); ++ return FALSE; ++} ++ ++static void ++NM_state_changed (NMClient *client, ++ const GParamSpec *pspec, ++ gpointer data) ++{ ++ if (NM_sw_is_online()) { ++ /* NM is notifying us too early - workaround that */ ++ g_timeout_add (1500, (GSourceFunc)NM_we_are_online, NULL); ++ } else { ++ emit_notify (FALSE); /* sw_is_online ()); */ ++ } ++} ++ ++static gboolean ++NM_online_init (void) ++{ ++ if (!nmclient) { ++ nmclient = nm_client_new(); ++ g_signal_connect (nmclient, "notify::" NM_CLIENT_STATE, ++ G_CALLBACK (NM_state_changed), NULL); ++ } ++ return TRUE; ++} ++ ++static gboolean ++NM_sw_is_online (void) ++{ ++ NMState state = NM_STATE_UNKNOWN; ++ ++ if (!NM_online_init ()) ++ return TRUE; ++ ++ g_object_get (G_OBJECT (nmclient), NM_CLIENT_STATE, &state, NULL); ++ ++ switch (state) { ++ case NM_STATE_CONNECTED: ++ return TRUE; ++ case NM_STATE_CONNECTING: ++ case NM_STATE_ASLEEP: ++ case NM_STATE_DISCONNECTED: ++ case NM_STATE_UNKNOWN: ++ default: ++ return FALSE; ++ } ++} ++ ++static DBusGProxy *CMproxy = NULL; ++ ++#define STRING_VARIANT_HASHTABLE (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE)) ++ ++static void ++CM_props_changed (DBusGProxy *proxy, const char *key, GValue *v, gpointer user_data) ++{ ++ const char *s; ++ ++ if (strcmp (key, "State") != 0) ++ return; ++ ++ s = g_value_get_string (v); ++ ++ emit_notify (strcmp (s, "online") == 0); ++} ++ ++static gboolean ++CM_online_init (void) ++{ ++ DBusGConnection *conn; ++ ++ if (CMproxy) ++ return TRUE; ++ ++ conn = dbus_g_bus_get (DBUS_BUS_SYSTEM, NULL); ++ if (!conn) { ++ g_warning ("Cannot get connection to system message bus"); ++ return FALSE; ++ } ++ ++ CMproxy = dbus_g_proxy_new_for_name (conn, "org.moblin.connman", ++ "/", "org.moblin.connman.Manager"); ++ ++ dbus_g_object_register_marshaller (sw_marshal_VOID__STRING_BOXED, ++ G_TYPE_NONE, ++ G_TYPE_STRING, ++ G_TYPE_BOXED, ++ G_TYPE_INVALID); ++ dbus_g_proxy_add_signal (CMproxy, "PropertyChanged", ++ G_TYPE_STRING, G_TYPE_VALUE, NULL); ++ dbus_g_proxy_connect_signal (CMproxy, "PropertyChanged", ++ (GCallback)CM_props_changed, NULL, NULL); ++ return TRUE; ++} ++ ++static gboolean ++CM_sw_is_online (void) ++{ ++ GHashTable *hash; ++ GValue *v; ++ const char *s; ++ gboolean ret = TRUE; ++ ++ if (!CM_online_init ()) ++ return TRUE; ++ ++ if (!dbus_g_proxy_call (CMproxy, "GetProperties", NULL, ++ G_TYPE_INVALID, ++ STRING_VARIANT_HASHTABLE, &hash, G_TYPE_INVALID)) { ++ /* On error report online */ ++ return TRUE; ++ } ++ ++ v = g_hash_table_lookup (hash, "State"); ++ if (v) { ++ s = g_value_get_string (v); ++ ret = (strcmp (s, "online") == 0); ++ } ++ ++ g_hash_table_unref (hash); ++ ++ return ret; ++} ++ ++static gboolean ++NM_test () { ++ gboolean ret=FALSE; ++ NMClient *nmclient = NULL; ++ nmclient = nm_client_new(); ++ ret = nm_client_get_manager_running(nmclient); ++ g_object_unref (nmclient); ++ return ret; ++} ++ ++static gboolean ++CM_test () { ++ DBusGProxy *connmanproxy = NULL; ++ DBusGConnection *conn=NULL; ++ gboolean ret=FALSE; ++ conn = dbus_g_bus_get (DBUS_BUS_SYSTEM, NULL); ++ if (conn) { ++ connmanproxy = dbus_g_proxy_new_for_name_owner (conn, ++ "org.moblin.connman", ++ "/", ++ "org.moblin.connman.Manager", ++ NULL); ++ } ++ ret = connmanproxy ? TRUE : FALSE; ++ if (connmanproxy) { ++ g_object_unref(connmanproxy); ++ } ++ if (conn) { ++ dbus_g_connection_unref(conn); ++ } ++ return ret; ++} ++ ++enum manager_type_t { ++ MANAGER_UNTESTED, ++ MANAGER_CONNMAN, ++ MANAGER_NETWORKMANAGER, ++ MANAGER_ALWAYS ++}; ++ ++static enum manager_type_t manager_type = MANAGER_UNTESTED; ++ ++static enum manager_type_t testManagerType() { ++ if (manager_type != MANAGER_UNTESTED) { ++ return manager_type; ++ } ++ if (CM_test()) { ++ manager_type = MANAGER_CONNMAN; ++ } else if (NM_test()) { ++ manager_type = MANAGER_NETWORKMANAGER; ++ } else { ++ manager_type = MANAGER_ALWAYS; ++ } ++ return manager_type; ++} ++ ++static gboolean ++online_init (void) ++{ ++ switch (testManagerType()) { ++ case MANAGER_CONNMAN: ++ return CM_online_init(); ++ case MANAGER_NETWORKMANAGER: ++ return NM_online_init(); ++ default: ++ return FALSE; ++ } ++} ++ ++gboolean ++sw_is_online (void) ++{ ++ switch (testManagerType()) { ++ case MANAGER_CONNMAN: ++ return CM_sw_is_online(); ++ case MANAGER_NETWORKMANAGER: ++ return NM_sw_is_online(); ++ default: ++ return TRUE; ++ } ++} ++#endif