Remove the dbus-glib-1 dependency

Change-Id: Ie4f3479549636dde9b748da5afbb879446885485
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 29d90e2..ab8e391 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,6 @@ pkg_check_modules(pkgs REQUIRED
        appcore-efl
        bundle
        dlog
-       dbus-glib-1
        ecore
        edbus
        edje

diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644 (file)
index 9ce8633..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,303 +0,0 @@
-bluetooth-share-ui (0.0.38) unstable; urgency=low
-
-  * Tagging and package upload
-  * Git: magnolia/apps/connectivity/bluetooth-share-ui
-  * Tag: bluetooth-share-ui_0.0.38
-
- -- InJun Yang <injun.yang@samsung.com>  Fri, 22 Feb 2013 19:20:37 +0900
-
-bluetooth-share-ui (0.0.37) unstable; urgency=low
-
-  * Tagging and package upload
-  * Git: magnolia/apps/connectivity/bluetooth-share-ui
-  * Tag: bluetooth-share-ui_0.0.37
-
- -- DoHyun Pyun <dh79.pyun@samsung.com>  Tue, 05 Feb 2013 19:15:09 +0900
-
-bluetooth-share-ui (0.0.36) unstable; urgency=low
-
-  * Tagging and package upload
-  * Git: magnolia/apps/connectivity/bluetooth-share-ui
-  * Tag: bluetooth-share-ui_0.0.36
-
- -- InJun Yang <injun.yang@samsung.com>  Fri, 01 Feb 2013 20:19:22 +0900
-
-bluetooth-share-ui (0.0.35) unstable; urgency=low
-
-  * Tagging and package upload
-  * Git: magnolia/apps/connectivity/bluetooth-share-ui
-  * Tag: bluetooth-share-ui_0.0.35
-
- -- DoHyun Pyun <dh79.pyun@samsung.com>  Thu, 24 Jan 2013 11:37:34 +0900
-
-bluetooth-share-ui (0.0.34) unstable; urgency=low
-
-  * Tagging and package upload
-  * Git: magnolia/apps/connectivity/bluetooth-share-ui
-  * Tag: bluetooth-share-ui_0.0.34
-
- -- Jaganath K <jaganath.k@samsung.com>  Tue, 15 Jan 2013 18:17:28 +0530
-
-bluetooth-share-ui (0.0.33) unstable; urgency=low
-
-  * Tagging and package upload
-  * Git: magnolia/apps/connectivity/bluetooth-share-ui
-  * Tag: bluetooth-share-ui_0.0.33
-
- -- Sunil Kumar Behera <sunil.behera@samsung.com>  Wed, 09 Jan 2013 19:49:19 +0900
-
-bluetooth-share-ui (0.0.32) unstable; urgency=low
-
-  * Tagging and package upload
-  * Git: magnolia/apps/connectivity/bluetooth-share-ui
-  * Tag: bluetooth-share-ui_0.0.32
-
- -- Sunil Kumar Behera <sunil.behera@samsung.com>  Wed, 26 Dec 2012 15:15:45 +0530
-
-bluetooth-share-ui (0.0.31) unstable; urgency=low
-
-  * Tagging and package upload
-  * Git: magnolia/apps/connectivity/bluetooth-share-ui
-  * Tag: bluetooth-share-ui_0.0.31
-
- -- Sunil Kumar Behera <sunil.behera@samsung.com>  Thu, 20 Dec 2012 16:50:02 +0530
-
-bluetooth-share-ui (0.0.30) unstable; urgency=low
-
-  * Tagging and package upload
-  * Git: magnolia/apps/connectivity/bluetooth-share-ui
-  * Tag: bluetooth-share-ui_0.0.30
-
- -- Chethan T N <chethan.tn@samsung.com>  Thu, 20 Dec 2012 17:41:51 +0900
-
-bluetooth-share-ui (0.0.29) unstable; urgency=low
-
-  * Display the clear button
-  * Git: magnolia/apps/connectivity/bluetooth-share-ui
-  * Tag: bluetooth-share-ui_0.0.29
-
- -- DoHyun Pyun <dh79.pyun@samsung.com>  Thu, 15 Nov 2012 15:26:52 +0900
-
-bluetooth-share-ui (0.0.28) unstable; urgency=low
-
-  * Upload package for prevent defect fix
-  * Git: magnolia/apps/connectivity/bluetooth-share-ui
-  * Tag: bluetooth-share-ui_0.0.28
-
- -- Chethan T N <chethan.tn@samsung.com>  Fri, 09 Nov 2012 11:39:45 +0900
-
-bluetooth-share-ui (0.0.27) unstable; urgency=low
-
-  * Applied screen rotaion and prevent defect fix
-  * Git: magnolia/apps/connectivity/bluetooth-share-ui
-  * Tag: bluetooth-share-ui_0.0.27
-
- -- Chethan T N <chethan.tn@samsung.com>  Thu, 08 Nov 2012 17:44:59 +0900
-
-bluetooth-share-ui (0.0.26) unstable; urgency=low
-
-  * Add incicator window
-  * Git: magnolia/apps/connectivity/bluetooth-share-ui
-  * Tag: bluetooth-share-ui_0.0.26
-
- -- InJun Yang <injun.yang@samsung.com>  Wed, 31 Oct 2012 15:01:01 +0900
-
-bluetooth-share-ui (0.0.25) unstable; urgency=low
-
-  * Fix : Retry file send crash issue
-  * Git: magnolia/apps/connectivity/bluetooth-share-ui
-  * Tag: bluetooth-share-ui_0.0.25
-
- -- Chethan T N <chethan.tn@samsung.com>  Fri, 26 Oct 2012 17:44:55 +0530
-
-bluetooth-share-ui (0.0.24) unstable; urgency=low
-
-  * Change directory path
-  * Git: magnolia/apps/connectivity/bluetooth-share-ui
-  * Tag: bluetooth-share-ui_0.0.24
-
- -- InJun Yang <injun.yang@samsung.com>  Thu, 25 Oct 2012 13:58:16 +0900
-
-bluetooth-share-ui (0.0.23) unstable; urgency=low
-
-  * Upload the package
-  * Git: magnolia/apps/connectivity/bluetooth-share-ui
-  * Tag: bluetooth-share-ui_0.0.23
-
- -- InJun Yang <injun.yang@samsung.com>  Fri, 12 Oct 2012 21:51:21 +0900
-
-bluetooth-share-ui (0.0.22) unstable; urgency=low
-
-  * Copy the license file in target
-  * Git: magnolia/apps/connectivity/bluetooth-share-ui
-  * Tag: bluetooth-share-ui_0.0.22
-
- -- DoHyun Pyun <dh79.pyun@samsung.com>  Thu, 11 Oct 2012 15:52:05 +0900
-
-bluetooth-share-ui (0.0.21) unstable; urgency=low
-
-  * Apply smack manifest file
-  * Git: magnolia/apps/connectivity/bluetooth-share-ui
-  * Tag: bluetooth-share-ui_0.0.21
-
- -- Sangki Park <sangki79.park@samsung.com>  Mon, 24 Sep 2012 13:58:42 +0900
-
-bluetooth-share-ui (0.0.20) unstable; urgency=low
-
-  * Upload the package
-  * Git: magnolia/apps/connectivity/bluetooth-share-ui
-  * Tag: bluetooth-share-ui_0.0.20
-
- -- InJun Yang <injun.yang@samsung.com>  Thu, 23 Aug 2012 09:37:13 +0900
-
-bluetooth-share-ui (0.0.19) unstable; urgency=low
-
-  * Upload the package
-  * Git: slp/pkgs/b/bluetooth-share-ui
-  * Tag: bluetooth-share-ui_0.0.19
-
- -- InJun Yang <injun.yang@samsung.com>  Fri, 10 Aug 2012 12:26:41 +0900
-
-bluetooth-share-ui (0.0.18) unstable; urgency=low
-
-  * Upload the package
-  * Git: slp/pkgs/b/bluetooth-share-ui
-  * Tag: bluetooth-share-ui_0.0.18
-
- -- InJun Yang <injun.yang@samsung.com>  Tue, 07 Aug 2012 12:57:35 +0900
-
-bluetooth-share-ui (0.0.17) unstable; urgency=low
-
-  * Apply pkg manifest
-  * Git: slp/pkgs/b/bluetooth-share-ui
-  * Tag: bluetooth-share-ui_0.0.17
-
- -- InJun Yang <injun.yang@samsung.com>  Tue, 31 Jul 2012 15:11:49 +0900
-
-bluetooth-share-ui (0.0.16) unstable; urgency=low
-
-  * Change text color
-  * Git: slp/pkgs/b/bluetooth-share-ui
-  * Tag: bluetooth-share-ui_0.0.16
-
- -- InJun Yang <injun.yang@samsung.com>  Tue, 31 Jul 2012 10:11:23 +0900
-
-bluetooth-share-ui (0.0.15) unstable; urgency=low
-
-  * Code refactoring
-  * Git: slp/pkgs/b/bluetooth-share-ui
-  * Tag: bluetooth-share-ui_0.0.15
-
- -- InJun Yang <injun.yang@samsung.com>  Tue, 10 Jul 2012 19:28:09 +0900
-
-bluetooth-share-ui (0.0.14) unstable; urgency=low
-
-  * Ordering inbound/outbound view
-  * Git: slp/pkgs/b/bluetooth-share-ui
-  * Tag: bluetooth-share-ui_0.0.14
-
- -- InJun Yang <injun.yang@samsung.com>  Tue, 10 Jul 2012 08:55:44 +0900
-
-bluetooth-share-ui (0.0.13) unstable; urgency=low
-
-  * Upload the package
-  * Git: slp/pkgs/b/bluetooth-share-ui
-  * Tag: bluetooth-share-ui_0.0.13
-
- -- InJun Yang <injun.yang@samsung.com>  Fri, 06 Jul 2012 20:09:50 +0900
-
-bluetooth-share-ui (0.0.12) unstable; urgency=low
-
-  * Upload the package
-  * Git: slp/pkgs/b/bluetooth-share-ui
-  * Tag: bluetooth-share-ui_0.0.12
-
- -- InJun Yang <injun.yang@samsung.com>  Wed, 20 Jun 2012 20:42:55 +0900
-
-bluetooth-share-ui (0.0.11) unstable; urgency=low
-
-  * Remove the progress popup in error case
-  * Git: slp/pkgs/b/bluetooth-share-ui
-  * Tag: bluetooth-share-ui_0.0.11
-
- -- DoHyun Pyun <dh79.pyun@samsung.com>  Mon, 04 Jun 2012 09:00:48 +0900
-
-bluetooth-share-ui (0.0.10) unstable; urgency=low
-
-  * Upload the package
-  * Git: slp/pkgs/b/bluetooth-share-ui
-  * Tag: bluetooth-share-ui_0.0.10
-
- -- InJun Yang <injun.yang@samsung.com>  Tue, 29 May 2012 17:45:20 +0900
-
-bluetooth-share-ui (0.0.9) unstable; urgency=low
-
-  * Upload the package
-  * Git: slp/pkgs/b/bluetooth-share-ui
-  * Tag: bluetooth-share-ui_0.0.9
-
- -- InJun Yang <injun.yang@samsung.com>  Thu, 24 May 2012 15:03:56 +0900
-
-bluetooth-share-ui (0.0.8) unstable; urgency=low
-
-  * Upload the package
-  * Git: slp/pkgs/b/bluetooth-share-ui
-  * Tag: bluetooth-share-ui_0.0.8
-
- -- DoHyun Pyun <dh79.pyun@samsung.com>  Mon, 21 May 2012 14:30:23 +0900
-
-bluetooth-share-ui (0.0.7) unstable; urgency=low
-
-  * Support the dynamic font change
-  * Git: slp/pkgs/b/bluetooth-share-ui
-  * Tag: bluetooth-share-ui_0.0.7
-
- -- DoHyun Pyun <dh79.pyun@samsung.com>  Mon, 14 May 2012 10:46:32 +0900
-
-bluetooth-share-ui (0.0.6) unstable; urgency=low
-
-  * Upload the package
-  * Git: slp/pkgs/b/bluetooth-share-ui
-  * Tag: bluetooth-share-ui_0.0.6
-
- -- InJun Yang <injun.yang@samsung.com>  Thu, 22 Mar 2012 16:45:01 +0900
-
-bluetooth-share-ui (0.0.5) unstable; urgency=low
-
-  * Apply remained EFL changes
-  * Git: slp/pkgs/b/bluetooth-share-ui
-  * Tag: bluetooth-share-ui_0.0.5
-
- -- Hocheol Seo <hocheol.seo@samsung.com>  Sat, 17 Mar 2012 14:59:52 +0900
-
-bluetooth-share-ui (0.0.4) unstable; urgency=low
-
-  * SLP prefix is changed
-  * Git: slp/pkgs/b/bluetooth-share-ui
-  * Tag: bluetooth-share-ui_0.0.4
-
- -- InJun Yang <injun.yang@samsung.com>  Thu, 15 Mar 2012 18:48:04 +0900
-
-bluetooth-share-ui (0.0.3) unstable; urgency=low
-
-  * Apply and upload the Elementary API changes
-  * Git: 165.213.180.234:slp/pkgs/b/bluetooth-share-ui
-  * Tag: bluetooth-share-ui_0.0.3
-
- -- DoHyun Pyun <dh79.pyun@samsung.com>  Tue, 13 Mar 2012 18:53:47 +0530
-
-bluetooth-share-ui (0.0.2) unstable; urgency=low
-
-   * Apply the winset API changes
-   * Git: 165.213.180.234:slp/pkgs/b/bluetooth-share-ui
-   * Tag: bluetooth-share-ui_0.0.2
-
- -- DoHyun Pyun <dh79.pyun@samsung.com>  Thu, 16 Feb 2012 10:09:01 +0900
-
-bluetooth-share-ui (0.0.1) unstable; urgency=low
-
-   * Initial release
-   * Git: 165.213.180.234:slp/pkgs/b/bluetooth-share-ui
-   * Tag: bluetooth-share-ui_0.0.1
-
- -- Injun Yang <injun.yang@samsung.com>  Mon, 10 Oct 2011 16:17:49 +0900

diff --git a/debian/compat b/debian/compat
deleted file mode 100644 (file)
index 7ed6ff8..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-5

diff --git a/debian/control b/debian/control
deleted file mode 100644 (file)
index 6264d8c..0000000
--- a/debian/control
+++ /dev/null
@@ -1,19 +0,0 @@
-Source: bluetooth-share-ui
-Section: main
-Priority: extra
-Maintainer: Hocheol Seo <hocheol.seo@samsung.com>, DoHyun Pyun <dh79.pyun@samsung.com>, InJun Yang <injun.yang@samsung.com>, Chanyeol Park <chanyeol.park@samsung.com>
-Uploaders: Sunil Behera <sunil.behera@samsung.com>, Syam Sidhardhan <s.syam@samsung.com>
-Build-Depends: debhelper (>= 5),libevas-dev, libecore-dev, libelm-dev, libappcore-efl-dev, libslp-utilx-dev, dlog-dev, libdbus-glib-1-dev, libglib2.0-dev, libaul-1-dev, libbluetooth-frwk-dev (>= 0.1.0), capi-appfw-application-dev, libbluetooth-share-dev
-Standards-Version: 0.1.0
-
-Package: org.tizen.bluetooth-share-ui
-Section: main
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libslp-utilx-0, libdlog-0
-Description: bluetooth share UI application
-
-Package: org.tizen.bluetooth-share-ui-dbg
-Section: debug
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: bluetooth share UI application (unstripped)

diff --git a/debian/docs b/debian/docs
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/debian/org.tizen.bluetooth-share-ui.install.in b/debian/org.tizen.bluetooth-share-ui.install.in
deleted file mode 100644 (file)
index a20de48..0000000
--- a/debian/org.tizen.bluetooth-share-ui.install.in
+++ /dev/null
@@ -1,5 +0,0 @@
-@PREFIX@/bin/bluetooth-share-ui
-@RESDIR@/edje/*
-@RESDIR@/images/*
-/opt/share/applications/org.tizen.bluetooth-share-ui.desktop
-/opt/share/icons/default/small/*

diff --git a/debian/rules b/debian/rules
deleted file mode 100755 (executable)
index c7f02cf..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-CFLAGS ?= -Wall -g
-CXXFLAGS ?=  -Wall -g
-LDFLAGS ?= 
-#PREFIX ?= /usr
-PREFIX ?= /opt/apps/org.tizen.bluetooth-share-ui
-DATADIR ?= /opt/apps/org.tizen.bluetooth-share-ui
-RESDIR ?= /opt/apps/org.tizen.bluetooth-share-ui/res
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-       CFLAGS += -O0
-       CXXFLAGS += -O0
-else
-       CFLAGS += -O2
-       CXXFLAGS += -O2
-endif
-
-LDFLAGS += -Wl,--rpath=$(PREFIX)/lib -Wl,--as-needed
-
-#CMAKE_TMP_DIR = $(CURDIR)/cmake_tmp
-
-
-configure: configure-stamp
-configure-stamp:
-       dh_testdir
-       # Add here commands to configure the package.
-#      mkdir -p $(CMAKE_TMP_DIR);
-       CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" cmake . -DCMAKE_INSTALL_PREFIX=$(PREFIX)
-
-       touch configure-stamp
-
-build: build-stamp
-
-build-stamp: configure-stamp 
-       dh_testdir
-
-       # Add here commands to compile the package.
-       $(MAKE)
-       #docbook-to-man debian/wavplayer.sgml > wavplayer.1
-
-       for f in `find $(CURDIR)/debian/ -name "*.in"`; do \
-               cat $$f > $${f%.in}; \
-               sed -i -e "s#@PREFIX@#$(PREFIX)#g" $${f%.in}; \
-               sed -i -e "s#@DATADIR@#$(DATADIR)#g" $${f%.in}; \
-               sed -i -e "s#@RESDIR@#$(RESDIR)#g" $${f%.in}; \
-       done
-
-
-       touch $@
-
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp configure-stamp
-
-       # Add here commands to clean up after the build process.
-       -$(MAKE) clean
-       #rm -rf $(CMAKE_TMP_DIR)
-
-       for f in `find $(CURDIR)/ -name "CMakeCache.txt"`; do \
-               rm -f $${f}; \
-       done
-
-       for f in `find $(CURDIR)/ -name "CMakeFiles"`; do \
-               rm -rf $${f}; \
-       done
-
-       for f in `find $(CURDIR)/ -name "cmake_install.cmake"`; do \
-               rm -f $${f}; \
-       done
-
-       for f in `find $(CURDIR)/ -name "Makefile"`; do \
-               rm -f $${f}; \
-       done
-
-       for f in `find $(CURDIR)/ -name "install_manifest.txt"`; do \
-               rm -f $${f}; \
-       done
-
-       for f in `find $(CURDIR)/debian/ -name "*.in"`; do \
-               rm -f $${f%.in}; \
-       done
-       rm -f data/*.desktop
-       rm -f *.edj
-
-       dh_clean
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k
-       dh_installdirs
-
-       # Add here commands to install the package into debian/wavplayer.
-       $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-#      dh_installchangelogs 
-#      dh_installdocs
-       dh_installexamples
-       dh_install --sourcedir=debian/tmp
-#      dh_installmenu
-#      dh_installdebconf       
-#      dh_installlogrotate
-#      dh_installemacsen
-#      dh_installpam
-#      dh_installmime
-#      dh_python
-#      dh_installinit
-#      dh_installcron
-#      dh_installinfo
-       dh_installman
-       dh_link
-       dh_strip --dbg-package=org.tizen.bluetooth-share-ui-dbg
-       dh_compress
-       dh_fixperms
-#      dh_perl
-       dh_makeshlibs
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure

diff --git a/packaging/org.tizen.bluetooth-share-ui.spec b/packaging/org.tizen.bluetooth-share-ui.spec
index 4ffd2c0..76d6821 100755 (executable)
--- a/packaging/org.tizen.bluetooth-share-ui.spec
+++ b/packaging/org.tizen.bluetooth-share-ui.spec
@@ -9,7 +9,6 @@ Group:      TO_BE_FILLED
 License:    Flora-1.1
 Source0:    %{name}-%{version}.tar.gz
 
-BuildRequires:  pkgconfig(dbus-glib-1)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(appcore-efl)

diff --git a/src/bt-share-ui-ipc.c b/src/bt-share-ui-ipc.c
index c59c0ed..eab1d7b 100644 (file)
--- a/src/bt-share-ui-ipc.c
+++ b/src/bt-share-ui-ipc.c
@@ -22,7 +22,6 @@
 */
 
 #include <dbus/dbus.h>
-#include <dbus/dbus-glib-bindings.h>
 #include <glib.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/bt-share-ui-main.c b/src/bt-share-ui-main.c
index ff56686..dbd0758 100644 (file)
--- a/src/bt-share-ui-main.c
+++ b/src/bt-share-ui-main.c
@@ -115,7 +115,6 @@ static int __bt_share_launch_handler(bt_share_appdata_t *ad, bundle *b,
        FN_START;
        const char *transfer_type = NULL;
        const char *temp = NULL;
-       char *ptr = NULL;
        char *stop = NULL;
        unsigned char tranferred;
        int tr_type = 0;

diff --git a/src/bt-share-ui-main.h b/src/bt-share-ui-main.h
index 4201964..732835e 100644 (file)
--- a/src/bt-share-ui-main.h
+++ b/src/bt-share-ui-main.h
@@ -32,7 +32,6 @@ extern "C" {
 #include <Elementary.h>
 #include <dlog.h>
 #include <glib.h>
-#include <dbus/dbus-glib.h>
 #include <bluetooth-share-api.h>
 #include <efl_extension.h>
 #include <bluetooth.h>