Update to 48.0a1-3

4 files changed, 13 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6eaef40746db..7248ce2f09de 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun Mar 13 06:51:23 UTC 2016
+# Sun Mar 13 07:06:00 UTC 2016
 pkgbase = firefox-nightly-ru
 	pkgdesc = Web browser from mozilla.org, nightly build, russian version
 	pkgver = 48.0a1
-	pkgrel = 2
+	pkgrel = 3
 	url = http://nightly.mozilla.org/
 	install = firefox-nightly-ru.install
 	arch = i686
@@ -23,11 +23,9 @@ pkgbase = firefox-nightly-ru
 	depends = desktop-file-utils
 	conflicts = firefox-nightly
 	source = firefox-nightly.desktop
-	source = firefox-nightly-safe.desktop
 	source = firefox-nightly-ru.install
 	source = https://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central-l10n/firefox-48.0a1.ru.linux-.tar.bz2
-	md5sums = 39ee4860ee7598e3d85bdaa9e60f0c15
-	md5sums = 5996fd382818b6f1d617148d30aab237
+	md5sums = fb1cd230fed616b263b46f49c3c17f0c
 	md5sums = 04793335a2ba7d17d1bd92085461e77e
 	md5sums = 
 
diff --git a/PKGBUILD b/PKGBUILD
index 04971f49e57b..5ec0ecc714ca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,19 +4,17 @@ pkgname=firefox-nightly-ru
 pkgdesc='Web browser from mozilla.org, nightly build, russian version'
 url='http://nightly.mozilla.org/'
 pkgver=48.0a1
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
 _filename="firefox-${pkgver}.ru.linux-${CARCH}"
 _baseurl="https://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central-l10n"
 _md5sum="$(curl -vs "${_baseurl}/${_filename}.checksums" 2>&1 | grep bz | grep md5 | cut -d " " -f1)"
 source=('firefox-nightly.desktop' 
-        'firefox-nightly-safe.desktop' 
         'firefox-nightly-ru.install' 
         "${_baseurl}/${_filename}.tar.bz2")
-md5sums=('39ee4860ee7598e3d85bdaa9e60f0c15' 
-         '5996fd382818b6f1d617148d30aab237' 
-         '04793335a2ba7d17d1bd92085461e77e' 
+md5sums=('fb1cd230fed616b263b46f49c3c17f0c'
+         '04793335a2ba7d17d1bd92085461e77e'
          "${_md5sum}")
 install=${pkgname}.install
 depends=('alsa-lib' 'libxt' 'libnotify' 'mime-types' 'nss' 'gtk2' 'gtk3' 
diff --git a/firefox-nightly-safe.desktop b/firefox-nightly-safe.desktop
deleted file mode 100644
index bac9cd1c6404..000000000000
--- a/firefox-nightly-safe.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Name=Firefox Nightly - Safe Mode
-StartupWMClass=Firefox
-GenericName=Firefox nightly, русская версия - безопасный режим
-Icon=/usr/share/pixmaps/firefox-nightly-icon.png
-Type=Application
-Categories=Application;Network;
-MimeType=text/html;x-scheme-handler/http;x-scheme-handler/https;
-Encoding=UTF-8
-Exec=firefox-nightly -safe-mode %u
-Terminal=false
-MultipleArgs=false
-StartupNotify=false
diff --git a/firefox-nightly.desktop b/firefox-nightly.desktop
index fa853ced8ff7..d8bf504f9977 100644
--- a/firefox-nightly.desktop
+++ b/firefox-nightly.desktop
@@ -89,7 +89,7 @@ Icon=firefox-nightly-icon
 Categories=Network;WebBrowser;
 MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;
 StartupNotify=true
-Actions=NewTab;NewWindow;NewPrivateWindow;
+Actions=NewTab;NewWindow;NewPrivateWindow;SafeMode
 
 [Desktop Action NewTab]
 Name=Open new tab
@@ -351,3 +351,9 @@ Name[xh]=Ifestile yangasese entsha
 Name[zh_CN]=新建隐私浏览窗口
 Name[zh_TW]=新增隱私視窗
 Exec=firefox-nightly -private-window
+
+[Desktop Action SafeMode]
+Name=Safe Mode
+Name[ru]=Безопасный режим
+Exec=firefox-nightly -safe-mode %u
+