merge with master tizen_2.1 2.1b_release accepted/tizen/20130520.101345 accepted/tizen_2.1/20130425.024955 submit/tizen/20130517.045322 submit/tizen_2.1/20130424.233600
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:19:02 +0000 (01:19 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:19:02 +0000 (01:19 +0900)
16 files changed:
config-tizen/AUTHORS [moved from config-slp/AUTHORS with 100% similarity]
config-tizen/Makefile.am [moved from config-slp/Makefile.am with 100% similarity]
config-tizen/autogen.sh [moved from config-slp/autogen.sh with 100% similarity]
config-tizen/configure.ac [moved from config-slp/configure.ac with 98% similarity]
config-tizen/module.desktop.in [moved from config-slp/module.desktop.in with 81% similarity]
config-tizen/src/Makefile.am [moved from config-slp/src/Makefile.am with 97% similarity]
config-tizen/src/e_mod_main.c [moved from config-slp/src/e_mod_main.c with 94% similarity]
config-tizen/src/e_mod_main.h [moved from config-slp/src/e_mod_main.h with 100% similarity]
debian/changelog [deleted file]
debian/compat [deleted file]
debian/control [deleted file]
debian/copyright [deleted file]
debian/e17-extra-config-modules.install [deleted file]
debian/jobs [deleted file]
debian/rules [deleted file]
packaging/e17-extra-config-modules.spec

similarity index 100%
rename from config-slp/AUTHORS
rename to config-tizen/AUTHORS
similarity index 98%
rename from config-slp/configure.ac
rename to config-tizen/configure.ac
index cf8fd82..9cfae11 100755 (executable)
@@ -13,7 +13,7 @@
 dnl ========================================================================
 # initialization
 dnl ========================================================================
-AC_INIT([config-slp], [0.1], [sgyun.kim@samsung.com])
+AC_INIT([config-tizen], [0.1], [sgyun.kim@samsung.com])
 
 # check for tools needed by automake generated Makefiles
 # -Wall  : Turn all warnings on.
similarity index 81%
rename from config-slp/module.desktop.in
rename to config-tizen/module.desktop.in
index 6cabe7f..aef32c4 100755 (executable)
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Link
-Name=config-slp
+Name=config-tizen
 Name[cs]=
 Name[de]=
 Name[eo]=
@@ -15,7 +15,7 @@ Name[tr]=
 Name[zh_CN]=
 Name[zh_TW]=
 Icon=e-module-clock
-Comment=<title>config-slp</title><br>Samsung elementary profile.
+Comment=<title>config-tizen</title><br>Tizen elementary profile.
 Comment[cs]=
 Comment[de]=
 Comment[eo]=
similarity index 97%
rename from config-slp/src/Makefile.am
rename to config-tizen/src/Makefile.am
index eb0abed..458f406 100644 (file)
@@ -1,5 +1,5 @@
 MAINTAINERCLEANFILES = Makefile.in
-MODULE = config-slp
+MODULE = config-tizen
 
 LDFLAGS += 
 #LDFLAGS += -lvconf -lappfwk
similarity index 94%
rename from config-slp/src/e_mod_main.c
rename to config-tizen/src/e_mod_main.c
index 510b01c..5d91822 100644 (file)
@@ -28,7 +28,6 @@
 #define ELM_FINGER_SIZE         60
 
 static int _e_elm_config_scale_update(void);
-
 /* this is needed to advertise a label for the module IN the code (not just
  * the .desktop file) but more specifically the api version it was compiled
  * for so E can skip modules that are compiled for an incorrect API version
@@ -98,7 +97,10 @@ _e_elm_config_scale_update (void)
 
 #if RESOLUTION_BASE
 
-   scale = ROUND_DOUBLE(target_width / BASE_LAYOUT_WIDTH_PX);
+   if (target_width < target_height)
+      scale = ROUND_DOUBLE(target_width / BASE_LAYOUT_WIDTH_PX);
+   else
+      scale = ROUND_DOUBLE(target_height / BASE_LAYOUT_WIDTH_PX);
 
 #else // DPI BASE
    double target_inch, target_dpi, base_dpi;
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644 (file)
index 3e15790..0000000
+++ /dev/null
@@ -1,144 +0,0 @@
-e17-extra-private-modules (0.1.18) unstable; urgency=low
-
-  * Change to save profile in every rebooting time.
-  * Remove zone_del process.
-  * Git: slp/pkgs/e/e17-extra-private-modules
-  * Tag: e17-extra-private-modules_0.1.18
-
- -- Seunggyun Kim <sgyun.kim@samsung.com>  Fri, 13 Jul 2012 16:41:44 +0900
-
-e17-extra-private-modules (0.1.17) unstable; urgency=low
-
-  * Change profile name from extension to desktop
-  * Git: slp/pkgs/e/e17-extra-private-modules
-  * Tag: e17-extra-private-modules_0.1.17
-
- -- Seunggyun Kim <sgyun.kim@samsung.com>  Mon, 18 Jun 2012 14:13:58 +0900
-
-e17-extra-private-modules (0.1.16) unstable; urgency=low
-
-  * Change '.elementary' directory and sub files owner to support profile saving in setting app
-  * Git: slp/pkgs/e/e17-extra-private-modules
-  * Tag: e17-extra-private-modules_0.1.16
-
- -- Seunggyun Kim <sgyun.kim@samsung.com>  Tue, 12 Jun 2012 10:45:06 +0900
-
-e17-extra-private-modules (0.1.15) unstable; urgency=low
-
-  * Package Upload
-  * Git: slp/pkgs/e/e17-extra-private-modules
-  * Tag: e17-extra-private-modules_0.1.15
-
- -- Seunggyun Kim <sgyun.kim@samsung.com>  Thu, 07 Jun 2012 17:23:31 +0900
-
-e17-extra-private-modules (0.1.14) unstable; urgency=low
-
-  * Fix access set problem
-  * Git: slp/pkgs/e/e17-extra-private-modules
-  * Tag: e17-extra-private-modules_0.1.14
-
- -- Seungyun Kim <sgyun.kim@samsung.com>  Thu, 07 Jun 2012 16:38:28 +0900
-
-e17-extra-private-modules (0.1.13) unstable; urgency=low
-
-  * Support desktop mode
-  * Git: slp/pkgs/e/e17-extra-private-modules
-  * Tag: e17-extra-private-modules_0.1.13
-
- -- Seunggyun Kim <sgyun.kim@samsung.com>  Wed, 30 May 2012 17:48:55 +0900
-
-e17-extra-private-modules (0.1.12) unstable; urgency=low
-
-  * Package Upload
-  * Git: slp/pkgs/e/e17-extra-private-modules
-  * Tag: e17-extra-private-modules_0.1.12
-
- -- Jeonghyun Yun <jh0506.yun@samsung.com>  Fri, 27 Apr 2012 13:57:56 +0900
-
-e17-extra-private-modules (0.1-11) unstable; urgency=low
-
-  * Add target inch round calculation
-  * Git: slp/pkgs/e/e17-extra-private-modules
-  * Tag: e17-extra-private-modules_0.1-11
-
- -- Seunggyun Kim <sgyun.kim@samsung.com>  Thu, 23 Feb 2012 17:39:15 +0900
-
-e17-extra-private-modules (0.1-10) unstable; urgency=low
-
-  * Add Samsung Proprietary Boiler Plate
-  * Git: slp/pkgs/e/e17-extra-private-modules
-  * Tag: e17-extra-private-modules_0.1-10
-
- -- Seunggyun Kim <sgyun.kim@samsung.com>  Tue, 21 Feb 2012 11:30:19 +0900
-
-e17-extra-private-modules (0.1-9) unstable; urgency=low
-
-  * Make /opt/etc/.profile_ready file after profile saving finished
-  * Git: slp/pkgs/e/e17-extra-private-modules
-  * Tag: e17-extra-private-modules_0.1-9
-  
- -- Seunggyun Kim <sgyun.kim@samsung.com>  Tue, 31 Jan 2012 17:32:49 +0900
-
-e17-extra-private-modules (0.1-8) unstable; urgency=low
-
-  * Add temp patch for Proxima target
-  * Git: slp/pkgs/e/e17-extra-private-modules
-  * Tag: e17-extra-private-modules_0.1-8
-
- -- Seunggyun Kim <sgyun.kim@samsung.com>  Thu, 26 Jan 2012 12:23:37 +0900
-
-e17-extra-private-modules (0.1-7) unstable; urgency=low
-
-  * Change stat function to lstat for filtering symbolic link
-  * Git: slp/pkgs/e/e17-extra-private-modules
-  * Tag: e17-extra-private-modules_0.1-7
-
- -- Seunggyun Kim <sgyun.kim@samsung.com>  Thu, 19 Jan 2012 18:14:37 +0900
-
-e17-extra-private-modules (0.1-6) unstable; urgency=low
-
-  * Change /opt/home/ directory finding routine
-  * Git: slp/pkgs/e/e17-extra-private-modules
-  * Tag: e17-extra-private-modules_0.1-6
-
- -- Seunggyun Kim <sgyun.kim@samsung.com>  Thu, 19 Jan 2012 16:10:09 +0900
-
-e17-extra-private-modules (0.1-5) unstable; urgency=low
-
-  * Add each owner's base config file saving routine
-  * Git: slp/pkgs/e/e17-extra-private-modules
-  * Tag: e17-extra-private-modules_0.1-5
-
- -- Seunggyun Kim <sgyun.kim@samsung.com>  Tue, 17 Jan 2012 15:15:54 +0900
-
-e17-extra-private-modules (0.1-4) unstable; urgency=low
-
-  * Add target distance adjustment routine
-  * Git: slp/pkgs/e/e17-extra-private-modules
-  * Tag: e17-extra-private-modules_0.1-4
-
- -- Seunggyun Kim <sgyun.kim@samsung.com>  Tue, 10 Jan 2012 20:08:10 +0900
-
-e17-extra-private-modules (0.1-3) unstable; urgency=low
-
-  * Package Upload
-  * Git: slp/pkgs/e/e17-extra-private-modules
-  * Tag: e17-extra-private-modules_0.1-3
-
- -- Seunggyun Kim <sgyun.kim@samsung.com>  Thu, 05 Jan 2012 17:02:48 +0900
-
-e17-extra-private-modules (0.1-2) unstable; urgency=low
-
-  * Package Upload
-  * Git: slp/pkgs/e/e17-extra-private-modules
-  * Tag: e17-extra-private-modules_0.1-2
-
- -- Seunggyun Kim <sgyun.kim@samsung.com>  Thu, 29 Dec 2011 18:05:55 +0900
-
-e17-extra-private-modules (0.1-1) unstable; urgency=low
-
-  * Initial release for e17-extra-private-modules (config-slp)
-  * Git: slp/pkgs/e/e17-extra-private-modules
-  * Tag: e17-extra-private-modules_0.1-1
-
- -- Seunggyun Kim <sgyun.kim@samsung.com>  Wed, 21 Dec 2011 13:19:48 +0900
diff --git a/debian/compat b/debian/compat
deleted file mode 100644 (file)
index 7ed6ff8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/debian/control b/debian/control
deleted file mode 100644 (file)
index 120fc89..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-Source: e17-extra-config-modules
-Priority: extra
-Maintainer: Seunggyun Kim <sgyun.kim@samsung.com>, Sohyun Kim <anna1014.kim@samsung.com>, Doyoun Kang <doyoun.kang@samsung.com>, Myoungwoon Kim <myoungwoon.kim@samsung.com>
-Build-Depends: debhelper (>= 5), e17-dev, libslp-utilx-dev, libelm-dev, dlog-dev
-Standards-Version: 3.8.3
-Section: libs
-
-Package: e17-extra-config-modules
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: The E17 Extra Config Modules
- The E17 extra config modules consists of modules made by SAMSUNG.
-
-Package: e17-extra-config-modules-dbg
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: The debug version of E17 Extra Config Modules
- The E17 extra config modules consists of modules made by SAMSUNG.
-
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/debian/e17-extra-config-modules.install b/debian/e17-extra-config-modules.install
deleted file mode 100755 (executable)
index a7b273a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/enlightenment/modules/*/*/*.so
diff --git a/debian/jobs b/debian/jobs
deleted file mode 100755 (executable)
index e69de29..0000000
diff --git a/debian/rules b/debian/rules
deleted file mode 100755 (executable)
index 31d1d48..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/usr/bin/make -f
-# debian/rules for the Debian xutils package.
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>
-# Copyright © 2005 Daniel Stone <daniel@fooishbar.org>
-# Copyright © 2005 David Nusinow <dnusinow@debian.org>
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# set this to the name of the main shlib's binary package
-PACKAGE = e17-extra-config-modules
-PREFIX ?= /usr
-
-#include debian/xsfbs/xsfbs.mk
-
-# This package contains multiple modules as shipped by upstream. Each module is # contained in a subdirectory in the root dir of the package. You must list each
-# subdirectory explicitly so that the build system knows what to build
-DEF_SUBDIRS= config-slp
-SUBDIRS=$(DEF_SUBDIRS)
-BUILD_STAMPS = $(addprefix $(STAMP_DIR)/build-,$(SUBDIRS))
-
-CFLAGS = -Wall -g -fPIC -rdynamic
-CXXFLAGS += -fPIC
-LDFLAGS += -Wl,--hash-style=both -Wl,--as-needed -Wl,--rpath=$(PREFIX)/lib
-
-# Machine name
-MACHINE_NAME=$(shell uname -m)
-
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-       CFLAGS += -O0
-else
-       CFLAGS += -O2
-endif
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-       NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-       MAKEFLAGS += -j$(NUMJOBS)
-endif
-
-ifeq ($(MACHINE_NAME), arm)
-       CFLAGS  += -D_ENV_ARM
-endif
-
-DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-       confflags += --build=$(DEB_HOST_GNU_TYPE)
-else
-       confflags += --build=$(DEB_HOST_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
-endif
-
-build:
-       >$@
-       for FILE in $(SUBDIRS); do \
-               mkdir -p "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) ; \
-               cd "$$FILE" && ./autogen.sh && cd ..; \
-               cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) && ../"$$FILE"/configure --prefix=/usr "$(confflags)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" && $(MAKE) || exit ; \
-               cd ..; \
-       done
-       >$@
-
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp
-
-       rm -f config.cache config.log config.status
-       rm -f */config.cache */config.log */config.status
-       rm -f conftest* */conftest*
-       rm -rf autom4te.cache */autom4te.cache
-       rm -rf *-obj-*
-       rm -f build
-
-       dh_clean
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k
-       dh_installdirs
-
-       for FILE in $(SUBDIRS); do \
-               cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install ; \
-               cd ..; \
-       done
-
-# Build architecture-dependent files here.
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-
-       dh_installdocs
-       dh_install --sourcedir=debian/tmp --list-missing
-       dh_installmenu
-       dh_installchangelogs
-       dh_link
-       dh_strip --dbg-package=$(PACKAGE)-dbg
-       dh_compress
-       dh_fixperms
-       dh_installdeb
-       dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-# Build architecture-independent files here.
-binary-indep: build install
-# Nothing to do
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
index 7f54673..3d663e7 100644 (file)
@@ -1,6 +1,6 @@
 Name:           e17-extra-config-modules
 Summary:        The E17 Extra Config Modules
-Version:        0.1.28r01
+Version:        0.1.28
 Release:        1
 Group:          Graphical desktop/Enlightenment
 License:        BSD
@@ -28,7 +28,7 @@ export LDFLAGS+=" -Wl,--hash-style=both -Wl,--as-needed -Wl,--rpath=/usr/lib"
 export CFLAGS+=" -D_ENV_ARM"
 %endif
 
-for FILE in config-slp
+for FILE in config-tizen
 do
         (cd $FILE && ./autogen.sh && ./configure --prefix=/usr && make )
 done
@@ -39,7 +39,7 @@ rm -rf %{buildroot}
 mkdir -p %{buildroot}/usr/share/license
 cp %{_builddir}/%{buildsubdir}/LICENSE %{buildroot}/usr/share/license/%{name}
 
-for FILE in config-slp
+for FILE in config-tizen
 do
         (cd $FILE && %make_install )
 done
@@ -47,6 +47,6 @@ done
 
 %files
 %defattr(-,root,root,-)
-%{_libdir}/enlightenment/modules/config-slp/*
+%{_libdir}/enlightenment/modules/config-tizen/*
 /usr/share/license/%{name}
 %manifest %{name}.manifest