------------------------------------------------------------ revno: 168 committer: ShuiLu Pi <[email protected]> branch nick: ubuntukylin-default-settings timestamp: Thu 2014-09-11 19:59:55 +0800 message: merge lp:ubuntu/ubuntukylin-default-settings removed: debian/clean modified: debian/changelog 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
=== modified file 'debian/changelog' --- debian/changelog 2014-07-28 13:12:06 +0000 +++ debian/changelog 2014-09-11 11:59:55 +0000 @@ -1,3 +1,9 @@ +ubuntukylin-default-settings (1.2.1) utopic; urgency=low + + * Amend behaviour for conffile handling + + -- Aron Xu <[email protected]> Wed, 30 Jul 2014 16:31:55 +0800 + ubuntukylin-default-settings (1.2.0) utopic; urgency=low * Use os-release instead of ubuntukylin-release === removed file 'debian/clean' --- debian/clean 2014-07-28 13:09:21 +0000 +++ debian/clean 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -debian/os-release === modified file 'debian/rules' --- debian/rules 2014-07-28 13:09:21 +0000 +++ debian/rules 2014-09-11 11:59:55 +0000 @@ -2,10 +2,6 @@ %: 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-09-11 11:39:38 +0000 +++ debian/ubuntukylin-default-settings.install 2014-09-11 11:59:55 +0000 @@ -1,6 +1,5 @@ debian/20_ubuntukylin-default-settings.gschema.override usr/share/glib-2.0/schemas debian/ubuntukylin.list /etc/apt/sources.list.d/ -debian/os-release /etc/ debian/master_preferences /usr/lib/chromium-browser/ icons/UbuntuLogo.png /usr/share/unity-control-center/ui/ debian/firefox/ubuntukylin-browser-defaults.js usr/share/ubuntukylin-default-settings/ === modified file 'debian/ubuntukylin-default-settings.postrm' --- debian/ubuntukylin-default-settings.postrm 2014-07-28 13:09:21 +0000 +++ debian/ubuntukylin-default-settings.postrm 2014-09-11 11:59:55 +0000 @@ -3,7 +3,6 @@ package=ubuntukylin-default-settings files=" -etc/os-release usr/share/unity-control-center/ui/UbuntuLogo.png " @@ -11,6 +10,8 @@ for item in $files; do dpkg-divert --package $package --rename --divert "/$item"".orig-brand" --remove "/$item" done + sed -i "/NAME/s/Ubuntu Kylin/Ubuntu/g" /etc/os-release + rm -f /etc/ubuntukylin-release fi #DEBHELPER# === modified file 'debian/ubuntukylin-default-settings.preinst' --- debian/ubuntukylin-default-settings.preinst 2014-07-28 13:09:21 +0000 +++ debian/ubuntukylin-default-settings.preinst 2014-09-11 11:59:55 +0000 @@ -3,7 +3,6 @@ package=ubuntukylin-default-settings files=" -etc/os-release usr/share/unity-control-center/ui/UbuntuLogo.png " @@ -11,6 +10,7 @@ for item in $files; do dpkg-divert --package $package --rename --divert "/$item"".orig-brand" --add "/$item" done + sed -i "/NAME/s/Ubuntu/Ubuntu Kylin/g" /etc/os-release rm -f /etc/ubuntukylin-release fi
-- Mailing list: https://launchpad.net/~ubuntukylin-members Post to : [email protected] Unsubscribe : https://launchpad.net/~ubuntukylin-members More help : https://help.launchpad.net/ListHelp
