Merge lp:~pishuilu1128/ubuntukylin-default-settings/ubuntukylin-default-settings into lp:~ubuntukylin-members/ubuntukylin-default-settings/trunk

[Huan Peng]

[Huan Peng (penghuanmail)]

review: Approve

=== added file 'debian/20_ubuntukylin-default-settings.gschema.override'
--- debian/20_ubuntukylin-default-settings.gschema.override	1970-01-01 00:00:00 +0000
+++ debian/20_ubuntukylin-default-settings.gschema.override	2013-01-25 08:14:19 +0000
@@ -0,0 +1,6 @@
+[org.gnome.nautilus.desktop]
+home-icon-visible=true
+trash-icon-visible=true
+volumes-visible=true
+
+

=== added file 'debian/20_ubuntukylin-default-settings.gschema.xml'
--- debian/20_ubuntukylin-default-settings.gschema.xml	1970-01-01 00:00:00 +0000
+++ debian/20_ubuntukylin-default-settings.gschema.xml	2013-01-25 08:14:19 +0000
@@ -0,0 +1,291 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+  <enum id="org.gnome.nautilus.SpeedTradeoff">
+    <value value="0" nick="always"/>
+    <value value="1" nick="local-only"/>
+    <value value="2" nick="never"/>
+  </enum>
+
+  <enum id="org.gnome.nautilus.ClickPolicy">
+    <value value="0" nick="single"/>
+    <value value="1" nick="double"/>
+  </enum>
+
+  <enum id="org.gnome.nautilus.ActivationChoice">
+    <value value="0" nick="launch"/>
+    <value value="1" nick="display"/>
+    <value value="2" nick="ask"/>
+  </enum>
+
+  <enum id="org.gnome.nautilus.FolderView">
+    <value value="0" nick="icon-view"/>
+    <value value="1" nick="list-view"/>
+  </enum>
+
+  <enum id="org.gnome.nautilus.SortOrder">
+    <value value="0" nick="manually"/>
+    <value value="1" nick="name"/>
+    <value value="2" nick="size"/>
+    <value value="3" nick="type"/>
+    <value value="4" nick="mtime"/>
+    <value value="5" nick="atime"/>
+    <value value="6" nick="trash-time"/>
+  </enum>
+
+  <enum id="org.gnome.nautilus.ZoomLevel">
+    <value value="0" nick="smallest"/>
+    <value value="1" nick="smaller"/>
+    <value value="2" nick="small"/>
+    <value value="3" nick="standard"/>
+    <value value="4" nick="large"/>
+    <value value="5" nick="larger"/>
+    <value value="6" nick="largest"/>
+  </enum>
+
+  <enum id="org.gnome.nautilus.TabPosition">
+    <value value="0" nick="after-current-tab"/>
+    <value value="1" nick="end"/>
+  </enum>
+
+  <schema path="/org/gnome/nautilus/" id="org.gnome.nautilus" gettext-domain="nautilus">
+    <child schema="org.gnome.nautilus.preferences" name="preferences"/>
+    <child schema="org.gnome.nautilus.icon-view" name="icon-view"/>
+    <child schema="org.gnome.nautilus.list-view" name="list-view"/>
+    <child schema="org.gnome.nautilus.desktop" name="desktop"/>
+    <child schema="org.gnome.nautilus.window-state" name="window-state"/>
+  </schema>
+
+  <schema path="/org/gnome/nautilus/preferences/" id="org.gnome.nautilus.preferences" gettext-domain="nautilus">
+    <key name="tabs-open-position" enum="org.gnome.nautilus.TabPosition">
+      <aliases>
+	<alias value='after_current_tab' target='after-current-tab'/>
+      </aliases>
+      <default>'after-current-tab'</default>
+      <summary>Where to position newly open tabs in browser windows.</summary>
+      <description>If set to "after-current-tab", then new tabs are inserted after the current tab. If set to "end", then new tabs are appended to the end of the tab list.</description>
+    </key>
+    <key type="b" name="always-use-location-entry">
+      <default>false</default>
+      <summary>Always use the location entry, instead of the pathbar</summary>
+      <description>If set to true, then Nautilus browser windows will always use a textual input entry for the location toolbar, instead of the pathbar.</description>
+    </key>
+    <key type="b" name="confirm-trash">
+      <default>true</default>
+      <summary>Whether to ask for confirmation when deleting files, or emptying Trash</summary>
+      <description>If set to true, then Nautilus will ask for confirmation when you attempt to delete files, or empty the Trash.</description>
+    </key>
+    <key type="b" name="enable-delete">
+      <default>false</default>
+      <summary>Whether to enable immediate deletion</summary>
+      <description>If set to true, then Nautilus will have a feature allowing you to delete a file immediately and in-place, instead of moving it to the trash. This feature can be dangerous, so use caution.</description>
+    </key>
+    <key name="show-directory-item-counts" enum="org.gnome.nautilus.SpeedTradeoff">
+      <aliases><alias value='local_only' target='local-only'/></aliases>
+      <default>'local-only'</default>
+      <summary>When to show number of items in a folder</summary>
+      <description>Speed tradeoff for when to show the number of items in a folder. If set to "always" then always show item counts, even if the folder is on a remote server. If set to "local-only" then only show counts for local file systems. If set to "never" then never bother to compute item counts.</description>
+    </key>
+    <key name="click-policy" enum="org.gnome.nautilus.ClickPolicy">
+      <default>'double'</default>
+      <summary>Type of click used to launch/open files</summary>
+      <description>Possible values are "single" to launch files on a single click, or "double" to launch them on a double click.</description>
+    </key>
+    <key name="executable-text-activation" enum="org.gnome.nautilus.ActivationChoice">
+      <default>'display'</default>
+      <summary>What to do with executable text files when activated</summary>
+      <description>What to do with executable text files when they are activated (single or double clicked). Possible values are "launch" to launch them as programs, "ask" to ask what to do via a dialog, and "display" to display them as text files.</description>
+    </key>
+    <key type="b" name="install-mime-activation">
+      <default>true</default>
+      <summary>Show the package installer for unknown mime types</summary>
+      <description>Whether to show the user a package installer dialog in case an unknown mime type is opened, in order to search for an application to handle it.</description>
+    </key>
+    <key type="b" name="mouse-use-extra-buttons">
+      <default>true</default>
+      <summary>Use extra mouse button events in Nautilus' browser window</summary>
+      <description>For users with mice that have "Forward" and "Back" buttons, this key will determine if any action is taken inside of Nautilus when either is pressed.</description>
+    </key>
+    <key type="i" name="mouse-forward-button">
+      <default>9</default>
+      <summary>Mouse button to activate the "Forward" command in browser window</summary>
+      <description>For users with mice that have buttons for "Forward" and "Back", this key will set which button activates the "Forward" command in a browser window. Possible values range between 6 and 14.</description>
+    </key>
+    <key type="i" name="mouse-back-button">
+      <default>8</default>
+      <summary>Mouse button to activate the "Back" command in browser window</summary>
+      <description>For users with mice that have buttons for "Forward" and "Back", this key will set which button activates the "Back" command in a browser window. Possible values range between 6 and 14.</description>
+    </key>
+    <key name="show-image-thumbnails" enum="org.gnome.nautilus.SpeedTradeoff">
+      <aliases><alias value='local_only' target='local-only'/></aliases>
+      <default>'local-only'</default>
+      <summary>When to show thumbnails of files</summary>
+      <description>Speed tradeoff for when to show a file as a thumbnail. If set to "always" then always thumbnail, even if the folder is on a remote server. If set to "local-only" then only show thumbnails for local file systems. If set to "never" then never bother to thumbnail files, just use a generic icon. Despite what the name may suggest, this applies to any previewable file type.</description>
+    </key>
+    <key type="t" name="thumbnail-limit">
+      <default>10485760</default>
+      <summary>Maximum image size for thumbnailing</summary>
+      <description>Images over this size (in bytes) won't be thumbnailed. The purpose of this setting is to avoid thumbnailing large images that may take a long time to load or use lots of memory.</description>
+    </key>
+    <key type="b" name="sort-directories-first">
+      <default>false</default>
+      <summary>Show folders first in windows</summary>
+      <description>If set to true, then Nautilus shows folders prior to showing files in the icon and list views.</description>
+    </key>
+    <key name="default-sort-order" enum="org.gnome.nautilus.SortOrder">
+      <aliases>
+	<alias value='modification_date' target='mtime'/>
+      </aliases>
+      <default>'name'</default>
+      <summary>Default sort order</summary>
+      <description>The default sort-order for items in the icon view. Possible values are "name", "size", "type" and "mtime".</description>
+    </key>
+    <key type="b" name="default-sort-in-reverse-order">
+      <default>false</default>
+      <summary>Reverse sort order in new windows</summary>
+      <description>If true, files in new windows will be sorted in reverse order. ie, if sorted by name, then instead of sorting the files from "a" to "z", they will be sorted from "z" to "a"; if sorted by size, instead of being incrementally they will be sorted decrementally.</description>
+    </key>
+    <key name="default-folder-viewer" enum="org.gnome.nautilus.FolderView">
+      <aliases>
+        <alias value='icon_view' target='icon-view'/>
+        <alias value='compact_view' target='icon-view'/>
+        <alias value='compact-view' target='icon-view'/>
+        <alias value='list_view' target='list-view'/>
+      </aliases>
+      <default>'icon-view'</default>
+      <summary>Default folder viewer</summary>
+      <description>When a folder is visited this viewer is used unless you have selected another view for that particular folder. Possible values are "list-view", and "icon-view".</description>
+    </key>
+    <key type="b" name="show-hidden-files">
+      <default>false</default>
+      <summary>Whether to show hidden files</summary>
+      <description>If set to true, then hidden files are shown by default in the file manager. Hidden files are either dotfiles, listed in the folder's .hidden file or backup files ending with a tilde (~).</description>
+    </key>
+    <key type="ay" name="bulk-rename-tool">
+      <default>[]</default>
+      <summary>Bulk rename utility</summary>
+      <description>If set, Nautilus will append URIs of selected files and treat the result as a command line for bulk renaming. Bulk rename applications can register themselves in this key by setting the key to a space-separated string of their executable name and any command line options. If the executable name is not set to a full path, it will be searched for in the search path.</description>
+    </key>
+  </schema>
+
+  <schema path="/org/gnome/nautilus/icon-view/" id="org.gnome.nautilus.icon-view" gettext-domain="nautilus">
+    <key type="as" name="captions">
+      <default>[ 'none', 'size', 'date_modified' ]</default>
+      <summary>List of possible captions on icons</summary>
+      <description>A list of captions below an icon in the icon view and the desktop. The actual number of captions shown depends on the zoom level. Some possible values are: "size", "type", "date_modified", "owner", "group", "permissions", and "mime_type".</description>
+    </key>
+    <key name="default-zoom-level" enum="org.gnome.nautilus.ZoomLevel">
+      <default>'standard'</default>
+      <summary>Default icon zoom level</summary>
+      <description>Default zoom level used by the icon view.</description>
+    </key>
+    <key type="i" name="thumbnail-size">
+      <default>64</default>
+      <summary>Default Thumbnail Icon Size</summary>
+      <description>The default size of an icon for a thumbnail in the icon view.</description>
+    </key>
+    <key type="as" name="text-ellipsis-limit">
+      <default>[ '3' ]</default>
+      <summary>Text Ellipsis Limit</summary>
+      <description>A string specifying how parts of overlong file names should be replaced by ellipses, depending on the zoom level. Each of the list entries is of the form "Zoom Level:Integer". For each specified zoom level, if the given integer is larger than 0, the file name will not exceed the given number of lines. If the integer is 0 or smaller, no limit is imposed on the specified zoom level. A default entry of the form "Integer" without any specified zoom level is also allowed. It defines the maximum number of lines for all other zoom levels. Examples: 0 - always display overlong file names; 3 - shorten file names if they exceed three lines; smallest:5,smaller:4,0 - shorten file names if they exceed five lines for zoom level "smallest". Shorten file names if they exceed four lines for zoom level "smaller". Do not shorten file names for other zoom levels. Available zoom levels: smallest (33%), smaller (50%), small (66%), standard (100%), large (150%), larger (200%), largest (400%)</description>
+    </key>
+  </schema>
+
+  <schema path="/org/gnome/nautilus/list-view/" id="org.gnome.nautilus.list-view" gettext-domain="nautilus">
+    <key name="default-zoom-level" enum="org.gnome.nautilus.ZoomLevel">
+      <default>'small'</default>
+      <summary>Default list zoom level</summary>
+      <description>Default zoom level used by the list view.</description>
+    </key>
+    <key type="as" name="default-visible-columns">
+      <default>[ 'name', 'size', 'type', 'date_modified' ]</default>
+      <summary>Default list of columns visible in the list view</summary>
+      <description>Default list of columns visible in the list view.</description>
+    </key>
+    <key type="as" name="default-column-order">
+      <default>[ 'name', 'size', 'type', 'date_modified' ]</default>
+      <summary>Default column order in the list view</summary>
+      <description>Default column order in the list view.</description>
+    </key>
+  </schema>
+
+  <schema path="/org/gnome/nautilus/desktop/" id="org.gnome.nautilus.desktop" gettext-domain="nautilus">
+    <key type="s" name="font">
+      <default l10n="messages" context="desktop-font">''</default>
+      <summary>Desktop font</summary>
+      <description>The font _description used for the icons on the desktop.</description>
+    </key>
+    <key type="b" name="home-icon-visible">
+      <default>true</default>
+      <summary>Home icon visible on desktop</summary>
+      <description>If this is set to true, an icon linking to the home folder will be put on the desktop.</description>
+    </key>
+    <key type="b" name="trash-icon-visible">
+      <default>true</default>
+      <summary>Trash icon visible on desktop</summary>
+      <description>If this is set to true, an icon linking to the trash will be put on the desktop.</description>
+    </key>
+    <key type="b" name="volumes-visible">
+      <default>true</default>
+      <summary>Show mounted volumes on the desktop</summary>
+      <description>If this is set to true, icons linking to mounted volumes will be put on the desktop.</description>
+    </key>
+    <key type="b" name="network-icon-visible">
+      <default>false</default>
+      <summary>Network Servers icon visible on the desktop</summary>
+      <description>If this is set to true, an icon linking to the Network Servers view will be put on the desktop.</description>
+    </key>
+    <key type="s" name="home-icon-name">
+      <default>'我的文档'</default>
+      <summary>Desktop home icon name</summary>
+      <description>This name can be set if you want a custom name for the home icon on the desktop.</description>
+    </key>
+    <key type="s" name="trash-icon-name">
+      <default l10n="messages" context="trash-icon-name">'回收站'</default>
+      <summary>Desktop trash icon name</summary>
+      <description>This name can be set if you want a custom name for the trash icon on the desktop.</description>
+    </key>
+    <key type="s" name="network-icon-name">
+      <default l10n="messages" context="network-icon-name">'Network Servers'</default>
+      <summary>Network servers icon name</summary>
+      <description>This name can be set if you want a custom name for the network servers icon on the desktop.</description>
+    </key>
+    <key type="i" name="text-ellipsis-limit">
+      <default>3</default>
+      <summary>Text Ellipsis Limit</summary>
+      <description>An integer specifying how parts of overlong file names should be replaced by ellipses on the desktop. If the number is larger than 0, the file name will not exceed the given number of lines. If the number is 0 or smaller, no limit is imposed on the number of displayed lines.</description>
+    </key>
+    <key type="b" name="background-fade">
+      <default>true</default>
+      <summary>Fade the background on change</summary>
+      <description>If set to true, then Nautilus will use a fade effect to change the desktop background.</description>
+    </key>
+  </schema>
+
+  <schema path="/org/gnome/nautilus/window-state/" id="org.gnome.nautilus.window-state" gettext-domain="nautilus">
+    <key type="s" name="geometry">
+      <default>''</default>
+      <summary>The geometry string for a navigation window.</summary>
+      <description>A string containing the saved geometry and coordinates string for navigation windows.</description>
+    </key>
+    <key type="b" name="maximized">
+      <default>false</default>
+      <summary>Whether the navigation window should be maximized.</summary>
+      <description>Whether the navigation window should be maximized by default.</description>
+    </key>
+    <key type="i" name="sidebar-width">
+      <default>148</default>
+      <summary>Width of the side pane</summary>
+      <description>The default width of the side pane in new windows.</description>
+    </key>
+    <key type="b" name="start-with-location-bar">
+      <default>true</default>
+      <summary>Show location bar in new windows</summary>
+      <description>If set to true, newly opened windows will have the location bar visible.</description>
+    </key>
+    <key type="b" name="start-with-sidebar">
+      <default>true</default>
+      <summary>Show side pane in new windows</summary>
+      <description>If set to true, newly opened windows will have the side pane visible.</description>
+    </key>
+  </schema>
+</schemalist>

=== modified file 'debian/changelog'
--- debian/changelog	2013-01-25 07:52:42 +0000
+++ debian/changelog	2013-01-25 08:14:19 +0000
@@ -1,5 +1,13 @@
+<<<<<<< TREE
 ubuntukylin-default-settings (0.1) UNRELEASED; urgency=low
 
   * Initial release.
 
  -- Sebastien Bacher <[e-mail]>  Wed, 23 Jan 2013 16:13:16 +0100
+=======
+ubuntukylin-default-settings (0.1) UNRELEASED; urgency=low
+
+  * Initial release.
+
+ -- testpi <[e-mail]>  Thu, 24 Jan 2013 14:34:06 +0800
+>>>>>>> MERGE-SOURCE

=== modified file 'debian/control'
--- debian/control	2013-01-25 07:52:42 +0000
+++ debian/control	2013-01-25 08:14:19 +0000
@@ -1,9 +1,18 @@
 Source: ubuntukylin-default-settings
+<<<<<<< TREE
 Priority: optional
 Maintainer: Ubuntu Kylin Team <[e-mail]>
 Build-Depends: debhelper (>= 7.0.50~),
  ubuntu-defaults-builder
 Standards-Version: 3.9.4
+=======
+Section: metapackages
+Priority: optional
+Maintainer: testpi <[e-mail]>
+Build-Depends: debhelper (>= 7.0.50~),
+ ubuntu-defaults-builder
+Standards-Version: 3.9.3
+>>>>>>> MERGE-SOURCE
 
 Package: ubuntukylin-default-settings
 Architecture: all

=== modified file 'debian/copyright'
--- debian/copyright	2013-01-25 07:52:42 +0000
+++ debian/copyright	2013-01-25 08:14:19 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ubuntukylin-default-settings
 Upstream-Contact: Ubuntu Kylin Team <[e-mail]>
@@ -7,6 +8,17 @@
  Copyright (C) 2012-2013 Kylin Ltd
 License: GPL-3+
  This program is free software; you can redistribute it and/or modify
+=======
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ubuntukylin-default-settings
+Upstream-Contact: testpi <[e-mail]>
+
+Files: *
+Copyright:
+ Portions Copyright (C) 2011 Canonical Ltd.
+License: GPL-3+
+ This program is free software; you can redistribute it and/or modify
+>>>>>>> MERGE-SOURCE
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 3 of the License, or
  (at your option) any later version.

=== added file 'debian/ubuntukylin-default-settings.install'
--- debian/ubuntukylin-default-settings.install	1970-01-01 00:00:00 +0000
+++ debian/ubuntukylin-default-settings.install	2013-01-25 08:14:19 +0000
@@ -0,0 +1,4 @@
+debian/20_ubuntukylin-default-settings.gschema.override usr/share/glib-2.0/schemas
+debian/20_ubuntukylin-default-settings.gschema.xml usr/share/glib-2.0/schemas
+
+desktop/*.desktop etc/skel/桌面

=== renamed file 'debian/ubuntukylin-default-settings.install' => 'debian/ubuntukylin-default-settings.install.moved'
=== added file 'depends.txt'
--- depends.txt	1970-01-01 00:00:00 +0000
+++ depends.txt	2013-01-25 08:14:19 +0000
@@ -0,0 +1,36 @@
+# These packages will become dependencies of the generated defaults package, i.
+# e. will be installed by default on a customized image. Requirements for
+# official Ubuntu customization packages:
+# - They should not conflict to a default installation package, or add
+#   applications for a purpose which the default installation already has an
+#   application for. For example, don't add thunderbird or pidgin when we already
+#   have evolution or empathy
+# - They should preferably be in main. If they are not, consider writing a MIR,
+#   or add a justification to a comment in depends.txt or the changelog.
+#   Depending on universe packages will be a valid reason to reject an
+#   ubuntu-defaults package. 
+#
+# Format: arbitrarily many lines, one package name per line
+#
+# Example:
+# manpages-de
+
+# local services
+gwibber-service-sina
+gwibber-service-sohu
+unity-china-music-scope
+
+# subset of complete language support:
+cmap-adobe-gb1
+fonts-arphic-uming
+firefox-locale-zh-hans
+thunderbird-locale-zh-hans
+thunderbird-locale-zh-cn
+ibus-googlepinyin
+ibus-table-wubi
+ttf-wqy-zenhei
+ttf-arphic-ukai
+
+#default apps
+cheese
+smplayer

=== renamed file 'depends.txt' => 'depends.txt.moved'
=== added directory 'desktop'
=== renamed directory 'desktop' => 'desktop.moved'
=== added file 'desktop/background.jpg'
Binary files desktop/background.jpg	1970-01-01 00:00:00 +0000 and desktop/background.jpg	2013-01-25 08:14:19 +0000 differ
=== added file 'desktop/default-applications.txt'
--- desktop/default-applications.txt	1970-01-01 00:00:00 +0000
+++ desktop/default-applications.txt	2013-01-25 08:14:19 +0000
@@ -0,0 +1,97 @@
+# The following default association will either replace or be appended
+# to the existing applications system default for a given MIME type.
+# desktop files have to be provided without any extension.
+#
+# NotUbuntu: This may not be changed for Ubuntu localized images, only for
+# derivatives and OEM projects.
+#
+# Format: arbitrarily many lines with
+# MIMEtype desktopfile
+#
+# Example:
+# application/ogg banshee
+# x-scheme-handler/mailto thunderbird
+# x-foo/bar toto
+
+application/vnd.rn-realmedia smplayer
+application/x-extension-m4a smplayer
+application/x-extension-mp4 smplayer
+application/x-matroska smplayer
+application/x-shockwave-flash smplayer
+audio/3gpp smplayer
+audio/ac3 smplayer
+audio/AMR smplayer
+audio/AMR-WB smplayer
+audio/basic smplayer
+audio/midi smplayer
+audio/mp4 smplayer
+audio/mpeg smplayer
+audio/mpegurl smplayer
+audio/prs.sid smplayer
+audio/vnd.rn-realaudio smplayer
+audio/x-ape smplayer
+audio/x-gsm smplayer
+audio/x-it smplayer
+audio/x-m4a smplayer
+audio/x-matroska smplayer
+audio/x-mod smplayer
+audio/x-ms-asf smplayer
+audio/x-ms-asx smplayer
+audio/x-ms-wax smplayer
+audio/x-ms-wma smplayer
+audio/x-musepack smplayer
+audio/x-pn-aiff smplayer
+audio/x-pn-au smplayer
+audio/x-pn-realaudio smplayer
+audio/x-pn-realaudio-plugin smplayer
+audio/x-pn-wav smplayer
+audio/x-pn-windows-acm smplayer
+audio/x-realaudio smplayer
+audio/x-real-audio smplayer
+audio/x-sbc smplayer
+audio/x-speex smplayer
+audio/x-tta smplayer
+audio/x-wav smplayer
+audio/x-wavpack smplayer
+audio/x-xm smplayer
+image/vnd.rn-realpix smplayer
+misc/ultravox smplayer
+video/3gpp smplayer
+video/dv smplayer
+video/fli smplayer
+video/flv smplayer
+video/mp2t smplayer
+video/mp4 smplayer
+video/mp4v-es smplayer
+video/mpeg smplayer
+video/msvideo smplayer
+video/ogg smplayer
+video/quicktime smplayer
+video/vivo smplayer
+video/vnd.divx smplayer
+video/vnd.rn-realvideo smplayer
+video/vnd.vivo smplayer
+video/webm smplayer
+video/x-anim smplayer
+video/x-avi smplayer
+video/x-flc smplayer
+video/x-fli smplayer
+video/x-flic smplayer
+video/x-flv smplayer
+video/x-m4v smplayer
+video/x-matroska smplayer
+video/x-mpeg smplayer
+video/x-ms-asf smplayer
+video/x-ms-asx smplayer
+video/x-msvideo smplayer
+video/x-ms-wm smplayer
+video/x-ms-wmv smplayer
+video/x-ms-wmx smplayer
+video/x-ms-wvx smplayer
+video/x-nsv smplayer
+video/x-ogm+ogg smplayer
+video/x-theora+ogg smplayer
+video/x-smplayer-stream smplayer
+x-content/video-dvd smplayer
+x-content/video-vcd smplayer
+x-content/video-svcd smplayer

=== added file 'desktop/default-session.txt'
--- desktop/default-session.txt	1970-01-01 00:00:00 +0000
+++ desktop/default-session.txt	2013-01-25 08:14:19 +0000
@@ -0,0 +1,11 @@
+# Set the default desktop session for login managers. Right now lightdm and
+# gdm are supported.
+#
+# NotUbuntu: This may not be changed for Ubuntu localized images, only for
+# derivatives and OEM projects.
+#
+# Format: Single line with a session name. This must correspond to
+# /usr/share/xsessions/<name>.desktop
+#
+# Example:
+# ubuntu-2d

=== added file 'desktop/googlemail.desktop.example'
--- desktop/googlemail.desktop.example	1970-01-01 00:00:00 +0000
+++ desktop/googlemail.desktop.example	2013-01-25 08:14:19 +0000
@@ -0,0 +1,9 @@
+[Desktop Entry]
+# Example .desktop file for a web launcher
+Version=1.0
+Name=Google Mail
+Comment=http://googlemail.com
+Exec=/usr/bin/xdg-open http://googlemail.com
+Type=Application
+Icon=applications-mail
+Categories=GNOME;GTK;Application;

=== added file 'desktop/wps-office-et.desktop'
--- desktop/wps-office-et.desktop	1970-01-01 00:00:00 +0000
+++ desktop/wps-office-et.desktop	2013-01-25 08:14:19 +0000
@@ -0,0 +1,19 @@
+[Desktop Entry]
+Encoding=UTF-8
+Comment[zh_CN]=使用WPS表格分析、管理数据
+Comment=Use Kingsoft Spreadsheets to analyze manage data.
+Exec=/usr/bin/firefox %U archive.ubuntu.com/ubuntu/pool/main/a/aalib/libaa1-dbg_1.4p5-39ubuntu1_i386.deb
+GenericName[zh_CN]=
+GenericName=
+MimeType=application/x-et;application/x-ett;application/x-xls;application/x-xlt;application/x-xlsx;application/x-xltx;application/vnd.ms-excel;application/msexcel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.openxmlformats-officedocument.spreadsheetml.template;
+Name[zh_CN]=WPS表格
+Name=Kingsoft Spreadsheets
+StartupNotify=false
+Terminal=false
+TerminalOptions=
+Type=Application
+X-DBUS-ServiceName=
+X-DBUS-StartupType=
+X-KDE-SubstituteUID=false
+X-KDE-Username=
+Icon=/opt/kingsoft/wps-office/office6/icons/etmain.png

=== added file 'desktop/wps-office-wpp.desktop'
--- desktop/wps-office-wpp.desktop	1970-01-01 00:00:00 +0000
+++ desktop/wps-office-wpp.desktop	2013-01-25 08:14:19 +0000
@@ -0,0 +1,19 @@
+[Desktop Entry]
+Encoding=UTF-8
+Comment[zh_CN]=使用WPS演示编辑、播放演示文稿
+Comment=Use Kingsoft Presentation to edit and play presentations.
+Exec="/usr/bin/wpp" 
+GenericName[zh_CN]=
+GenericName=
+MimeType=application/x-dps;application/x-dpt;application/x-ppt;application/x-pot;application/x-pptx;application/x-potx;application/vnd.ms-powerpoint;application/vnd.mspowerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.openxmlformats-officedocument.presentationml.template;
+Name[zh_CN]=WPS演示
+Name=Kingsoft Presentation
+StartupNotify=false
+Terminal=false
+TerminalOptions=
+Type=Application
+X-DBUS-ServiceName=
+X-DBUS-StartupType=
+X-KDE-SubstituteUID=false
+X-KDE-Username=
+Icon=/opt/kingsoft/wps-office/office6/icons/wppmain.png

=== added file 'desktop/wps-office-wps.desktop'
--- desktop/wps-office-wps.desktop	1970-01-01 00:00:00 +0000
+++ desktop/wps-office-wps.desktop	2013-01-25 08:14:19 +0000
@@ -0,0 +1,19 @@
+[Desktop Entry]
+Encoding=UTF-8
+Comment[zh_CN]=使用WPS文字编写报告，排版文章
+Comment=Use Kingsoft Writer to reports and make up articles.
+Exec="/usr/bin/wps" 
+GenericName[zh_CN]=
+GenericName=
+MimeType=application/x-wps;application/x-wpt;application/x-doc;application/x-dot;application/x-docx;application/x-dotx;application/vnd.ms-word;application/msword;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.openxmlformats-officedocument.wordprocessingml.template;
+Name[zh_CN]=WPS文字
+Name=Kingsoft Writer
+StartupNotify=false
+Terminal=false
+TerminalOptions=
+Type=Application
+X-DBUS-ServiceName=
+X-DBUS-StartupType=
+X-KDE-SubstituteUID=false
+X-KDE-Username=
+Icon=/opt/kingsoft/wps-office/office6/icons/wpsmain.png

=== added directory 'hooks'
=== renamed directory 'hooks' => 'hooks.moved'
=== added file 'hooks/chroot'
--- hooks/chroot	1970-01-01 00:00:00 +0000
+++ hooks/chroot	2013-01-25 08:14:19 +0000
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+# Hook for building live images
+#
+# This script is run in the built chroot after all packages are installed,
+# before it is packed into a squashfs. This is where you can apply extra tweaks
+# to the live system.
+apt-get purge --auto-remove -y totem

=== added directory 'i18n'
=== renamed directory 'i18n' => 'i18n.moved'
=== added file 'i18n/keyboard.txt'
--- i18n/keyboard.txt	1970-01-01 00:00:00 +0000
+++ i18n/keyboard.txt	2013-01-25 08:14:19 +0000
@@ -0,0 +1,14 @@
+# Default keyboard layout for installer images built with this defaults
+# package.  Note that the defaults package itself does not configure the
+# layout, this only gets effective for image builds.
+#
+# Format: single line with
+# layout
+#    or
+# layout variant
+#
+# Check /usr/share/X11/xkb/rules/xorg.lst for the complete list of available
+# layouts and variants.
+#
+# Example:
+# de nodeadkeys

=== added file 'i18n/langpacks.txt'
--- i18n/langpacks.txt	1970-01-01 00:00:00 +0000
+++ i18n/langpacks.txt	2013-01-25 08:14:19 +0000
@@ -0,0 +1,17 @@
+# Language support included on built installer images. The user can still
+# select a different language than the ones included here, the language packs
+# and support packages will then be downloaded from the network.
+# Note that this does not affect package dependencies, only image builds, as
+# the set of support packages depends on the installed applications.
+#
+# Format: arbitrarily many lines, one language code per line. If the second
+# column is "complete", all additional support packages like LibreOffice help,
+# input methods, dictionaries etc. will be installed in addition; otherwise
+# only the language packs with the translations will be installed. Note that
+# complete language support takes a lot of CD space.
+#
+# Example:
+# de complete
+# es
+en
+zh-hans

=== added file 'i18n/language.txt'
--- i18n/language.txt	1970-01-01 00:00:00 +0000
+++ i18n/language.txt	2013-01-25 08:14:19 +0000
@@ -0,0 +1,11 @@
+# Default language for installer images built with this defaults package.
+# Note that the defaults package itself does not configure the locale, this
+# only gets effective for image builds.
+#
+# Format: single line with language code (or ll_CC for the languages like zh
+# which have two major codes like zh_CN or zh_TW). See /isolinux/langlist on a
+# Ubuntu live CD for the complete list.
+#
+# Example:
+# de
+zh_CN

=== added directory 'icons'
=== renamed directory 'icons' => 'icons.moved'
=== added directory 'icons/48x48'
=== added directory 'icons/48x48/apps'
=== added file 'icons/README'
--- icons/README	1970-01-01 00:00:00 +0000
+++ icons/README	2013-01-25 08:14:19 +0000
@@ -0,0 +1,2 @@
+You can place additional jpg, png, or svg icons here, but only into directories
+which already exist in /usr/share/icons/hicolor/.

=== added directory 'icons/scalable'
=== added directory 'icons/scalable/apps'
=== added directory 'icons/scalable/status'
=== added directory 'multimedia'
=== renamed directory 'multimedia' => 'multimedia.moved'
=== added file 'multimedia/radiostations.txt'
--- multimedia/radiostations.txt	1970-01-01 00:00:00 +0000
+++ multimedia/radiostations.txt	2013-01-25 08:14:19 +0000
@@ -0,0 +1,8 @@
+# List of radio stations in Rhythmbox and Banshee
+#
+# Format: arbitrarily many lines with
+# URL; Genre; Name
+#
+# Example:
+# http://www.radioparadise.com/musiclinks/rp_128.m3u; Eclectic Rock; Radio Paradise
+# http://www.swr3.de/wraps/musik/webradio/aplayer/stream_extern.php?format=mp3e&channel=0; Pop; SWR3

=== added file 'recommends.txt'
--- recommends.txt	1970-01-01 00:00:00 +0000
+++ recommends.txt	2013-01-25 08:14:19 +0000
@@ -0,0 +1,18 @@
+# These packages will become recommends of the generated defaults package, i.
+# e. will be installed by default on a customized image, but can be removed by
+# the user without removing the defaults package. Requirements for
+# official Ubuntu customization packages:
+#
+# - They should not conflict to a default installation package, or add
+#   applications for a purpose which the default installation already has an
+#   application for. For example, don't add thunderbird or pidgin when we already
+#   have evolution or empathy
+# - They should preferably be in main. If they are not, consider writing a MIR,
+#   or add a justification to a comment in depends.txt or the changelog.
+#   Depending on universe packages will be a valid reason to reject an
+#   ubuntu-defaults package. 
+#
+# Format: arbitrarily many lines, one package name per line
+#
+# Example:
+# fortunes-de

=== renamed file 'recommends.txt' => 'recommends.txt.moved'
=== added directory 'ubiquity-slideshow'
=== renamed directory 'ubiquity-slideshow' => 'ubiquity-slideshow.moved'
=== added file 'ubiquity-slideshow/README'
--- ubiquity-slideshow/README	1970-01-01 00:00:00 +0000
+++ ubiquity-slideshow/README	2013-01-25 08:14:19 +0000
@@ -0,0 +1,4 @@
+You can place custom slides and screenshots for any locale in
+slides/$LOCALE and slides/$LOCALE/screenshots.
+Note that screenshots in slides/C will appear for all slideshows, while
+screenshots for any other locale will only appear for that locale.

=== added directory 'ubiquity-slideshow/slides'
=== added directory 'unity'
=== renamed directory 'unity' => 'unity.moved'
=== added file 'unity/launchers.txt'
--- unity/launchers.txt	1970-01-01 00:00:00 +0000
+++ unity/launchers.txt	2013-01-25 08:14:19 +0000
@@ -0,0 +1,11 @@
+# List of .desktop file names (without extension) with additional default launchers
+#
+# Format: arbitrarily many lines, one .desktop name (without extension) per line
+# An optional second word on the line specifies the package name which
+# provides this desktop file; this will be added to the defaults package's
+# dependencies, just like if it were added to "depends.txt".
+#
+# Example:
+# gnome-sudoku
+# simple-scan
+# sol aisleriot

=== added directory 'webbrowser'
=== renamed directory 'webbrowser' => 'webbrowser.moved'
=== added file 'webbrowser/bookmarks-menu.txt'
--- webbrowser/bookmarks-menu.txt	1970-01-01 00:00:00 +0000
+++ webbrowser/bookmarks-menu.txt	2013-01-25 08:14:19 +0000
@@ -0,0 +1,9 @@
+# The following bookmarks will be appended to the default bookmark folders in the menu
+# For now only Firefox is supported.
+#
+# Format: arbitrarily many lines with
+# URL Name
+#
+# Example:
+# http://www.ubuntu.de	Deutsches Ubuntu-Forum
+# http://www.heise.de	heise Computer-Nachrichten

=== added file 'webbrowser/bookmarks-toolbar.txt'
--- webbrowser/bookmarks-toolbar.txt	1970-01-01 00:00:00 +0000
+++ webbrowser/bookmarks-toolbar.txt	2013-01-25 08:14:19 +0000
@@ -0,0 +1,8 @@
+# The following bookmarks will be appended to the default bookmark folders in the toolbar
+# For now only Firefox is supported.
+#
+# Format: arbitrarily many lines with
+# URL Name
+#
+# Example:
+# http://www.zeit.de    Die Zeit Nachrichten

=== added file 'webbrowser/searchengine.txt'
--- webbrowser/searchengine.txt	1970-01-01 00:00:00 +0000
+++ webbrowser/searchengine.txt	2013-01-25 08:14:19 +0000
@@ -0,0 +1,10 @@
+# The search engine that will be selected by default.
+# For now only Firefox is supported.
+#
+# NotUbuntu: This may not be changed for Ubuntu localized images, only for
+# derivatives and OEM projects.
+#
+# Format: single line with search engine name
+#
+# Example:
+# Wikipedia (de)

=== added file 'webbrowser/startpage.txt'
--- webbrowser/startpage.txt	1970-01-01 00:00:00 +0000
+++ webbrowser/startpage.txt	2013-01-25 08:14:19 +0000
@@ -0,0 +1,8 @@
+# The following URL will become the web browser start page.
+# For now only Firefox is supported.
+#
+# Format: single line with an URL. Using the ${distro_release_number}
+# or ${distro_release_name} macros is often useful here.
+#
+# Example:
+# http://www.ubuntuforums.org?release=${distro_release_number}