ubuntukylin-members team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 228
committer: handsome_feng <jianfengli@xxxxxxxxxxxxxxx>
branch nick: ubuntukylin-default-settings
timestamp: Tue 2018-03-13 11:16:38 +0800
message:
  rm ukui.layout; fix invalid settings about firefox default homepage; update standards version and compat level
removed:
  debian/firefox/defaults/
  debian/firefox/defaults/pref/
  debian/firefox/defaults/pref/all-ubuntukylin.js
  debian/ukui.layout
added:
  debian/firefox/browser/
  debian/firefox/browser/defaults/
  debian/firefox/browser/defaults/preferences/
  debian/firefox/browser/defaults/preferences/all-ubuntukylin.js
modified:
  debian/changelog
  debian/compat
  debian/control
  debian/copyright
  debian/firefox/ubuntukylin.cfg
  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	2018-01-02 06:57:55 +0000
+++ debian/changelog	2018-03-13 03:16:38 +0000
@@ -1,6 +1,15 @@
+ubuntukylin-default-settings (1.4.4) bionic; urgency=medium
+
+  * Remove ukui.layout.
+  * Update the default homepage.
+  * Use the new method to set firefox default homepage.
+  * Update the standards version and compat level.
+
+ -- handsome_feng <jianfengli@xxxxxxxxxxxxxxx>  Tue, 13 Mar 2018 11:06:30 +0800
+
 ubuntukylin-default-settings (1.4.3) bionic; urgency=medium
 
-  * Don't lock the firefox homepage. 
+  * Don't lock the firefox homepage.
 
  -- ShuiLu Pi <shuilupi@xxxxxxxxxxxxxxx>  Tue, 02 Jan 2018 14:55:55 +0800
 

=== modified file 'debian/compat'
--- debian/compat	2017-09-18 09:19:46 +0000
+++ debian/compat	2018-03-13 03:16:38 +0000
@@ -1,1 +1,1 @@
-9
+11

=== modified file 'debian/control'
--- debian/control	2017-09-18 09:19:46 +0000
+++ debian/control	2018-03-13 03:16:38 +0000
@@ -2,8 +2,8 @@
 Section: metapackages
 Priority: optional
 Maintainer: Ubuntu Kylin Team <ubuntukylin-members@xxxxxxxxxxxxxxxxxxx>
-Build-Depends: debhelper (>= 7.0.50~), ubuntu-defaults-builder
-Standards-Version: 4.0.0
+Build-Depends: debhelper (>= 10.3~), ubuntu-defaults-builder
+Standards-Version: 4.1.3
 Vcs-Bzr: https://code.launchpad.net/~ubuntukylin-members/ubuntukylin-default-settings/trunk
 Vcs-Browser: https://bazaar.launchpad.net/~ubuntukylin-members/ubuntukylin-default-settings/trunk
 

=== modified file 'debian/copyright'
--- debian/copyright	2014-07-28 13:06:46 +0000
+++ debian/copyright	2018-03-13 03:16:38 +0000
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ubuntukylin-default-settings
 Upstream-Contact: Ubuntu Kylin Team <ubuntukylin-members@xxxxxxxxxxxxxxxxxxx>
 

=== added directory 'debian/firefox/browser'
=== added directory 'debian/firefox/browser/defaults'
=== added directory 'debian/firefox/browser/defaults/preferences'
=== added file 'debian/firefox/browser/defaults/preferences/all-ubuntukylin.js'
--- debian/firefox/browser/defaults/preferences/all-ubuntukylin.js	1970-01-01 00:00:00 +0000
+++ debian/firefox/browser/defaults/preferences/all-ubuntukylin.js	2018-03-13 03:16:38 +0000
@@ -0,0 +1,3 @@
+//
+pref("general.config.obscure_value", 0);
+pref("general.config.filename", "ubuntukylin.cfg");

=== removed directory 'debian/firefox/defaults'
=== removed directory 'debian/firefox/defaults/pref'
=== removed file 'debian/firefox/defaults/pref/all-ubuntukylin.js'
--- debian/firefox/defaults/pref/all-ubuntukylin.js	2017-09-18 09:19:46 +0000
+++ debian/firefox/defaults/pref/all-ubuntukylin.js	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-pref("general.config.obscure_value", 0);
-pref("general.config.filename", "ubuntukylin.cfg");

=== modified file 'debian/firefox/ubuntukylin.cfg'
--- debian/firefox/ubuntukylin.cfg	2018-03-02 06:45:23 +0000
+++ debian/firefox/ubuntukylin.cfg	2018-03-13 03:16:38 +0000
@@ -1,2 +1,2 @@
 // Set default homepage
-defaultPref("browser.startup.homepage", "http://123.sogou.com/?11458";);
+defaultPref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=http://123.sogou.com/?11458";);

=== modified file 'debian/rules'
--- debian/rules	2017-02-17 09:19:19 +0000
+++ debian/rules	2018-03-13 03:16:38 +0000
@@ -2,6 +2,3 @@
 
 %:
 	dh "$@"
-#override_dh_install:
-#	dh_install
-#	dh_ubuntu_defaults

=== modified file 'debian/ubuntukylin-default-settings.install'
--- debian/ubuntukylin-default-settings.install	2017-09-19 07:06:48 +0000
+++ debian/ubuntukylin-default-settings.install	2018-03-13 03:16:38 +0000
@@ -6,4 +6,3 @@
 debian/firefox/ usr/lib/
 debian/apport/ubuntukylin etc/apport/native-origins.d/
 debian/60-ubuntukylin.conf usr/share/lightdm/lightdm.conf.d/
-debian/ukui.layout usr/share/mate-panel/layouts/

=== modified file 'debian/ubuntukylin-default-settings.postrm'
--- debian/ubuntukylin-default-settings.postrm	2017-09-18 09:19:46 +0000
+++ debian/ubuntukylin-default-settings.postrm	2018-03-13 03:16:38 +0000
@@ -12,9 +12,9 @@
 		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
         rm -f /usr/share/language-support/incomplete-language-support-gnome.note
 fi
 
+mv /usr/lib/firefox/distribution/distribution.ini.ubuntu-defaults /usr/lib/firefox/distribution/distribution.ini
 #DEBHELPER#
 

=== modified file 'debian/ubuntukylin-default-settings.preinst'
--- debian/ubuntukylin-default-settings.preinst	2017-09-18 09:19:46 +0000
+++ debian/ubuntukylin-default-settings.preinst	2018-03-13 03:16:38 +0000
@@ -11,11 +11,12 @@
 	for item in $files; do
 		dpkg-divert --package $package --rename --divert "/$item"".orig-brand" --add "/$item"
 	done
-        sed -i 's/\(NAME="Ubuntu\)"/\1 Kylin"/' /etc/os-release 
+        sed -i 's/\(NAME="Ubuntu\)"/\1 Kylin"/' /etc/os-release
         sed -i 's/\(PRETTY_NAME="Ubuntu\) 1/\1 Kylin 1/' /etc/os-release
-        rm -f /etc/ubuntukylin-release
         rm -f /usr/share/language-support/incomplete-language-support-gnome.note
 fi
 
+mv /usr/lib/firefox/distribution/distribution.ini /usr/lib/firefox/distribution/distributon.ini.ubuntu-defaults
+
 #DEBHELPER#
 

=== removed file 'debian/ukui.layout'
--- debian/ukui.layout	2017-04-11 13:03:47 +0000
+++ debian/ukui.layout	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-[Toplevel bottom]
-expand=true
-orientation=bottom
-size=40
-
-[Object menu-bar]
-object-type=applet
-applet-iid=UkuiMenuAppletFactory::UkuiMenuApplet
-toplevel-id=bottom
-position=0
-locked=true
-
-[Object home]
-object-type=launcher
-launcher-location=peony-browser.desktop
-toplevel-id=bottom
-position=51
-locked=true
-
-[Object browser]
-object-type=launcher
-launcher-location=firefox.desktop
-position=52
-toplevel-id=bottom
-locked=true
-
-[Object window-list]
-object-type=applet
-applet-iid=WnckletFactory::WindowListApplet
-toplevel-id=bottom
-position=56
-locked=true
-
-[Object indicators]
-object-type=applet
-applet-iid=MateIndicatorsAppletFactory::MateIndicatorsApplet
-toplevel-id=bottom
-position=10
-panel-right-stick=true
-locked=true