'[meego-commits] 24683: Changes to devel:tv:1.2/w-scan'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       meego-commits
Subject:    [meego-commits] 24683: Changes to devel:tv:1.2/w-scan
From:       Shouqun Liu <no_reply () build ! meego ! com>
Date:       2011-12-13 10:42:29
Message-ID: 20111213104229.53B91607C8 () lists2 ! meego ! com
[Download RAW message or body]

Hi,
I have made the following changes to w-scan in project devel:tv:1.2. Please review \
and accept ASAP.

Thank You,
Shouqun Liu

[This message was auto-generated]

---

Request #24683:

  submit:   home:liushouqun:branches:devel:tv:1.2/w-scan(r49)(cleanup) -> \
devel:tv:1.2/w-scan


Message:
    Add D-Bus wrapper for w-scan package, this helps other program to use w-scan via \
D-Bus method call, current patch version 0.0.1 

State:   new          2011-12-13T02:23:48 liushouqun
Comment: None



changes files:
--------------
--- w-scan.changes
+++ w-scan.changes
@@ -2,0 +3,4 @@
+- Add D-Bus wrapper for w-scan package, this helps other program to use w-scan 
+  via D-Bus method call, current patch version 0.0.1 
+
+* Tue Dec 13 2011 Shouqun Liu <shouqun.liu@intel.com> - 0.1.1  

new:
----
  wscan_dbus-0.0.1.patch

spec files:
-----------
--- w-scan.spec
+++ w-scan.spec
@@ -14,7 +14,8 @@
 URL:        http://wirbel.htpc-forum.de/w_scan/index2.html
 Source0:    w_scan-%{version}.tar.bz2
 Source100:  w-scan.yaml
-
+Patch0:     wscan_dbus-0.0.1.patch
+BuildRequires: dbus-devel dbus-glib-devel
 
 %description
 w_scan is a small command line utility used to perform frequency scans for DVB and \
ATSC transmissions. @@ -32,6 +33,10 @@
 %prep
 %setup -q -n w_scan-%{version}
 
+%patch0 -p1 
+
+chmod 755 autogen.sh
+
 # >> setup
 # << setup
 
@@ -39,7 +44,8 @@
 # >> build pre
 # << build pre
 
-%configure
+%autogen --disable-static  
+%configure --disable-static
 make %{?jobs:-j%jobs}
 
 # >> build post
@@ -55,15 +61,13 @@
 
 
 
-
-
-
 %files
 %defattr(-,root,root,-)
-%{_bindir}/w_scan
 %{_bindir}/w_scan_start.sh
-%dir %{_mandir}/man1/
-%{_mandir}/man1/w_scan.1.gz
+%{_libexecdir}/w_scan_server
+%{_libexecdir}/w_scan_server_test
+%{_datadir}/dbus-1/services/com.tizen.wscan.service  
+/etc/dbus-1/session.d/com.tizen.wscan.conf 
 # >> files
 # << files
 

other changes:
--------------

++++++ w-scan.yaml
--- w-scan.yaml
+++ w-scan.yaml
@@ -20,7 +20,9 @@
 Builder: make
 
 Files:
-    - "%{_bindir}/w_scan"
+    - "%{_bindir}/wscan"
     - "%{_bindir}/w_scan_start.sh"
-    - "%dir %{_mandir}/man1/"
-    - "%{_mandir}/man1/w_scan.1.gz"
+    - "%{_libexecdir}/wscan_server"
+    - "%{_libexecdir}/wscan_server_test"
+    - "%{_datadir}/dbus-1/services/com.tizen.wscan.service"
+    - "/etc/dbus-1/session.d/com.tizen.wscan.conf"
\ No newline at end of file

++++++ wscan_dbus-0.0.1.patch (new)
--- wscan_dbus-0.0.1.patch
+++ wscan_dbus-0.0.1.patch
+diff --git a/Makefile.am b/Makefile.am
+index f49473d..f54f1d6 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -9,18 +9,8 @@
+ # The project's page is http://wirbel.htpc-forum.de/w_scan/index2.html
+ #-----------------------------------------------------------------------------#
+ 
+-include Makefile.add
++#include Makefile.add
+ 
+-AUTOMAKE_OPTIONS	= dist-bzip2 no-dist-gzip
+-bin_PROGRAMS	= w_scan
+-w_scan_SOURCES	= atsc_psip_section.c atsc_psip_section.h config.h countries.c \
countries.h descriptors.c +-w_scan_SOURCES += descriptors.h diseqc.c diseqc.h \
dump-dvbscan.c dump-dvbscan.h dump-kaffeine.c dump-kaffeine.h +-w_scan_SOURCES += \
dump-vdr.c dump-vdr.h dump-xine.c dump-xine.h dump-mplayer.c dump-mplayer.h \
dump-vlc-m3u.c +-w_scan_SOURCES += dump-vlc-m3u.h dvbscan.c dvbscan.h \
extended_frontend.h list.h lnb.c lnb.h parse-dvbscan.c +-w_scan_SOURCES += \
parse-dvbscan.h satellites.c satellites.h scan.c scan.h section.c section.h version.h \
+-w_scan_SOURCES += iconv_codes.c iconv_codes.h char-coding.c char-coding.h \
+-bin_SCRIPTS	= w_scan_start.sh +-dist_man_MANS	= doc/w_scan.1
+-EXTRA_DIST	= doc pci.classes pci.ids usb.classes usb.ids w_scan w_scan_start.sh
++SUBDIRS=dbus
+ 
+ AM_CFLAGS = -Wall -Wextra -Wno-comment -Wswitch-default -Wno-unused-parameter
+diff --git a/Makefile.in b/Makefile.in
+deleted file mode 100644
+index 797a7f2..0000000
+--- a/Makefile.in
++++ /dev/null
+@@ -1,778 +0,0 @@
+-# Makefile.in generated by automake 1.10b from Makefile.am.
+-# @configure_input@
+-
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+-# Inc.
+-# This Makefile.in is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+-# PARTICULAR PURPOSE.
+-
+-@SET_MAKE@
+-
+-#-----------------------------------------------------------------------------#
+-# Makefile.am for w_scan-20090524; generated by ./bootstrap.sh
+-# please send bug reports to http://wirbel.htpc-forum.de
+-#
+-#
+-# Simple MPEG/DVB parser to achieve network/service information without initial
+-# tuning data.
+-#
+-# The project's page is http://wirbel.htpc-forum.de/w_scan/index2.html
+-#-----------------------------------------------------------------------------#
+-
+-
+-VPATH = @srcdir@
+-pkgdatadir = $(datadir)/@PACKAGE@
+-pkgincludedir = $(includedir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
+-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-install_sh_DATA = $(install_sh) -c -m 644
+-install_sh_PROGRAM = $(install_sh) -c
+-install_sh_SCRIPT = $(install_sh) -c
+-INSTALL_HEADER = $(INSTALL_DATA)
+-transform = $(program_transform_name)
+-NORMAL_INSTALL = :
+-PRE_INSTALL = :
+-POST_INSTALL = :
+-NORMAL_UNINSTALL = :
+-PRE_UNINSTALL = :
+-POST_UNINSTALL = :
+-DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
+-	$(srcdir)/Makefile.add $(srcdir)/Makefile.am \
+-	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
+-	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
+-	depcomp install-sh missing
+-bin_PROGRAMS = w_scan$(EXEEXT)
+-subdir = .
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+- configure.lineno config.status.lineno
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = config.h
+-CONFIG_CLEAN_FILES =
+-CONFIG_CLEAN_VPATH_FILES =
+-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
+-	"$(DESTDIR)$(man1dir)"
+-PROGRAMS = $(bin_PROGRAMS)
+-am_w_scan_OBJECTS = atsc_psip_section.$(OBJEXT) countries.$(OBJEXT) \
+-	descriptors.$(OBJEXT) diseqc.$(OBJEXT) dump-dvbscan.$(OBJEXT) \
+-	dump-kaffeine.$(OBJEXT) dump-vdr.$(OBJEXT) dump-xine.$(OBJEXT) \
+-	dump-mplayer.$(OBJEXT) dump-vlc-m3u.$(OBJEXT) \
+-	dvbscan.$(OBJEXT) lnb.$(OBJEXT) parse-dvbscan.$(OBJEXT) \
+-	satellites.$(OBJEXT) scan.$(OBJEXT) section.$(OBJEXT) \
+-	iconv_codes.$(OBJEXT) char-coding.$(OBJEXT)
+-w_scan_OBJECTS = $(am_w_scan_OBJECTS)
+-w_scan_LDADD = $(LDADD)
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+-    *) f=$$p;; \
+-  esac;
+-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+-am__install_max = 40
+-am__nobase_strip_setup = \
+-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+-am__nobase_strip = \
+-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+-am__nobase_list = $(am__nobase_strip_setup); \
+-  for p in $$list; do echo "$$p $$p"; done | \
+-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+-    if (++n[$$2] == $(am__install_max)) \
+-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+-    END { for (dir in files) print dir, files[dir] }'
+-am__base_list = \
+-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+-SCRIPTS = $(bin_SCRIPTS)
+-DEFAULT_INCLUDES = -I.@am__isrc@
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-am__mv = mv -f
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(w_scan_SOURCES)
+-DIST_SOURCES = $(w_scan_SOURCES)
+-man1dir = $(mandir)/man1
+-NROFF = nroff
+-MANS = $(dist_man_MANS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-distdir = $(PACKAGE)-$(VERSION)
+-top_distdir = $(distdir)
+-am__remove_distdir = \
+-  { test ! -d "$(distdir)" \
+-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+-         && rm -fr "$(distdir)"; }; }
+-GZIP_ENV = --best
+-DIST_ARCHIVES = $(distdir).tar.bz2
+-distuninstallcheck_listfiles = find . -type f -print
+-distcleancheck_listfiles = find . -type f -print
+-ACLOCAL = @ACLOCAL@
+-AMTAR = @AMTAR@
+-AUTOCONF = @AUTOCONF@
+-AUTOHEADER = @AUTOHEADER@
+-AUTOMAKE = @AUTOMAKE@
+-AWK = @AWK@
+-CC = @CC@
+-CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+-CYGPATH_W = @CYGPATH_W@
+-DEFS = @DEFS@
+-DEPDIR = @DEPDIR@
+-ECHO_C = @ECHO_C@
+-ECHO_N = @ECHO_N@
+-ECHO_T = @ECHO_T@
+-EGREP = @EGREP@
+-EXEEXT = @EXEEXT@
+-GREP = @GREP@
+-INSTALL = @INSTALL@
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+-LDFLAGS = @LDFLAGS@
+-LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@
+-LTLIBOBJS = @LTLIBOBJS@
+-MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
+-OBJEXT = @OBJEXT@
+-PACKAGE = @PACKAGE@
+-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+-PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_STRING = @PACKAGE_STRING@
+-PACKAGE_TARNAME = @PACKAGE_TARNAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+-PATH_SEPARATOR = @PATH_SEPARATOR@
+-SET_MAKE = @SET_MAKE@
+-SHELL = @SHELL@
+-STRIP = @STRIP@
+-VERSION = @VERSION@
+-abs_builddir = @abs_builddir@
(13667 more lines skipped)

_______________________________________________
MeeGo-commits mailing list
MeeGo-commits@meego.com
http://lists.meego.com/listinfo/meego-commits


[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic