tizen 2.3 release

diff --git a/Makefile.am b/Makefile.am
index 4cc473c..70647f5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,17 +32,11 @@ EXTRA_DIST = \
        README                          \
        HACKING                         \
        $(man_MANS)                     \
-       shared-mime-info.pc.in          \
        po/shared-mime-info.pot
 
 CLEANFILES = freedesktop.org.xml po/stamp-it
 DISTCLEANFILES = intltool-extract intltool-merge intltool-update
 
-pkgconfigdir = $(datadir)/pkgconfig
-pkgconfig_DATA = shared-mime-info.pc
-
-$(pkgconfig_DATA): config.status
-
 @INTLTOOL_XML_RULE@
 @INTLTOOL_DESKTOP_RULE@
 

diff --git a/Makefile.in b/Makefile.in
index cef347e..ae75b5f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -37,9 +37,9 @@ noinst_PROGRAMS = test-subclassing$(EXEEXT) $(am__EXEEXT_1)
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
        $(srcdir)/Makefile.in $(srcdir)/config.h.in \
-       $(srcdir)/shared-mime-info.pc.in $(top_srcdir)/configure \
        COPYING ChangeLog NEWS depcomp install-sh missing \
        mkinstalldirs
+
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -48,7 +48,6 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = shared-mime-info.pc
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
        "$(DESTDIR)$(packagesdir)" "$(DESTDIR)$(pkgconfigdir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
@@ -276,13 +275,10 @@ EXTRA_DIST = \
        README                          \
        HACKING                         \
        $(man_MANS)                     \
-       shared-mime-info.pc.in          \
        po/shared-mime-info.pot
 
 CLEANFILES = freedesktop.org.xml po/stamp-it
 DISTCLEANFILES = intltool-extract intltool-merge intltool-update
-pkgconfigdir = $(datadir)/pkgconfig
-pkgconfig_DATA = shared-mime-info.pc
 all: config.h
        $(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -338,8 +334,6 @@ $(srcdir)/config.h.in:  $(am__configure_deps)
 
 distclean-hdr:
        -rm -f config.h stamp-h1
-shared-mime-info.pc: $(top_builddir)/config.status $(srcdir)/shared-mime-info.pc.in
-       cd $(top_builddir) && $(SHELL) ./config.status $@
 install-binPROGRAMS: $(bin_PROGRAMS)
        @$(NORMAL_INSTALL)
        test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@@ -832,7 +826,6 @@ clean-generic:
        -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
        -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:

diff --git a/configure b/configure
index 96e0417..130e0b1 100755 (executable)
--- a/configure
+++ b/configure
@@ -6813,7 +6813,7 @@ fi
 
 
 
-ac_config_files="$ac_config_files Makefile shared-mime-info.pc po/Makefile.in"
+ac_config_files="$ac_config_files Makefile po/Makefile.in"
 
 
 cat >confcache <<\_ACEOF

diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
index e423b74..845e031 100755 (executable)
--- a/freedesktop.org.xml.in
+++ b/freedesktop.org.xml.in
@@ -140,6 +140,10 @@ command to generate the output files.
     <glob pattern="*.bin"/>
     <!-- requested by zzoon.ko of media server part -->
     <glob pattern="*.ldp"/>
+    <!-- requested by s/w verification -->
+    <glob pattern="*.pmd"/>
+    <!-- requested by s/w verification -->
+    <glob pattern="*.qcp"/>
   </mime-type>
   <mime-type type="application/oda">
     <_comment>ODA document</_comment>
@@ -1965,9 +1969,14 @@ command to generate the output files.
     <generic-icon name="package-x-generic"/>
     <glob pattern="*.lhz"/>
   </mime-type>
-  <mime-type type="application/x-linguist">
+  <mime-type type="text/vnd.trolltech.linguist">
     <_comment>message catalog</_comment>
+    <sub-class-of type="application/xml"/>
+    <magic>
+      <match type="string" value="&lt;TS" offset="0:256"/>
+    </magic>
     <glob pattern="*.ts"/>
+    <alias type="application/x-linguist"/>
   </mime-type>
   <mime-type type="application/x-lyx">
     <_comment>LyX document</_comment>
@@ -3167,10 +3176,8 @@ command to generate the output files.
   </mime-type>
   <mime-type type="audio/x-riff">
     <_comment>RIFF audio</_comment>
-    <!-- need to be lower prio than avi -->
-    <magic priority="45">
-      <match type="string" value="RIFF" offset="0"/>
-    </magic>
+    <!-- Removed RIFF match string requested by s/w verification.
+         Mime for RIFF(esp avi file) need to be video. -->
   </mime-type>
   <mime-type type="audio/x-s3m">
     <_comment>Scream Tracker 3 audio</_comment>
@@ -3869,9 +3876,9 @@ command to generate the output files.
   <mime-type type="application/x-navi-animation">
     <_comment>Windows animated cursor</_comment>
     <magic priority="50">
-      <match type="string" value="RIFF" offset="0">
+        <!-- Removed RIFF match string requested by s/w verification.
+             Mime for RIFF(esp avi file) need to be video. -->
         <match type="string" value="ACON" offset="8"/>
-      </match>
     </magic>
     <glob pattern="*.ani"/>
   </mime-type>
@@ -4794,6 +4801,24 @@ command to generate the output files.
   <mime-type type="video/isivideo">
     <_comment>ISI video</_comment>
   </mime-type>
+  <mime-type type="video/mp2t">
+    <_comment>MPEG-2 transport stream</_comment>
+    <acronym>MPEG-2 TS</acronym>
+    <expanded-acronym>Moving Picture Experts Group 2 Transport Stream</expanded-acronym>
+    <magic priority="50">
+      <match type="big32" value="0x47400010" mask="0xff4000df" offset="0"/>
+    </magic>
+    <glob pattern="*.m2t"/>
+    <glob pattern="*.m2ts"/>
+    <glob pattern="*.ts"/>
+    <glob pattern="*.mts"/>
+    <glob pattern="*.cpi"/>
+    <glob pattern="*.clpi"/>
+    <glob pattern="*.mpl"/>
+    <glob pattern="*.mpls"/>
+    <glob pattern="*.bdm"/>
+    <glob pattern="*.bdmv"/>
+  </mime-type>
   <mime-type type="video/mpeg">
     <_comment>MPEG video</_comment>
     <acronym>MPEG</acronym>
@@ -4801,14 +4826,14 @@ command to generate the output files.
     <magic priority="50">
       <match type="string" value="\x47\x3f\xff\x10" offset="0"/>
       <match type="big32" value="0x000001b3" offset="0"/>
-      <match type="big32" value="0x000001ba" offset="0"/>
+      <!--Issue : *.sub file is recognized as video/mpeg because of below match info. Below match info is commented requested by s/w verification-->
+      <!--match type="big32" value="0x000001ba" offset="0"/-->
     </magic>
     <glob pattern="*.mpeg"/>
     <glob pattern="*.mpg"/>
     <glob pattern="*.mp2"/>
     <glob pattern="*.mpe"/>
     <glob pattern="*.vob"/>
-    <glob pattern="*.m2t"/>
   </mime-type>
   <mime-type type="video/quicktime">
     <_comment>QuickTime video</_comment>
@@ -5131,5 +5156,11 @@ command to generate the output files.
     </treemagic>
   </mime-type>
 
+  <!-- New mime type for S Note requested by bg47.kim -->
+  <mime-type type="application/snb">
+    <_comment>Samsung S Note file</_comment>
+    <glob pattern="*.snb"/>
+  </mime-type>
+
 </mime-info>
 

diff --git a/packaging/shared-mime-info.spec b/packaging/shared-mime-info.spec
index dfebc9a..8a7ecaa 100644 (file)
--- a/packaging/shared-mime-info.spec
+++ b/packaging/shared-mime-info.spec
@@ -1,7 +1,7 @@
 Name:       shared-mime-info
 Summary:    FreeDesktop.org shared MIME database and spec
 Version:    0.60
-Release:    13
+Release:    26
 Group:      misc
 License:    GPLv2
 Source0:    shared-mime-info-0.60.tar.gz
@@ -32,6 +32,11 @@ rm -rf %{buildroot}
 mkdir -p %{buildroot}/usr/share/license
 install  COPYING %{buildroot}/usr/share/license/%{name}
 
+%posttrans
+#remove xml files for update-mime-database
+find /usr/share/mime -name *.xml -exec rm {} \;
+for NAME in `find /usr/share/mime -mindepth 1 -type d`; do rmdir $NAME; done
+
 %files
 %defattr(-,root,root,-)
 /usr/bin/update-mime-database
@@ -39,6 +44,39 @@ install  COPYING %{buildroot}/usr/share/license/%{name}
 %manifest shared-mime-info.manifest
 
 %changelog
+* Wed Jun 4 2014 - Hyungdeuk Kim <hd3.kim@samsung.com>
+- Remove xml files that is not used anymore after image is created
+
+* Tue May 27 2014 - Hyungdeuk Kim <hd3.kim@samsung.com>
+- Rollback `remove po files`
+- Light resource will be handled by mic script
+
+* Fri May 23 2014 - Hyungdeuk Kim <hd3.kim@samsung.com>
+- Remove unused pc file for removing pkg-config requires dependency
+
+* Mon Apr 28 2014 - Hyungdeuk Kim <hd3.kim@samsung.com>
+- Remove po files because of pkg size
+
+* Wed Nov 20 2013 - Hyungdeuk Kim <hd3.kim@samsung.com>
+- Add new mime type for S Note file(*.snb)
+- Requested by bg47.kim
+- Diable "0x00~1ba" match data for video/mpeg
+- Issue : *.sub file is recognized as video/mpeg
+- Requested by s/w verification
+
+* Wed Nov 6 2013 - Hyungdeuk Kim <hd3.kim@samsung.com>
+- Add pmd extenstion file to unknown mime type
+- Add qcp extenstion file to unknown mime type
+- Requested by s/w verification
+
+* Wed Nov 6 2013 - Hyungdeuk Kim <hd3.kim@samsung.com>
+- change RIFF string magic priority of audio for recognizing mime type of RIFF as video
+- Requested by s/w verification
+
+* Sat Oct 5 2013 - Hyungdeuk Kim <hd3.kim@samsung.com>
+- Merge latest share mime info(ver 1.2) related ts ext file
+- Requested by media server
+
 * Thu Jun 20 2013 - Hyungdeuk Kim <hd3.kim@samsung.com>
 - Merge latest shared mime info(ver 1.1) related audio/aac
 

diff --git a/shared-mime-info.manifest b/shared-mime-info.manifest
index 75b0fa5..7d3a133 100644 (file)
--- a/shared-mime-info.manifest
+++ b/shared-mime-info.manifest
@@ -2,4 +2,7 @@
     <request>
         <domain name="_"/>
     </request>
+    <assign>
+        <filesystem path="/usr/bin/update-mime-database" exec_label="none" />
+    </assign>
 </manifest>

diff --git a/shared-mime-info.pc.in b/shared-mime-info.pc.in
deleted file mode 100644 (file)
index d8a757c..0000000
--- a/shared-mime-info.pc.in
+++ /dev/null
@@ -1,8 +0,0 @@
-prefix=@prefix@
-
-Name: shared-mime-info
-Description: Freedesktop common MIME database
-Version: @VERSION@
-Requires:
-Libs:
-Cflags: