ubuntukylin-members team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/ubuntukylin-default-settings/remove-skype-icons into lp:ubuntukylin-default-settings.

Requested reviews:
  UbuntuKylin Members (ubuntukylin-members)
Related bugs:
  Bug #1163504 in Unity Asset Pool: "Trademarked assets"
  https://bugs.launchpad.net/unity-asset-pool/+bug/1163504

For more details, see:
https://code.launchpad.net/~cjwatson/ubuntukylin-default-settings/remove-skype-icons/+merge/160688

ubuntukylin-default-settings ships Skype icons, which we've been instructed not to ship (bug 1163504).  They weren't used, so please remove them.  I've uploaded this as ubuntukylin-default-settings 1.0.4.1 for an urgent respin.
-- 
https://code.launchpad.net/~cjwatson/ubuntukylin-default-settings/remove-skype-icons/+merge/160688
Your team UbuntuKylin Members is requested to review the proposed merge of lp:~cjwatson/ubuntukylin-default-settings/remove-skype-icons into lp:ubuntukylin-default-settings.

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-16 13:08:16 +0000
+++ debian/changelog	2013-04-24 15:31:42 +0000
@@ -1,3 +1,9 @@
+ubuntukylin-default-settings (1.0.4.1) raring; urgency=low
+
+  * Remove Skype icons (LP: #1163504).
+
+ -- Colin Watson <cjwatson@xxxxxxxxxx>  Wed, 24 Apr 2013 16:24:57 +0100
+
 ubuntukylin-default-settings (1.0.4) raring; urgency=low
 
   * refresh dependency and minor fixes. (LP: #1165636, #1165298, #1168215) 

=== removed file 'ubiquity-slideshow/slides/en_US/icons/skype.png'
Binary files ubiquity-slideshow/slides/en_US/icons/skype.png	2013-03-26 09:15:44 +0000 and ubiquity-slideshow/slides/en_US/icons/skype.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'ubiquity-slideshow/slides/zh_CN/icons/skype.png'
Binary files ubiquity-slideshow/slides/zh_CN/icons/skype.png	2013-03-13 11:50:59 +0000 and ubiquity-slideshow/slides/zh_CN/icons/skype.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'ubiquity-slideshow/slides/zh_TW/icons/skype.png'
Binary files ubiquity-slideshow/slides/zh_TW/icons/skype.png	2013-03-26 09:15:44 +0000 and ubiquity-slideshow/slides/zh_TW/icons/skype.png	1970-01-01 00:00:00 +0000 differ