Merge lp:~smartboyhw/ubuntu/trusty/ubuntustudio-default-settings/fix-bug-1242417 into lp:ubuntu/trusty/ubuntustudio-default-settings

[Kaj Ailomaa]

Roll back a change that prevents GRUB loading on UEFI

[Martin Pitt (pitti)]

LGTM.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-21 20:27:30 +0000
+++ debian/changelog	2013-10-22 17:53:43 +0000
@@ -1,3 +1,9 @@
+ubuntustudio-default-settings (0.50) trusty; urgency=low
+
+  * Revert the GRUB Distribution name change (LP: #1242417) 
+
+ -- Howard Chan <[e-mail]>  Tue, 22 Oct 2013 23:17:15 +0800
+
 ubuntustudio-default-settings (0.49) saucy; urgency=low
 
   * Make the new default wallpaper show on both of dual creens
 
=== added file 'debian/ubuntustudio-default-settings.maintscript'
--- debian/ubuntustudio-default-settings.maintscript	1970-01-01 00:00:00 +0000
+++ debian/ubuntustudio-default-settings.maintscript	2013-10-22 17:53:43 +0000
@@ -0,0 +1,1 @@
+rm_conffile /etc/default/grub.d/50_ubuntustudio.cfg 0.50~
 
=== removed directory 'etc/default'
=== removed directory 'etc/default/grub.d'
=== removed file 'etc/default/grub.d/50_ubuntustudio.cfg'
--- etc/default/grub.d/50_ubuntustudio.cfg	2013-08-24 16:28:36 +0000
+++ etc/default/grub.d/50_ubuntustudio.cfg	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#! /bin/sh
-set -e
-
-# Hijack distributor if it is Ubuntu (default on Ubuntu systems...)
-if [ "${GRUB_DISTRIBUTOR}" = "Ubuntu" ] ; then
-  GRUB_DISTRIBUTOR="UbuntuStudio"
-fi