← Back to team overview

ubuntukylin-members team mailing list archive

lp:~penghuanmail/ubuntukylin-default-settings/ubuntukylin-default-settings into lp:ubuntukylin-default-settings

 

Huan Peng has proposed merging lp:~penghuanmail/ubuntukylin-default-settings/ubuntukylin-default-settings into lp:ubuntukylin-default-settings.

Requested reviews:
  Huan Peng (penghuanmail)

For more details, see:
https://code.launchpad.net/~penghuanmail/ubuntukylin-default-settings/ubuntukylin-default-settings/+merge/144864
-- 
https://code.launchpad.net/~penghuanmail/ubuntukylin-default-settings/ubuntukylin-default-settings/+merge/144864
Your team UbuntuKylin Members is subscribed to branch lp:ubuntukylin-default-settings.
=== added file 'debian/30_ubuntukylin-default-settings.gschema.override'
--- debian/30_ubuntukylin-default-settings.gschema.override	1970-01-01 00:00:00 +0000
+++ debian/30_ubuntukylin-default-settings.gschema.override	2013-01-25 08:01:20 +0000
@@ -0,0 +1,7 @@
+[org.gnome.nautilus.desktop]
+computer-icon-visible=true
+home-icon-visible=true
+trash-icon-visible=true
+volumes-visible=true
+
+

=== modified file 'debian/changelog'
--- debian/changelog	2013-01-22 02:33:35 +0000
+++ debian/changelog	2013-01-25 08:01:20 +0000
@@ -1,5 +1,5 @@
-ubuntukylin-default-settings (1.0.0) raring; urgency=low
-
-  * Initial release
-
- -- testpi <pishuilu1128@xxxxxxx>  Fri, 18 Jan 2013 17:22:27 +0800
+ubuntukylin-default-settings (0.1) UNRELEASED; urgency=low
+
+  * Initial release.
+
+ -- Sebastien Bacher <seb128@xxxxxxxxxx>  Wed, 23 Jan 2013 16:13:16 +0100

=== modified file 'debian/compat'
--- debian/compat	2013-01-16 08:23:59 +0000
+++ debian/compat	2013-01-25 08:01:20 +0000
@@ -1,1 +1,1 @@
-8
+7

=== modified file 'debian/control'
--- debian/control	2013-01-22 02:33:35 +0000
+++ debian/control	2013-01-25 08:01:20 +0000
@@ -1,13 +1,17 @@
 Source: ubuntukylin-default-settings
-Section: x11
-Priority: extra
-Maintainer: testpi <pishuilu1128@xxxxxxx>
-Build-Depends: debhelper (>= 8.0.0),autotools-dev
-Standards-Version: 3.9.2
-#Vcs-Git: git://git.debian.org/collab-maint/ubuntukylin-default-settings.git
-#Vcs-Browser: http://git.debian.org/?p=collab-maint/ubuntukylin-default-settings.git;a=summary
+Priority: optional
+Maintainer: Ubuntu Kylin Team <ubuntukylin-members@xxxxxxxxxxxxxxxxxxx>
+Build-Depends: debhelper (>= 7.0.50~),
+ ubuntu-defaults-builder
+Standards-Version: 3.9.4
 
 Package: ubuntukylin-default-settings
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gconf2, gconf2-common, nautilus-data, libglib2.0-0, unity, compiz-plugins-default, libcompizconfig0, compiz-core, gnome-keyring, x11-common
-Description: 定制ubuntukylin桌面
+Architecture: all
+Depends: ${misc:Depends},
+ ${ubuntudefaults:Depends}
+Recommends: ${ubuntudefaults:Recommends}
+Provides: ubuntu-default-settings
+Conflicts: ubuntu-default-settings
+Description: Default settings for Ubuntu customizations
+ This package contains customized default settings.
+

=== modified file 'debian/copyright'
--- debian/copyright	2013-01-22 02:33:35 +0000
+++ debian/copyright	2013-01-25 08:01:20 +0000
@@ -1,22 +1,16 @@
-This package was debianized by testpi <pishuilu1128@xxxxxxx> on
-Tue, 22 Jan 2013 09:43:52 -0800.
-Copyright: 2013 ubuntukylin team
-License: GPL-2+
- This package 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: Ubuntu Kylin Team <ubuntukylin-members@xxxxxxxxxxxxxxxxxxx>
+
+Files: *
+Copyright:
+ Copyright (C) 2012-2013 Kylin Ltd
+License: GPL-3+
+ This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
  (at your option) any later version.
  .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+ The full text of the GPL is distributed as in
+ /usr/share/common-licenses/GPL-3 on Debian systems.
 
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.

=== removed file 'debian/postinst'
--- debian/postinst	2013-01-22 02:33:35 +0000
+++ debian/postinst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#! /bin/sh
-set -e
-
-mv /tmp/kylin.path /etc/gconf/2/path
-mv /usr/share/glib-2.0/schemas/10_nautilus.gschema /usr/share/glib-2.0/schemas/10_nautilus.gschema.override
-glib-compile-schemas /usr/share/glib-2.0/schemas/
-

=== modified file 'debian/rules'
--- debian/rules	2013-01-22 02:33:35 +0000
+++ debian/rules	2013-01-25 08:01:20 +0000
@@ -1,19 +1,8 @@
 #!/usr/bin/make -f
 
-
-
-
-SHELL := sh -e
-
-
-
 %:
-	dh ${@} --with autotools_dev
+	dh "$@"
 
-override_dh_auto_install:
-	mkdir -p debian/ubuntukylin-default-settings/var/lib/gconf/
-	mkdir -p debian/ubuntukylin-default-settings/etc/skel
-	install -D -m 0755 kylin/kylin.path debian/ubuntukylin-default-settings/tmp/kylin.path
-	install -D -m 0755 kylin/10_nautilus.gschema debian/ubuntukylin-default-settings/usr/share/glib-2.0/schemas/10_nautilus.gschema
-	cp -raf kylin debian/ubuntukylin-default-settings/var/lib/gconf/
-	cp -raf 桌面 debian/ubuntukylin-default-settings/etc/skel
+override_dh_install:
+	dh_install
+	dh_ubuntu_defaults

=== removed directory 'debian/source'
=== removed file 'debian/source/format'
--- debian/source/format	2013-01-21 02:48:53 +0000
+++ debian/source/format	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-3.0 (quilt)

=== 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:01:20 +0000
@@ -0,0 +1,1 @@
+debian/30_ubuntukylin-default-settings.gschema.override usr/share/glib-2.0/schemas

=== added file 'depends.txt'
--- depends.txt	1970-01-01 00:00:00 +0000
+++ depends.txt	2013-01-25 08:01:20 +0000
@@ -0,0 +1,34 @@
+# 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
+#
+
+# 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

=== added directory 'desktop'
=== 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:01:20 +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:01:20 +0000
@@ -0,0 +1,96 @@
+# 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:01:20 +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:01:20 +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 directory 'hooks'
=== added file 'hooks/chroot'
--- hooks/chroot	1970-01-01 00:00:00 +0000
+++ hooks/chroot	2013-01-25 08:01:20 +0000
@@ -0,0 +1,10 @@
+#!/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'
=== added file 'i18n/keyboard.txt'
--- i18n/keyboard.txt	1970-01-01 00:00:00 +0000
+++ i18n/keyboard.txt	2013-01-25 08:01:20 +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:01:20 +0000
@@ -0,0 +1,14 @@
+# 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.
+
+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:01:20 +0000
@@ -0,0 +1,9 @@
+# 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.
+#
+zh_CN

=== added directory 'icons'
=== 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:01:20 +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'
=== removed directory 'kylin'
=== removed file 'kylin/%gconf-tree.xml'
--- kylin/%gconf-tree.xml	2013-01-22 02:33:35 +0000
+++ kylin/%gconf-tree.xml	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<gconf>
-	<dir name="apps">
-		<dir name="nautilus">
-			<dir name="preferences">
-				<entry name="navigation_window_saved_maximized" mtime="1348456500" type="bool" value="false"/>
-				<entry name="navigation_window_saved_geometry" mtime="1348456500" type="string">
-					<stringvalue>800x550+724+243</stringvalue>
-				</entry>
-				<entry name="start_with_sidebar" mtime="1348532816" type="bool" value="true"/>
-			</dir>
-			<dir name="desktop">
-				<entry name="trash_icon_visible" mtime="1348709043" type="bool" value="true"/>
-        			<entry name="trash_icon_name" mtime="1348709041" type="string">
-               				 <stringvalue>回收站</stringvalue>
-       			         </entry>
-       				 <entry name="home_icon_visible" mtime="1348709026" type="bool" value="true"/>
-       				 <entry name="home_icon_name" mtime="1348709025" type="string">
-               				 <stringvalue>我的文档</stringvalue>
-       				 </entry>
-       				 <entry name="computer_icon_visible" mtime="1348709015" type="bool" value="true"/>
-       				 <entry name="computer_icon_name" mtime="1348709012" type="string">
-               				 <stringvalue>我的电脑</stringvalue>
-       				 </entry>
-			</dir>
-		</dir>						
-	</dir>
-</gconf>

=== removed file 'kylin/10_nautilus.gschema'
--- kylin/10_nautilus.gschema	2013-01-22 02:33:35 +0000
+++ kylin/10_nautilus.gschema	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-[org.gnome.nautilus.desktop]
-home-icon-visible=true
-computer-icon-visible=true
-trash-icon-visible=true
-volumes-visible=true
-

=== removed file 'kylin/kylin.path'
--- kylin/kylin.path	2013-01-22 02:33:35 +0000
+++ kylin/kylin.path	1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
-######################
-# 1. Forced settings #
-######################
-
-# Settings forced by the local administrator
-xml:readonly:/etc/gconf/gconf.xml.mandatory
-
-# Other forced sources imagined by the local administrator
-include /etc/gconf/2/local-mandatory.path
-
-# Settings forced by Debian packages
-xml:readonly:/var/lib/gconf/debian.mandatory
-
-
-#######################
-# 2. User Preferences #
-#######################
-xml:readwrite:/var/lib/gconf/kylin
-# mandatory path for sabayon
-include "$(HOME)/.gconf.path.mandatory"
-
-# mandatory path for desktop-profiles
-include $(ENV_MANDATORY_PATH)
-
-# Other sources imagined by the user
-include "$(HOME)/.gconf.path"
-
-# The default storage location, ~/.gconf
-# This should be the only readwrite source
-xml:readwrite:$(HOME)/.gconf
-
-# default path for sabayon
-include "$(HOME)/.gconf.path.defaults"
-
-# default path for desktop-profiles
-include $(ENV_DEFAULTS_PATH)
-
-
-######################
-# 3. System defaults #
-######################
-
-# Other default sources imagined by the local administrator
-include /etc/gconf/2/local-defaults.path
-
-# System administrator's defaults. This source also serves as a legacy
-# source for packages not using a recent dh_gconf, or for applications
-# installed by hand.
-xml:readonly:/etc/gconf/gconf.xml.defaults
-
-# Debian branding, including CDD or packaged branding
-xml:readonly:/var/lib/gconf/debian.defaults
-
-# Upstream application defaults
-xml:readonly:/var/lib/gconf/defaults

=== added directory 'multimedia'
=== added file 'recommends.txt'
--- recommends.txt	1970-01-01 00:00:00 +0000
+++ recommends.txt	2013-01-25 08:01:20 +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

=== added directory 'ubiquity-slideshow'
=== added file 'ubiquity-slideshow/README'
--- ubiquity-slideshow/README	1970-01-01 00:00:00 +0000
+++ ubiquity-slideshow/README	2013-01-25 08:01:20 +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'
=== added file 'unity/launchers.txt'
--- unity/launchers.txt	1970-01-01 00:00:00 +0000
+++ unity/launchers.txt	2013-01-25 08:01:20 +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'
=== 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:01:20 +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:01:20 +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:01:20 +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:01:20 +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}

=== removed directory '桌面'
=== removed file '桌面/firefox.desktop'
--- 桌面/firefox.desktop	2013-01-22 02:33:35 +0000
+++ 桌面/firefox.desktop	1970-01-01 00:00:00 +0000
@@ -1,193 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Firefox Web Browser
-Name[ar]=متصفح الوِب فَيَرفُكْس
-Name[ast]=Restolador web Firefox
-Name[bn]=ফায়ারফক্স ওয়েব ব্রাউজার
-Name[ca]=Navegador web Firefox
-Name[cs]=Firefox Webový prohlížeč
-Name[da]=Firefox - internetbrowser
-Name[el]=Περιηγητής Firefox
-Name[es]=Navegador web Firefox
-Name[et]=Firefoxi veebibrauser
-Name[fa]=مرورگر اینترنتی Firefox
-Name[fi]=Firefox-selain
-Name[fr]=Navigateur Web Firefox
-Name[gl]=Navegador web Firefox
-Name[he]=דפדפן האינטרנט Firefox
-Name[hr]=Firefox web preglednik
-Name[hu]=Firefox webböngésző
-Name[it]=Firefox Browser Web
-Name[ja]=Firefox ウェブ・ブラウザ
-Name[ko]=Firefox 웹 브라우저
-Name[ku]=Geroka torê Firefox
-Name[lt]=Firefox interneto naršyklė
-Name[nb]=Firefox Nettleser
-Name[nl]=Firefox webbrowser
-Name[nn]=Firefox Nettlesar
-Name[no]=Firefox Nettleser
-Name[pl]=Przeglądarka WWW Firefox
-Name[pt]=Firefox Navegador Web
-Name[pt_BR]=Navegador Web Firefox
-Name[ro]=Firefox – Navigator Internet
-Name[ru]=Веб-браузер Firefox
-Name[sk]=Firefox - internetový prehliadač
-Name[sl]=Firefox spletni brskalnik
-Name[sv]=Firefox webbläsare
-Name[ug]=Firefox توركۆرگۈ
-Name[uk]=Веб-браузер Firefox
-Name[vi]=Trình duyệt web Firefox
-Name[zh_CN]=Firefox 网络浏览器
-Name[zh_TW]=Firefox 網路瀏覽器
-Comment=Browse the World Wide Web
-Comment[ar]=تصفح الشبكة العنكبوتية العالمية
-Comment[ast]=Restola pela Rede
-Comment[bn]=ইন্টারনেট ব্রাউজ করুন
-Comment[ca]=Navegueu per la web
-Comment[cs]=Prohlížení stránek World Wide Webu
-Comment[da]=Surf på internettet
-Comment[de]=Im Internet surfen
-Comment[el]=Μπορείτε να περιηγηθείτε στο διαδίκτυο (Web)
-Comment[es]=Navegue por la web
-Comment[et]=Lehitse veebi
-Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید
-Comment[fi]=Selaa Internetin WWW-sivuja
-Comment[fr]=Naviguer sur le Web
-Comment[gl]=Navegar pola rede
-Comment[he]=גלישה ברחבי האינטרנט
-Comment[hr]=Pretražite web
-Comment[hu]=A világháló böngészése
-Comment[it]=Esplora il web
-Comment[ja]=ウェブを閲覧します
-Comment[ko]=웹을 돌아 다닙니다
-Comment[ku]=Li torê bigere
-Comment[lt]=Naršykite internete
-Comment[nb]=Surf på nettet
-Comment[nl]=Verken het internet
-Comment[nn]=Surf på nettet
-Comment[no]=Surf på nettet
-Comment[pl]=Przeglądanie stron WWW 
-Comment[pt]=Navegue na Internet
-Comment[pt_BR]=Navegue na Internet
-Comment[ro]=Navigați pe Internet
-Comment[ru]=Доступ в Интернет
-Comment[sk]=Prehliadanie internetu
-Comment[sl]=Brskajte po spletu
-Comment[sv]=Surfa på webben
-Comment[ug]=دۇنيادىكى توربەتلەرنى كۆرگىلى بولىدۇ
-Comment[uk]=Перегляд сторінок Інтернету
-Comment[vi]=Để duyệt các trang web
-Comment[zh_CN]=浏览互联网
-Comment[zh_TW]=瀏覽網際網路
-GenericName=Web Browser
-GenericName[ar]=متصفح وب
-GenericName[ast]=Restolador Web
-GenericName[bn]=ওয়েব ব্রাউজার
-GenericName[ca]=Navegador web
-GenericName[cs]=Webový prohlížeč
-GenericName[da]=Webbrowser
-GenericName[el]=Περιηγητής διαδικτύου
-GenericName[es]=Navegador web
-GenericName[et]=Veebibrauser
-GenericName[fa]=مرورگر اینترنتی
-GenericName[fi]=WWW-selain
-GenericName[fr]=Navigateur Web
-GenericName[gl]=Navegador Web
-GenericName[he]=דפדפן אינטרנט
-GenericName[hr]=Web preglednik
-GenericName[hu]=Webböngésző
-GenericName[it]=Browser web
-GenericName[ja]=ウェブ・ブラウザ
-GenericName[ko]=웹 브라우저
-GenericName[ku]=Geroka torê
-GenericName[lt]=Interneto naršyklė
-GenericName[nb]=Nettleser
-GenericName[nl]=Webbrowser
-GenericName[nn]=Nettlesar
-GenericName[no]=Nettleser
-GenericName[pl]=Przeglądarka WWW
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador Web
-GenericName[ro]=Navigator Internet
-GenericName[ru]=Веб-браузер
-GenericName[sk]=Internetový prehliadač
-GenericName[sl]=Spletni brskalnik
-GenericName[sv]=Webbläsare
-GenericName[ug]=توركۆرگۈ
-GenericName[uk]=Веб-браузер
-GenericName[vi]=Trình duyệt Web
-GenericName[zh_CN]=网络浏览器
-GenericName[zh_TW]=網路瀏覽器
-Keywords=Internet;WWW;Browser;Web;Explorer
-Keywords[ast]=Internet;WWW;Restolador;Web;Esplorador
-Keywords[ca]=Internet;WWW;Navegador;Web;Explorador;Explorer
-Keywords[cs]=Internet;WWW;Prohlížeč;Web;Explorer
-Keywords[da]=Internet;Internettet;WWW;Browser;Browse;Web;Surf;Nettet
-Keywords[de]=Internet;WWW;Browser;Web;Explorer;Webseite;Site;surfen;online;browsen
-Keywords[el]=Internet;WWW;Browser;Web;Explorer;Διαδίκτυο;Περιηγητής;Firefox;Φιρεφοχ;Ιντερνετ
-Keywords[es]=Explorador;Internet;WWW
-Keywords[fi]=Internet;WWW;Browser;Web;Explorer;selain;Internet-selain;internetselain;verkkoselain;netti;surffaa
-Keywords[fr]=Internet;WWW;Browser;Web;Explorer;Fureteur;Surfer;Navigateur
-Keywords[he]=דפדפן;אינטרנט;רשת;אתרים;אתר;פיירפוקס;מוזילה;
-Keywords[hr]=Internet;WWW;preglednik;Web
-Keywords[hu]=Internet;WWW;Böngésző;Web;Háló;Net;Explorer
-Keywords[it]=Internet;WWW;Browser;Web;Navigatore
-Keywords[is]=Internet;WWW;Vafri;Vefur;Netvafri;Flakk
-Keywords[ja]=Internet;WWW;Web;インターネット;ブラウザ;ウェブ;エクスプローラ
-Keywords[nb]=Internett;WWW;Nettleser;Explorer;Web;Browser;Nettside
-Keywords[nl]=Internet;WWW;Browser;Web;Explorer;Verkenner;Website;Surfen;Online 
-Keywords[pt]=Internet;WWW;Browser;Web;Explorador;Navegador
-Keywords[pt_BR]=Internet;WWW;Browser;Web;Explorador;Navegador
-Keywords[ru]=Internet;WWW;Browser;Web;Explorer;интернет;браузер;веб;файрфокс;огнелис
-Keywords[sk]=Internet;WWW;Prehliadač;Web;Explorer
-Keywords[sl]=Internet;WWW;Browser;Web;Explorer;Brskalnik;Splet
-Keywords[uk]=Internet;WWW;Browser;Web;Explorer;Інтернет;мережа;переглядач;оглядач;браузер;веб;файрфокс;вогнелис;перегляд
-Keywords[vi]=Internet;WWW;Browser;Web;Explorer;Trình duyệt;Trang web
-Keywords[zh_CN]=Internet;WWW;Browser;Web;Explorer;网页;浏览;上网;火狐;Firefox;ff;互联网;网站;
-Exec=firefox %u
-Terminal=false
-X-MultipleArgs=false
-Type=Application
-Icon=firefox
-Categories=GNOME;GTK;Network;WebBrowser;
-MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;x-scheme-handler/chrome;video/webm;application/x-xpinstall;
-StartupWMClass=Firefox
-StartupNotify=true
-Actions=NewWindow;
-
-[Desktop Action NewWindow]
-Name=Open a New Window
-Name[ast]=Abrir una ventana nueva
-Name[bn]=Abrir una ventana nueva
-Name[ca]=Obre una finestra nova
-Name[cs]=Otevřít nové okno
-Name[da]=Åbn et nyt vindue
-Name[de]=Ein neues Fenster öffnen
-Name[el]=Άνοιγμα νέου παραθύρου
-Name[es]=Abrir una ventana nueva
-Name[fi]=Avaa uusi ikkuna
-Name[fr]=Ouvrir une nouvelle fenêtre
-Name[gl]=Abrir unha nova xanela
-Name[he]=פתיחת חלון חדש
-Name[hr]=Otvori novi prozor
-Name[hu]=Új ablak nyitása
-Name[it]=Apri una nuova finestra
-Name[ja]=新しいウィンドウを開く
-Name[ko]=새 창 열기
-Name[ku]=Paceyeke nû veke
-Name[lt]=Atverti naują langą
-Name[nb]=Åpne et nytt vindu
-Name[nl]=Nieuw venster openen
-Name[pt]=Abrir nova janela
-Name[pt_BR]=Abrir nova janela
-Name[ro]=Deschide o fereastră nouă
-Name[ru]=Открыть новое окно
-Name[sk]=Otvoriť nové okno
-Name[sv]=Öppna ett nytt fönster
-Name[ug]=يېڭى كۆزنەك ئېچىش
-Name[uk]=Відкрити нове вікно
-Name[vi]=Mở cửa sổ mới
-Name[zh_CN]=新建窗口
-Name[zh_TW]=開啟新視窗
-Exec=firefox -new-window
-OnlyShowIn=Unity;

=== removed file '桌面/wps-office-et.desktop'
--- 桌面/wps-office-et.desktop	2013-01-22 02:33:35 +0000
+++ 桌面/wps-office-et.desktop	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Comment[zh_CN]=使用WPS表格分析、管理数据
-Comment=Use Kingsoft Spreadsheets to analyze manage data.
-Exec="/usr/bin/et" 
-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

=== removed file '桌面/wps-office-wpp.desktop'
--- 桌面/wps-office-wpp.desktop	2013-01-22 02:33:35 +0000
+++ 桌面/wps-office-wpp.desktop	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-[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

=== removed file '桌面/wps-office-wps.desktop'
--- 桌面/wps-office-wps.desktop	2013-01-22 02:33:35 +0000
+++ 桌面/wps-office-wps.desktop	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-[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


Follow ups