Bug 533888 - Remove extra fennec folder from deb [r=blassey]
authorMark Finkle <mfinkle@mozilla.com>
Thu, 10 Dec 2009 14:39:09 -0500
changeset 1213 34741069f1a13d811156f671071f496389ce2b8a
parent 1212 72e721b8ed4fbe310ddb06c5ea6e6a27803427cd
child 1214 8e89dab9b9a774bf5f1013683ce17c6dc7632e0b
push id1077
push usermfinkle@mozilla.com
push dateThu, 10 Dec 2009 19:50:29 +0000
reviewersblassey
bugs533888
Bug 533888 - Remove extra fennec folder from deb [r=blassey]
components/BrowserCLH.js
installer/Makefile.in
installer/debian/fennec.desktop.in
installer/debian/fennec.links.in
installer/debian/fennec.service.in
--- a/components/BrowserCLH.js
+++ b/components/BrowserCLH.js
@@ -56,27 +56,31 @@ BrowserCLH.prototype = {
     // the cache during install, not runtime.
     // NOTE: This code assumes this CLH is run before the nsDefaultCLH, which
     // consumes the "-silent" flag.
     if (cmdLine.findFlag("silent", false) > -1) {
       let searchService = Cc["@mozilla.org/browser/search-service;1"].
                           getService(Ci.nsIBrowserSearchService);
     }
 
+    if (cmdLine.state == Ci.nsICommandLine.STATE_INITIAL_LAUNCH)
+      return;
+
+    cmdLine.preventDefault = true;
+
     let win;
     try {
       var windowMediator =
         Cc["@mozilla.org/appshell/window-mediator;1"].getService(Ci.nsIWindowMediator);
 
       win = windowMediator.getMostRecentWindow("navigator:browser");
       if (!win)
         return;
 
       win.focus();
-      cmdLine.preventDefault = true;
     } catch (e) { }
 
     // Assumption:  All CLH arguments we've received have been sent remotely,
     // or we wouldn't already have a window.  Therefore: open 'em all!
     for (let i = 0; i < cmdLine.length; i++) {
       let arg = cmdLine.getArgument(i);
       if (!arg || arg[0] == '-')
         continue;
--- a/installer/Makefile.in
+++ b/installer/Makefile.in
@@ -125,18 +125,18 @@ debian/$(MOZ_APP_NAME).service: $(srcdir
 	mkdir -p debian
 	$(PYTHON) $(topsrcdir)/config/Preprocessor.py \
         $(AUTOMATION_PPARGS) $(DEFINES) $(ACDEFINES) $< > $@
 
 deb: debian/control debian/$(MOZ_APP_NAME).service debian/$(MOZ_APP_NAME).links debian/$(MOZ_APP_NAME).desktop \
 	$(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
 	$(NSINSTALL) -D $(DEBDESTDIR)/usr/share/icons/hicolor/scalable/hildon/
 	cp $(DIST)/branding/$(MOZ_APP_NAME)_scalable.png $(DEBDESTDIR)/usr/share/icons/hicolor/scalable/hildon/$(MOZ_APP_NAME).png
 	$(NSINSTALL) -D $(DEBDESTDIR)/usr/share/icons/hicolor/26x26/hildon/
 	cp $(DIST)/branding/$(MOZ_APP_NAME)_26x26.png $(DEBDESTDIR)/usr/share/icons/hicolor/26x26/hildon/$(MOZ_APP_NAME).png
 	$(NSINSTALL) -D $(DEBDESTDIR)/usr/share/icons/hicolor/40x40/hildon/
--- a/installer/debian/fennec.desktop.in
+++ b/installer/debian/fennec.desktop.in
@@ -1,15 +1,15 @@
 #filter substitution
 [Desktop Entry]
 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
 X-MultipleArgs=false
 Type=Application
 X-Icon-Path=/usr/share/icons
 Icon=@MOZ_APP_NAME@
 X-Window-Icon=@MOZ_APP_NAME@
--- a/installer/debian/fennec.links.in
+++ b/installer/debian/fennec.links.in
@@ -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
 
 
--- a/installer/debian/fennec.service.in
+++ b/installer/debian/fennec.service.in
@@ -1,5 +1,5 @@
 #filter substitution
 [D-BUS Service]
 Name=mozilla.@MOZ_APP_NAME@
-Exec=@installdir@/fennec/fennec 
+Exec=@installdir@/fennec