tizen 2.3 release

diff --git a/LICENSE b/LICENSE
index bbe9d02..f0fd1f1 100755 (executable)
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.\r
+Copyright (c) 2011 - 2014 Samsung Electronics Co., Ltd. All rights reserved.\r
 \r
                                  Apache License\r
                            Version 2.0, January 2004\r

diff --git a/copyright b/copyright
index 0de89cf..377d507 100644 (file)
--- a/copyright
+++ b/copyright
@@ -1,7 +1,7 @@
 /*
  * default-fonts-fc-sdk
  *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2011 - 2014 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Contact: Minsu Han <minsu81.han@samsung.com>
  * 

diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644 (file)
index 078e0c2..0000000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,6 +0,0 @@
-default-fonts-fc-sdk for Debian
--------------------------------
-
-<possible notes regarding this package - if none, delete this file>
-
- -- Minsu Han <minsu81.han@samsung.com>  Thu, 09 Sep 2010 20:53:06 +0900

diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644 (file)
index 12b41d9..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,39 +0,0 @@
-default-fonts-fc-sdk (0.0.2-3) unstable; urgency=low
-
-  * Modify Maintainer 
-  * Git: 165.213.180.234:slp/sdk/default-fonts-fc-sdk
-  * Tag: default-fonts-fc-sdk_0.0.2-3
-
- -- Minsu Han <minsu81.han@samsung.com>  Tue, 06 Dec 2011 18:13:06 +0900
-
-default-fonts-fc-sdk (0.0.2-2) unstable; urgency=low
-
-  * Remove default-fonts-sdk dependency 
-  * Git: 165.213.180.234:slp/sdk/default-fonts-fc-sdk
-  * Tag: default-fonts-fc-sdk_0.0.2-2
-
- -- Minsu Han <minsu81.han@samsung.com>  Mon, 29 Aug 2011 10:00:03 +0900
-
-default-fonts-fc-sdk (0.0.2-1) unstable; urgency=low
-
-  * Version up for dupload 
-  * Git: 165.213.180.234:slp/sdk/default-fonts-fc-sdk
-  * Tag: default-fonts-fc-sdk_0.0.2-1
-
- -- Minsu Han <minsu81.han@samsung.com>  Thu, 11 Aug 2011 17:56:21 +0900
-
-default-fonts-fc-sdk (0.0.1-2) unstable; urgency=low
-
-  * Rename default-fonts-fc-slp to default-fonts-fc-sdk
-  * Git: 165.213.180.234:slp/sdk/default-fonts-fc-sdk
-  * Tag: default-fonts-fc-sdk_0.0.1-2
-
- -- Minsu Han <minsu81.han@samsung.com>  Thu, 11 Aug 2011 15:11:47 +0900
-
-default-fonts-fc-sdk (0.0.1-1) unstable; urgency=low
-
-  * Initial release
-  * Git: 165.213.180.234:slp/sdk/default-fonts-fc-sdk
-  * Tag: default-fonts-fc-sdk_0.0.1-1
-
- -- MyoungWoon Roy Kim <myoungwoon.kim@samsung.com>  Tue, 11 Jan 2011 20:22:57 +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 7d8a0cf..0000000
--- a/debian/control
+++ /dev/null
@@ -1,14 +0,0 @@
-Source: default-fonts-fc-sdk
-Section: misc
-Priority: extra
-Maintainer: Minsu Han <minsu81.han@samsung.com>
-Uploaders: Minsu Han <minsu81.han@samsung.com>
-Build-Depends: debhelper (>= 5)
-Standards-Version: 3.7.2
-Homepage: N/A
-
-Package: default-fonts-fc-sdk
-Section: misc
-Architecture: any
-Description: Font configuration package for fontconfig
- This package is maintained by SDK team

diff --git a/debian/default-fonts-fc-sdk.install b/debian/default-fonts-fc-sdk.install
deleted file mode 100644 (file)
index aa796c6..0000000
--- a/debian/default-fonts-fc-sdk.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/etc/fonts/conf.d/*
-usr/etc/fonts/conf.avail/*

diff --git a/debian/default-fonts-fc-sdk.postinst b/debian/default-fonts-fc-sdk.postinst
deleted file mode 100644 (file)
index d50cb31..0000000
--- a/debian/default-fonts-fc-sdk.postinst
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-FONT_FILES="99-slp.conf"
-
-if [ ${USER} == "root" ]
-then
-       # Change file owner
-       # Font files
-       for file in `echo $FONT_FILES`
-       do
-               chown root:root /usr/etc/fonts/conf.d/$file
-       done
-fi
-
-# Font files
-for file in `echo $FONT_FILES`
-do
-       chmod 644 /usr/etc/fonts/conf.d/$file
-done
-

diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644 (file)
index ca882bb..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin

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

diff --git a/debian/rules b/debian/rules
deleted file mode 100755 (executable)
index f41458e..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,85 +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
-
-INSTALL_DIR = $(CURDIR)/debian/tmp
-CONFIG_NAME = 99-slp.conf
-
-configure: configure-stamp
-
-configure-stamp:
-       touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp: configure-stamp 
-
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp configure-stamp
-
-       # Add here commands to clean up after the build process.
-       -rm -rf $(INSTALL_DIR) clean
-       -rm -rf $(CURDIR)/debian/default-fonts-fc-sdk
-
-       dh_clean 
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k 
-       dh_installdirs
-
-       # Add here commands to install the package into debian/default-fonts-fc-slp.
-       mkdir -p $(INSTALL_DIR)/usr/etc/fonts/conf.d/
-       mkdir -p $(INSTALL_DIR)/usr/etc/fonts/conf.avail/ && cp -a $(CURDIR)/sdk_fonts_fc/* $(INSTALL_DIR)/usr/etc/fonts/conf.avail/
-       cd $(INSTALL_DIR)/usr/etc/fonts/conf.d/
-       ln -s ../conf.avail/$(CONFIG_NAME) $(INSTALL_DIR)/usr/etc/fonts/conf.d/$(CONFIG_NAME)
-
-
-# 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
-       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/default-fonts-fc-sdk.init.sh b/default-fonts-fc-sdk.init.sh
new file mode 100755 (executable)
index 0000000..0dc29a2
--- /dev/null
+++ b/default-fonts-fc-sdk.init.sh
@@ -0,0 +1 @@
+cp -p /usr/opt/etc/fonts/conf.avail/99-slp.conf /opt/etc/fonts/conf.avail/99-slp.conf

diff --git a/packaging/default-fonts-fc-sdk.manifest b/packaging/default-fonts-fc-sdk.manifest
index 042c40b..7bdc212 100644 (file)
--- a/packaging/default-fonts-fc-sdk.manifest
+++ b/packaging/default-fonts-fc-sdk.manifest
@@ -1,14 +1,5 @@
 <manifest>
-        <define>
-                <domain name="default-fonts-fc-sdk" policy="restricted" plist="settings"/>
-                <provide>
-                        <label name="default-fonts-fc-sdk::config"/>
-                </provide>
-        </define>
-        <request>
-                <domain name="_"/>
-        </request>
-        <assign>
-                <filesystem path="/opt/etc/fonts/conf.avail/99-slp.conf" label="default-fonts-fc-sdk::config"/>
-        </assign>
+    <request>
+     <domain name="_"/>
+  </request>
 </manifest>

diff --git a/packaging/default-fonts-fc-sdk.spec b/packaging/default-fonts-fc-sdk.spec
index 361a38d..089ee67 100644 (file)
--- a/packaging/default-fonts-fc-sdk.spec
+++ b/packaging/default-fonts-fc-sdk.spec
@@ -1,10 +1,10 @@
 #sbs-git:slp/sdk/default-fonts-fc-sdk default-fonts-fc-sdk 0.0.2 8414dbd3e62b6f7a864ba031e043dd7604b3d86d
 Name:       default-fonts-fc-sdk
 Summary:    Font configuration package for SDK
-Version:    0.0.2
-Release:    2
+Version:    0.0.4
+Release:    1
 Group:      TO_BE/FILLED_IN
-License:    Apache-2.0
+License:    Apache License, Version 2.0
 Source0:    %{name}-%{version}.tar.gz
 Source1001: packaging/default-fonts-fc-sdk.manifest
 Requires:    smack-utils
@@ -20,25 +20,27 @@ This package is maintained by SDK team
 cp %{SOURCE1001} .
 
 %install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}/usr/share/license
-cp LICENSE %{buildroot}/usr/share/license/%{name}
+export FONT_CONF_FILE="99-slp.conf"
 
-mkdir -p %{buildroot}%{_prefix}/etc/fonts/conf.d/
-mkdir -p %{buildroot}/opt/etc/fonts/conf.avail/ && cp -a sdk_fonts_fc/* %{buildroot}/opt/etc/fonts/conf.avail/
-cd %{buildroot}%{_prefix}/etc/fonts/conf.d/
-ln -s ../../../../opt/etc/fonts/conf.avail/99-slp.conf %{buildroot}%{_prefix}/etc/fonts/conf.d/99-slp.conf
+rm -rf %{buildroot}
+mkdir -p %{buildroot}/opt/etc/fonts/conf.avail/
+mkdir -p %{buildroot}/etc/opt/init/ && cp -a default-fonts-fc-sdk.init.sh %{buildroot}/etc/opt/init/
+mkdir -p %{buildroot}/usr/etc/fonts/conf.d/
+mkdir -p %{buildroot}/usr/opt/etc/fonts/conf.avail/ && cp -a sdk_fonts_fc/* %{buildroot}/usr/opt/etc/fonts/conf.avail/
+cd %{buildroot}/usr/etc/fonts/conf.d/
+ln -s ../../../../opt/etc/fonts/conf.avail/$FONT_CONF_FILE %{buildroot}/usr/etc/fonts/conf.d/$FONT_CONF_FILE
 
 %post
-chown :5000 /opt/etc/fonts/conf.avail/99-slp.conf
-chmod 664 /opt/etc/fonts/conf.avail/99-slp.conf
+chown root:app /usr/opt/etc/fonts/conf.avail/99-slp.conf
+chmod 664 /usr/opt/etc/fonts/conf.avail/99-slp.conf
+/etc/opt/init/default-fonts-fc-sdk.init.sh
 chsmack -a '*' /opt/etc/fonts/conf.avail/99-slp.conf
 
 %files
 %manifest default-fonts-fc-sdk.manifest
 %defattr(-,root,root,-)
-/opt/etc/fonts/conf.avail/99-slp.conf
-%{_prefix}/etc/fonts/conf.d/99-slp.conf
-%exclude %{_prefix}/etc/fonts/conf.d/documentation.list
-/usr/share/license/%{name}
-
+/usr/opt/etc/fonts/conf.avail/99-slp.conf
+/usr/etc/fonts/conf.d/99-slp.conf
+/etc/opt/init/default-fonts-fc-sdk.init.sh
+/opt/etc/fonts/conf.avail/
+%exclude /usr/etc/fonts/conf.d/documentation.list

diff --git a/sdk_fonts_fc/99-slp.conf b/sdk_fonts_fc/99-slp.conf
index 0cbf470..2c17d4b 100755 (executable)
--- a/sdk_fonts_fc/99-slp.conf
+++ b/sdk_fonts_fc/99-slp.conf
@@ -4,7 +4,7 @@
 <!--
   default-fonts-fc-sdk
  
-  Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
+  Copyright (c) 2011 - 2014 Samsung Electronics Co., Ltd. All rights reserved.
  
   Contact: Minsu Han <minsu81.han@samsung.com>
   
@@ -28,39 +28,10 @@
        <match target="pattern">
                <!-- check to see if the font is just regular -->
                <test qual="any" name="family">
-                       <string>SLP</string>
-               </test>
-               <edit name="family" mode="assign">
-                       <string>TizenSans</string>
-               </edit>
-       </match>
-
-       <match target="pattern">
-               <!-- check to see if the font is just regular -->
-               <test qual="any" name="family">
                        <string>Tizen</string>
                </test>
                <edit name="family" mode="assign">
                        <string>TizenSans</string>
                </edit>
        </match>
-
-       <match>
-               <test name="lang" compare="contains">
-                       <string>ko</string>
-               </test>
-               <test name="family">
-                       <string>TizenSans</string>
-               </test>
-               <edit name="family" mode="prepend">
-                       <string>TizenSansKorean</string>
-               </edit>
-       </match>
-
-       <alias binding="strong">
-       <family>TizenSans</family>
-               <prefer>
-                       <family>TizenSans</family>
-               </prefer>
-       </alias>
 </fontconfig>