mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Merge.
This commit is contained in:
commit
441ba740b0
@ -215,6 +215,13 @@ deb: $(PP_DEB_FILES) $(DIST)/branding/$(MOZ_APP_NAME)_scalable.png \
|
||||
rm -rf $(DEBDESTDIR)/$(installdir)/*
|
||||
$(NSINSTALL) -D $(DEBDESTDIR)/$(installdir)
|
||||
cp -pRL $(DIST)/$(MOZ_APP_NAME)/* $(DEBDESTDIR)/$(installdir)
|
||||
ifeq ($(MOZ_PLATFORM_MAEMO),6)
|
||||
$(NSINSTALL) debian/$(MOZ_APP_NAME).desktop $(DEBDESTDIR)/usr/share/applications/
|
||||
$(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/themes/blanco/meegotouch/icons/
|
||||
cp $(DIST)/branding/$(MOZ_APP_NAME)_scalable.png $(DEBDESTDIR)/usr/share/themes/blanco/meegotouch/icons/$(MOZ_APP_NAME).png
|
||||
else
|
||||
$(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
|
||||
@ -224,6 +231,7 @@ deb: $(PP_DEB_FILES) $(DIST)/branding/$(MOZ_APP_NAME)_scalable.png \
|
||||
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/
|
||||
cp $(DIST)/branding/$(MOZ_APP_NAME)_40x40.png $(DEBDESTDIR)/usr/share/icons/hicolor/40x40/hildon/$(MOZ_APP_NAME).png
|
||||
endif
|
||||
$(NSINSTALL) -D $(DEBDESTDIR)$(regdir)
|
||||
$(SYSINSTALL) $(MOZILLA_VERSION).$(MOZ_APP_NAME).conf $(DEBDESTDIR)$(regdir)/
|
||||
dh_link; fakeroot dh_fixperms; fakeroot dh_installdeb; dh_shlibdeps; fakeroot dh_gencontrol; fakeroot dh_md5sums; dh_builddeb
|
||||
|
@ -12,5 +12,8 @@ Depends: ${shlibs:Depends}
|
||||
Description: Web browser built by the Mozilla community
|
||||
The Firefox Web browser puts you in control of your Web experience with easy navigation, support for add-ons and synchronizes with Firefox on your PC.
|
||||
XB-Maemo-Display-Name: @MOZ_APP_DISPLAYNAME@
|
||||
#if MOZ_PLATFORM_MAEMO == 6
|
||||
XB-Maemo-Flags: visible
|
||||
#endif
|
||||
XB-Maemo-Icon-26:
|
||||
#includesubst @ABS_OBJDIR@/@BASE64_ICON@
|
||||
|
@ -10,12 +10,18 @@ StartupNotify=true
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Categories=Application;Network;
|
||||
#if MOZ_PLATFORM_MAEMO == 6
|
||||
Icon=/usr/share/themes/blanco/meegotouch/icons/@MOZ_APP_NAME@.png
|
||||
Categories=X-MeeGo;
|
||||
OnlyShownIn=X-MeeGo;
|
||||
#else
|
||||
Icon=@MOZ_APP_NAME@
|
||||
X-Icon-Path=/usr/share/icons
|
||||
X-Window-Icon=@MOZ_APP_NAME@
|
||||
X-Window-Icon-dimmed=@MOZ_APP_NAME@
|
||||
X-Osso-Type=application/x-executable
|
||||
X-Osso-Service=mozilla.@MOZ_APP_NAME@
|
||||
#endif
|
||||
X-Osso-Type=application/x-executable
|
||||
MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;
|
||||
|
||||
[X-Osso-URI-Actions]
|
||||
|
Loading…
Reference in New Issue
Block a user