From 247eec44d5fb0bf488e17ed1756b393a0da80fa9 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 2 Apr 2014 14:24:30 +0800
Subject: [PATCH 1/4] Upgrade to atom-shell@0.11.5

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a48afe190..66f671b0a 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "url": "https://github.com/atom/atom/issues"
   },
   "license": "All Rights Reserved",
-  "atomShellVersion": "0.11.4",
+  "atomShellVersion": "0.11.5",
   "dependencies": {
     "async": "0.2.6",
     "atom-keymap": "^0.15.0",

From 271b1041200523044f7a6332f821afe32db759b5 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 28 Mar 2014 18:25:53 +0800
Subject: [PATCH 2/4] :penguin: Fix normalized menu item label.

---
 src/menu-manager.coffee | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/menu-manager.coffee b/src/menu-manager.coffee
index 8565cacaf..6e3f03c67 100644
--- a/src/menu-manager.coffee
+++ b/src/menu-manager.coffee
@@ -116,10 +116,10 @@ class MenuManager
   normalizeLabel: (label) ->
     return undefined unless label?
 
-    if process.platform is 'win32'
-      label.replace(/\&/g, '')
-    else
+    if process.platform is 'darwin'
       label
+    else
+      label.replace(/\&/g, '')
 
   # Get an {Array} of {String} classes for the given element.
   classesForElement: (element) ->

From 893a3f63dd32f1fcd466913e8b7e6a5c7ca8e91b Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 28 Mar 2014 18:39:45 +0800
Subject: [PATCH 3/4] :penguin: Add arch in the deb package.

---
 script/mkdeb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/script/mkdeb b/script/mkdeb
index 66ce9686b..0bcc84926 100755
--- a/script/mkdeb
+++ b/script/mkdeb
@@ -12,7 +12,7 @@ ICON_FILE="$4"
 DEB_PATH="$5"
 
 TARGET_ROOT="`mktemp -d`"
-TARGET="$TARGET_ROOT/atom-$VERSION"
+TARGET="$TARGET_ROOT/atom-$VERSION-amd64"
 
 mkdir -p "$TARGET/usr"
 env INSTALL_PREFIX="$TARGET/usr" script/grunt install
@@ -27,5 +27,5 @@ mkdir -p "$TARGET/usr/share/pixmaps"
 cp "$ICON_FILE" "$TARGET/usr/share/pixmaps"
 
 dpkg-deb -b "$TARGET"
-mv "$TARGET_ROOT/atom-$VERSION.deb" "$DEB_PATH"
+mv "$TARGET_ROOT/atom-$VERSION-amd64.deb" "$DEB_PATH"
 rm -rf $TARGET_ROOT

From b2fdc25c8311e2ce99db503ae9ca24d627e21a8a Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 28 Mar 2014 18:51:27 +0800
Subject: [PATCH 4/4] :penguin: Hide the 'Install update' menu.

---
 menus/linux.cson | 1 -
 1 file changed, 1 deletion(-)

diff --git a/menus/linux.cson b/menus/linux.cson
index f69ab563c..cf4cdfb2e 100644
--- a/menus/linux.cson
+++ b/menus/linux.cson
@@ -147,7 +147,6 @@
       { label: '&About Atom...', command: 'application:about' }
       { label: 'View &License', command: 'application:open-license' }
       { label: "VERSION", enabled: false }
-      { label: "Install &update", command: 'application:install-update', visible: false }
       { type: 'separator' }
       { label: '&Documentation', command: 'application:open-documentation' }
       { type: 'separator' }