Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-04 02:57:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 533888 - Remove extra fennec folder from deb [r=blassey]

Browse Source
This commit is contained in:
Mark Finkle 2009-12-10 14:39:09 -05:00
parent 91b30c93d1
commit 7d2b775d58
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mobile/components/BrowserCLH.js
View File

@ -61,6 +61,11 @@ BrowserCLH.prototype = {
getService(Ci.nsIBrowserSearchService);
}
if (cmdLine.state == Ci.nsICommandLine.STATE_INITIAL_LAUNCH)
return;
cmdLine.preventDefault = true;
let win;
try {
var windowMediator =
@ -71,7 +76,6 @@ BrowserCLH.prototype = {
return;
win.focus();
cmdLine.preventDefault = true;
} catch (e) { }
// Assumption: All CLH arguments we've received have been sent remotely,

4
mobile/installer/Makefile.in
View File

@ -130,8 +130,8 @@ deb: debian/control debian/$(MOZ_APP_NAME).service debian/$(MOZ_APP_NAME).links
$(DIST)/branding/$(MOZ_APP_NAME)_scalable.png $(DIST)/branding/$(MOZ_APP_NAME)_26x26.png $(DIST)/branding/$(MOZ_APP_NAME)_40x40.png
rm -rf $(DEBDESTDIR)/$(installdir)/*
$(NSINSTALL) -D $(DEBDESTDIR)/$(installdir)
bunzip2 -c $(DEPTH)/dist/$(PKG_BASENAME)$(PKG_SUFFIX) | $(UNPACK_TAR) -C $(DEBDESTDIR)/$(installdir)
rm -rf $(DEBDESTDIR)/$(installdir)/$(MOZ_APP_NAME)/xulrunner
cp -pRL $(DIST)/$(MOZ_APP_NAME)/* $(DEBDESTDIR)/$(installdir)
rm -rf $(DEBDESTDIR)/$(installdir)/xulrunner
$(NSINSTALL) debian/$(MOZ_APP_NAME).desktop $(DEBDESTDIR)/usr/share/applications/hildon/
$(NSINSTALL) -D $(DEBDESTDIR)/usr/share/dbus-1/services/
cp debian/$(MOZ_APP_NAME).service $(DEBDESTDIR)/usr/share/dbus-1/services/org.mozilla.$(MOZ_APP_NAME).service

2
mobile/installer/debian/fennec.desktop.in
View File

@ -4,7 +4,7 @@ Version=@MOZ_APP_VERSION@
Encoding=UTF-8
Name=@MOZ_APP_DISPLAYNAME@
Comment=@MOZ_APP_DISPLAYNAME@ mobile browser
Exec=@installdir@/fennec/fennec
Exec=@installdir@/fennec
StartupWMClass=Navigator
StartupNotify=true
Terminal=false

2
mobile/installer/debian/fennec.links.in
View File

@ -1,5 +1,5 @@
#filter substitution
@installdir@/fennec/fennec /usr/bin/fennec
@installdir@/fennec /usr/bin/fennec
/usr/share/applications/hildon/fennec.desktop etc/others-menu/0112_fennec.desktop

2
mobile/installer/debian/fennec.service.in
View File

@ -1,5 +1,5 @@
#filter substitution
[D-BUS Service]
Name=mozilla.@MOZ_APP_NAME@
Exec=@installdir@/fennec/fennec
Exec=@installdir@/fennec