← Back to team overview

ubuntukylin-members team mailing list archive

[Branch ~ubuntukylin-members/ubuntukylin-default-settings/trunk] Rev 159: Revert r158 which lead to file overwrite

 

------------------------------------------------------------
revno: 159
committer: Aron Xu <happyaron@xxxxxxxxxx>
branch nick: ubuntukylin-default-settings
timestamp: Wed 2014-06-25 18:40:24 +0800
message:
  Revert r158 which lead to file overwrite
removed:
  debian/os-release
modified:
  debian/changelog
  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-06-25 02:18:18 +0000
+++ debian/changelog	2014-06-25 10:40:24 +0000
@@ -1,11 +1,3 @@
-ubuntukylin-default-settings (1.1.10) trusty; urgency=low
- 
-  [ Ma Jun ]
-  * Really add extra installation of ubuntu-kylin-docs in hooks/chroot
-    (LP: #1308889)
-
- -- Aron Xu <aron@xxxxxxxxxx>  Thu, 17 Apr 2014 17:09:12 +0800
-
 ubuntukylin-default-settings (1.1.8) trusty; urgency=low
 
   [ Jack Yu ]

=== removed file 'debian/os-release'
--- debian/os-release	2014-06-25 02:18:18 +0000
+++ debian/os-release	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-NAME="Ubuntu Kylin"
-VERSION="14.10 (Utopic Unicorn)"
-ID=ubuntu
-ID_LIKE=debian
-PRETTY_NAME="Ubuntu Utopic Unicorn (development branch)"
-VERSION_ID="14.10"
-HOME_URL="http://www.ubuntu.com/";
-SUPPORT_URL="http://help.ubuntu.com/";
-BUG_REPORT_URL="http://bugs.launchpad.net/ubuntu/";

=== modified file 'debian/ubuntukylin-default-settings.install'
--- debian/ubuntukylin-default-settings.install	2014-06-25 02:18:18 +0000
+++ debian/ubuntukylin-default-settings.install	2014-06-25 10:40:24 +0000
@@ -1,7 +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/

=== modified file 'debian/ubuntukylin-default-settings.postrm'
--- debian/ubuntukylin-default-settings.postrm	2014-06-25 02:18:18 +0000
+++ debian/ubuntukylin-default-settings.postrm	2014-06-25 10:40:24 +0000
@@ -4,7 +4,6 @@
 
 files="
 usr/share/unity-control-center/ui/UbuntuLogo.png
-etc/os-release
 "
 
 if [ "$1" = remove -o "$1" = purge ]; then

=== modified file 'debian/ubuntukylin-default-settings.preinst'
--- debian/ubuntukylin-default-settings.preinst	2014-06-25 02:18:18 +0000
+++ debian/ubuntukylin-default-settings.preinst	2014-06-25 10:40:24 +0000
@@ -4,7 +4,6 @@
 
 files="
 usr/share/unity-control-center/ui/UbuntuLogo.png
-etc/os-release
 "
 
 if [ "$1" = install -o "$1" = upgrade ]; then