diff options
| -rw-r--r-- | app/Makefile.in | 2 | ||||
| -rw-r--r-- | app/moz.build | 2 | ||||
| -rw-r--r-- | app/profile/iceweasel-uxp.js (renamed from app/profile/iceweasel.js) | 0 | ||||
| -rw-r--r-- | branding/branding-common.mozbuild | 2 | ||||
| -rw-r--r-- | branding/iceweasel/pref/iceweasel-uxp-branding.js (renamed from branding/iceweasel/pref/iceweasel-branding.js) | 0 | ||||
| -rw-r--r-- | branding/shared/branding.mozbuild | 2 | ||||
| -rw-r--r-- | installer/package-manifest.in | 6 | ||||
| -rw-r--r-- | locales/Makefile.in | 2 | ||||
| -rw-r--r-- | locales/en-US/iceweasel-uxp-l10n.js (renamed from locales/en-US/iceweasel-l10n.js) | 0 |
9 files changed, 8 insertions, 8 deletions
diff --git a/app/Makefile.in b/app/Makefile.in index f051a22..23521fd 100644 --- a/app/Makefile.in +++ b/app/Makefile.in @@ -42,7 +42,7 @@ libs:: cp -p $(MOZ_APP_NAME)$(BIN_SUFFIX) $(DIST)/bin/$(MOZ_APP_NAME)-bin$(BIN_SUFFIX) endif -GARBAGE += $(addprefix $(FINAL_TARGET)/defaults/pref/, iceweasel.js) +GARBAGE += $(addprefix $(FINAL_TARGET)/defaults/pref/, iceweasel-uxp.js) endif diff --git a/app/moz.build b/app/moz.build index 7b25216..be9f540 100644 --- a/app/moz.build +++ b/app/moz.build @@ -9,7 +9,7 @@ DIRS += ['profile/extensions'] GeckoProgram(CONFIG['MOZ_APP_NAME']) JS_PREFERENCE_PP_FILES += [ - 'profile/iceweasel.js', + 'profile/iceweasel-uxp.js', ] SOURCES += [ diff --git a/app/profile/iceweasel.js b/app/profile/iceweasel-uxp.js index 2c67ea3..2c67ea3 100644 --- a/app/profile/iceweasel.js +++ b/app/profile/iceweasel-uxp.js diff --git a/branding/branding-common.mozbuild b/branding/branding-common.mozbuild index 347338d..99f0f92 100644 --- a/branding/branding-common.mozbuild +++ b/branding/branding-common.mozbuild @@ -7,7 +7,7 @@ @template def ApplicationBranding(): JS_PREFERENCE_FILES += [ - 'pref/iceweasel-branding.js', + 'pref/iceweasel-uxp-branding.js', ] if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': diff --git a/branding/iceweasel/pref/iceweasel-branding.js b/branding/iceweasel/pref/iceweasel-uxp-branding.js index 92b81a2..92b81a2 100644 --- a/branding/iceweasel/pref/iceweasel-branding.js +++ b/branding/iceweasel/pref/iceweasel-uxp-branding.js diff --git a/branding/shared/branding.mozbuild b/branding/shared/branding.mozbuild index 76925e8..7513ea9 100644 --- a/branding/shared/branding.mozbuild +++ b/branding/shared/branding.mozbuild @@ -7,7 +7,7 @@ @template def ApplicationBranding(): JS_PREFERENCE_PP_FILES += [ - 'pref/iceweasel-branding.js', + 'pref/iceweasel-uxp-branding.js', ] if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': diff --git a/installer/package-manifest.in b/installer/package-manifest.in index 0ff7bc4..bf347b5 100644 --- a/installer/package-manifest.in +++ b/installer/package-manifest.in @@ -52,7 +52,7 @@ @RESPATH@/fonts/* #endif @RESPATH@/hyphenation/* -@RESPATH@/browser/@PREF_DIR@/iceweasel-l10n.js +@RESPATH@/browser/@PREF_DIR@/iceweasel-uxp-l10n.js #ifdef HAVE_MAKENSISU @BINPATH@/uninstall/helper.exe #endif @@ -603,8 +603,8 @@ ; [Default Preferences] ; All the pref files must be part of base to prevent migration bugs -@RESPATH@/browser/@PREF_DIR@/iceweasel.js -@RESPATH@/browser/@PREF_DIR@/iceweasel-branding.js +@RESPATH@/browser/@PREF_DIR@/iceweasel-uxp.js +@RESPATH@/browser/@PREF_DIR@/iceweasel-uxp-branding.js @RESPATH@/greprefs.js @RESPATH@/defaults/autoconfig/prefcalls.js @RESPATH@/browser/defaults/permissions diff --git a/locales/Makefile.in b/locales/Makefile.in index a204bf0..8ee936e 100644 --- a/locales/Makefile.in +++ b/locales/Makefile.in @@ -34,7 +34,7 @@ RETRIEVE_WINDOWS_INSTALLER = 1 MOZ_LANGPACK_EID=langpack-$(AB_CD)@iceweasel-uxp.hyperbola.info -L10N_PREF_JS_EXPORTS = $(call MERGE_FILE,iceweasel-l10n.js) +L10N_PREF_JS_EXPORTS = $(call MERGE_FILE,iceweasel-uxp-l10n.js) L10N_PREF_JS_EXPORTS_PATH = $(FINAL_TARGET)/$(PREF_DIR) L10N_PREF_JS_EXPORTS_FLAGS = $(PREF_PPFLAGS) --silence-missing-directive-warnings PP_TARGETS += L10N_PREF_JS_EXPORTS diff --git a/locales/en-US/iceweasel-l10n.js b/locales/en-US/iceweasel-uxp-l10n.js index 642ad65..642ad65 100644 --- a/locales/en-US/iceweasel-l10n.js +++ b/locales/en-US/iceweasel-uxp-l10n.js |