------------------------------------------------------------ revno: 163 committer: Aron Xu <[email protected]> branch nick: ubuntukylin-default-settings timestamp: Mon 2014-07-28 21:09:21 +0800 message: Use os-release instead of ubuntukylin-release removed: debian/ubuntukylin-default-settings.postinst debian/ubuntukylin-release added: debian/clean modified: debian/control debian/rules debian/ubuntukylin-default-settings.install debian/ubuntukylin-default-settings.postrm debian/ubuntukylin-default-settings.preinst
-- lp:ubuntukylin-default-settings https://code.launchpad.net/~ubuntukylin-members/ubuntukylin-default-settings/trunk Your team Ubuntu Kylin Members is subscribed to branch lp:ubuntukylin-default-settings. To unsubscribe from this branch go to https://code.launchpad.net/~ubuntukylin-members/ubuntukylin-default-settings/trunk/+edit-subscription
=== added file 'debian/clean' --- debian/clean 1970-01-01 00:00:00 +0000 +++ debian/clean 2014-07-28 13:09:21 +0000 @@ -0,0 +1,1 @@ +debian/os-release === modified file 'debian/control' --- debian/control 2014-03-30 20:07:17 +0000 +++ debian/control 2014-07-28 13:09:21 +0000 @@ -2,20 +2,18 @@ Section: metapackages Priority: optional Maintainer: Ubuntu Kylin Team <[email protected]> -Build-Depends: debhelper (>= 7.0.50~), - ubuntu-defaults-builder +Build-Depends: debhelper (>= 7.0.50~), ubuntu-defaults-builder Standards-Version: 3.9.5 Vcs-Bzr: https://code.launchpad.net/~ubuntukylin-members/ubuntukylin-default-settings/trunk Vcs-Browser: https://bazaar.launchpad.net/~ubuntukylin-members/ubuntukylin-default-settings/trunk Package: ubuntukylin-default-settings Architecture: all -Depends: ${misc:Depends}, - ${ubuntudefaults:Depends} +Depends: ${misc:Depends}, ${ubuntudefaults:Depends} Recommends: ${ubuntudefaults:Recommends} Provides: ubuntu-default-settings Conflicts: ubuntu-default-settings Description: Default settings for the Ubuntu Kylin desktop - This package contains the default settings used by Ubuntu Kylin. + This package contains the default settings used by Ubuntu Kylin. It contains customized default settings for the Chinese Ubuntu Edition. === modified file 'debian/rules' --- debian/rules 2014-04-10 17:31:42 +0000 +++ debian/rules 2014-07-28 13:09:21 +0000 @@ -2,7 +2,10 @@ %: dh "$@" - +override_dh_auto_build: + dh_auto_build + sed '/NAME/s/Ubuntu/Ubuntu Kylin/g' /etc/os-release > \ + $(CURDIR)/debian/os-release override_dh_install: dh_install dh_ubuntu_defaults === modified file 'debian/ubuntukylin-default-settings.install' --- debian/ubuntukylin-default-settings.install 2014-06-25 10:40:24 +0000 +++ debian/ubuntukylin-default-settings.install 2014-07-28 13:09:21 +0000 @@ -1,6 +1,6 @@ debian/20_ubuntukylin-default-settings.gschema.override usr/share/glib-2.0/schemas debian/ubuntukylin.list /etc/apt/sources.list.d/ -debian/ubuntukylin-release /etc/ +debian/os-release /etc/ debian/master_preferences /usr/lib/chromium-browser/ debian/remove-package.list /usr/share/ubuntukylin-default-settings/ icons/UbuntuLogo.png /usr/share/unity-control-center/ui/ === removed file 'debian/ubuntukylin-default-settings.postinst' --- debian/ubuntukylin-default-settings.postinst 2014-07-21 09:16:00 +0000 +++ debian/ubuntukylin-default-settings.postinst 1970-01-01 00:00:00 +0000 @@ -1,5 +0,0 @@ -#!/bin/sh -set -e - -sed -i "/NAME/s/Ubuntu/Ubuntu Kylin/g" /etc/os-release - === modified file 'debian/ubuntukylin-default-settings.postrm' --- debian/ubuntukylin-default-settings.postrm 2014-07-21 09:16:00 +0000 +++ debian/ubuntukylin-default-settings.postrm 2014-07-28 13:09:21 +0000 @@ -3,6 +3,7 @@ package=ubuntukylin-default-settings files=" +etc/os-release usr/share/unity-control-center/ui/UbuntuLogo.png " @@ -12,7 +13,5 @@ done fi -sed -i "/NAME/s/Ubuntu Kylin/Ubuntu/g" /etc/os-release - #DEBHELPER# === modified file 'debian/ubuntukylin-default-settings.preinst' --- debian/ubuntukylin-default-settings.preinst 2014-06-25 10:40:24 +0000 +++ debian/ubuntukylin-default-settings.preinst 2014-07-28 13:09:21 +0000 @@ -3,6 +3,7 @@ package=ubuntukylin-default-settings files=" +etc/os-release usr/share/unity-control-center/ui/UbuntuLogo.png " @@ -10,6 +11,7 @@ for item in $files; do dpkg-divert --package $package --rename --divert "/$item"".orig-brand" --add "/$item" done + rm -f /etc/ubuntukylin-release fi #DEBHELPER# === removed file 'debian/ubuntukylin-release' --- debian/ubuntukylin-release 2014-03-21 02:55:17 +0000 +++ debian/ubuntukylin-release 1970-01-01 00:00:00 +0000 @@ -1,4 +0,0 @@ -DISTRIB_ID=Ubuntu Kylin -DISTRIB_RELEASE=14.04 -DISTRIB_CODENAME=trusty -DISTRIB_DESCRIPTION="Ubuntu Kylin 14.04"
-- Mailing list: https://launchpad.net/~ubuntukylin-members Post to : [email protected] Unsubscribe : https://launchpad.net/~ubuntukylin-members More help : https://help.launchpad.net/ListHelp
