diff --git a/helpers/DATA/firefox/android/res/main/drawable-hdpi/icon_home_empty_abrowser.png b/helpers/DATA/firefox/android/res/main/drawable-hdpi/icon_home_empty_firefox.png
similarity index 100%
rename from helpers/DATA/firefox/android/res/main/drawable-hdpi/icon_home_empty_abrowser.png
rename to helpers/DATA/firefox/android/res/main/drawable-hdpi/icon_home_empty_firefox.png
diff --git a/helpers/DATA/firefox/android/res/main/drawable-hdpi/icon_search_empty_abrowser.png b/helpers/DATA/firefox/android/res/main/drawable-hdpi/icon_search_empty_firefox.png
similarity index 100%
rename from helpers/DATA/firefox/android/res/main/drawable-hdpi/icon_search_empty_abrowser.png
rename to helpers/DATA/firefox/android/res/main/drawable-hdpi/icon_search_empty_firefox.png
diff --git a/helpers/DATA/firefox/android/res/main/drawable-xhdpi/icon_home_empty_abrowser.png b/helpers/DATA/firefox/android/res/main/drawable-xhdpi/icon_home_empty_firefox.png
similarity index 100%
rename from helpers/DATA/firefox/android/res/main/drawable-xhdpi/icon_home_empty_abrowser.png
rename to helpers/DATA/firefox/android/res/main/drawable-xhdpi/icon_home_empty_firefox.png
diff --git a/helpers/DATA/firefox/android/res/main/drawable-xhdpi/icon_search_empty_abrowser.png b/helpers/DATA/firefox/android/res/main/drawable-xhdpi/icon_search_empty_firefox.png
similarity index 100%
rename from helpers/DATA/firefox/android/res/main/drawable-xhdpi/icon_search_empty_abrowser.png
rename to helpers/DATA/firefox/android/res/main/drawable-xhdpi/icon_search_empty_firefox.png
diff --git a/helpers/DATA/firefox/android/res/main/drawable-xxhdpi/icon_search_empty_abrowser.png b/helpers/DATA/firefox/android/res/main/drawable-xxhdpi/icon_search_empty_firefox.png
similarity index 100%
rename from helpers/DATA/firefox/android/res/main/drawable-xxhdpi/icon_search_empty_abrowser.png
rename to helpers/DATA/firefox/android/res/main/drawable-xxhdpi/icon_search_empty_firefox.png
diff --git a/helpers/DATA/firefox/branding/abrowser.VisualElementsManifest.xml b/helpers/DATA/firefox/branding/firefox.VisualElementsManifest.xml
similarity index 100%
rename from helpers/DATA/firefox/branding/abrowser.VisualElementsManifest.xml
rename to helpers/DATA/firefox/branding/firefox.VisualElementsManifest.xml
diff --git a/helpers/DATA/firefox/branding/abrowser.icns b/helpers/DATA/firefox/branding/firefox.icns
similarity index 100%
rename from helpers/DATA/firefox/branding/abrowser.icns
rename to helpers/DATA/firefox/branding/firefox.icns
diff --git a/helpers/DATA/firefox/branding/abrowser.ico b/helpers/DATA/firefox/branding/firefox.ico
similarity index 100%
rename from helpers/DATA/firefox/branding/abrowser.ico
rename to helpers/DATA/firefox/branding/firefox.ico
diff --git a/helpers/DATA/firefox/branding/abrowser64.ico b/helpers/DATA/firefox/branding/firefox64.ico
similarity index 100%
rename from helpers/DATA/firefox/branding/abrowser64.ico
rename to helpers/DATA/firefox/branding/firefox64.ico
diff --git a/helpers/DATA/firefox/branding/moz.build b/helpers/DATA/firefox/branding/moz.build
index fcf65dd9c261479df4edb547d14884d783e8b659..9045cee11bb858092868cd8900c4e8f8e641c3b2 100644
--- a/helpers/DATA/firefox/branding/moz.build
+++ b/helpers/DATA/firefox/branding/moz.build
@@ -10,4 +10,4 @@ DIST_SUBDIR = 'browser'
export('DIST_SUBDIR')
include('../branding-common.mozbuild')
-AbrowserBranding()
+FirefoxBranding()
diff --git a/helpers/DATA/firefox/branding/pref/abrowser-branding.js b/helpers/DATA/firefox/branding/pref/firefox-branding.js
similarity index 100%
rename from helpers/DATA/firefox/branding/pref/abrowser-branding.js
rename to helpers/DATA/firefox/branding/pref/firefox-branding.js
diff --git a/helpers/DATA/firefox/control b/helpers/DATA/firefox/control
deleted file mode 100644
index 050126858fb016f6ec167257f667e39c0e38ff7d..0000000000000000000000000000000000000000
--- a/helpers/DATA/firefox/control
+++ /dev/null
@@ -1,851 +0,0 @@
-Source: firefox
-Section: web
-Priority: optional
-Maintainer: Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info>
-Vcs-Bzr: https://code.launchpad.net/~mozillateam/abrowser/abrowser.natty
-Build-Depends: cdbs,
- debhelper (>= 5),
- m4,
- autotools-dev,
- autoconf2.13,
- quilt,
- patchutils (>= 0.2.25),
- bzip2,
- zip,
- libx11-dev,
- libxt-dev,
- libgtk2.0-dev (>= 2.10),
- liborbit2-dev,
- libidl-dev (>= 0.8.0),
- libxft-dev,
- libfreetype6-dev,
- libxrender-dev,
- libxinerama-dev,
- libgnome2-dev,
- libgconf2-dev,
- libgnomeui-dev,
- libstartup-notification0-dev,
- libasound2-dev,
- libcurl4-openssl-dev,
- libdbus-glib-1-dev (>= 0.60),
- mozilla-devscripts (>= 0.10~),
- hardening-wrapper,
- lsb-release,
- libiw-dev,
- mesa-common-dev,
- libnotify-dev (>= 0.4),
- libgnomevfs2-dev,
- yasm,
- xvfb,
- imagemagick,
- libdbusmenu-gtk-dev
-Standards-Version: 3.9.1
-
-Package: abrowser
-Architecture: any
-Depends: fontconfig,
- psmisc,
- xul-ext-ubufox,
- abrowser-gnome-support,
- lsb-release,
- debianutils (>= 1.16),
- ${misc:Depends},
- ${shlibs:Depends}
-Recommends: ubufox,
- abrowser-globalmenu
-Provides: www-browser,
- iceweasel, firefox, icecat,
- gnome-www-browser
-Suggests: abrowser-gnome-support | abrowser-kde-support,
- latex-xft-fonts,
- libthai0
-Replaces: abrowser-old,
- abrowser-old-branding,
- abrowser-branding,
- kubuntu-abrowser-installer
-Breaks: abrowser-old (<= 4.0~b11+build3+nobinonly-0ubuntu1),
- abrowser-old-branding (<= 4.0~b11+build3+nobinonly-0ubuntu1),
- abrowser-branding (<= 4.0~b11+build3+nobinonly-0ubuntu1)
-XB-Xul-AppId: {ec8030f7-c20a-464f-9b0e-13a3a9e97384}
-Description: Safe and easy web browser from Mozilla
- Abrowser delivers safe, easy web browsing. A familiar user interface,
- enhanced security features including protection from online identity theft,
- and integrated search let you get the most out of the web.
-
-Package: abrowser-gnome-support
-Architecture: any
-Section: gnome
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- abrowser
-Description: Safe and easy web browser from Trisquel - GNOME support
- Abrowser delivers safe, easy web browsing. A familiar user interface,
- enhanced security features including protection from online identity theft,
- and integrated search let you get the most out of the web.
- .
- This package depends on the GNOME libraries which allow Abrowser to take
- advantage of technologies such as GConf, GIO libnotify
-
-Package: abrowser-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- abrowser (= ${binary:Version})
-Description: Safe and easy web browser from Trisquel - debug symbols
- Abrowser delivers safe, easy web browsing. A familiar user interface,
- enhanced security features including protection from online identity theft,
- and integrated search let you get the most out of the web.
- .
- This package contains the debugging symbols for the Abrowser web
- browser
-
-Package: abrowser-dev
-Architecture: any
-Section: devel
-Priority: extra
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- abrowser (= ${binary:Version}),
- ${nspr:Depends},
- ${nss:Depends},
- ${cairo:Depends}
-Conflicts: xulrunner-2.0-dev,
- xulrunner-1.9.2-dev
-Description: Safe and easy web browser from Trisquel - development files
- Abrowser delivers safe, easy web browsing. A familiar user interface,
- enhanced security features including protection from online identity theft,
- and integrated search let you get the most out of the web.
- .
- This package contains the headers and SDK for building plugins with Abrowser
-
-Package: abrowser-mozsymbols
-Architecture: amd64 i386 armel
-Section: debug
-Priority: extra
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Description: Safe and easy web browser from Trisquel - Breakpad symbols
- Abrowser delivers safe, easy web browsing. A familiar user interface,
- enhanced security features including protection from online identity theft,
- and integrated search let you get the most out of the web.
- .
- This package contains the Abrowser symbols in a format expected by Mozilla's
- Breakpad. Eventually this package should go away and the symbol upload be
- implemented in soyuz (or other builders that build this package)
-
-Package: abrowser-globalmenu
-Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- abrowser (= ${binary:Version})
-Description: Unity appmenu integration for Abrowser
- This package provides an extension which adds support for the Unity
- appmenu to Abrowser
-
-# Transitional packages below here
-
-Package: abrowser-old
-Architecture: any
-Depends: ${misc:Depends}, abrowser
-Description: Safe and easy web browser from Trisquel - transitional package
- This is a transitional package to ensure that upgrades work correctly.
- It can be safely removed
-
-Package: abrowser-branding
-Architecture: any
-Depends: ${misc:Depends}, abrowser
-Description: Safe and easy web browser from Trisquel - transitional package
- This is a transitional package to ensure that upgrades work correctly.
- It can be safely removed
-
-Package: abrowser-old-branding
-Architecture: any
-Depends: ${misc:Depends}, abrowser
-Description: Safe and easy web browser from Trisquel - transitional package
- This is a transitional package to ensure that upgrades work correctly.
- It can be safely removed
-
-Package: abrowser-gnome-support-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: ${misc:Depends}, abrowser-gnome-support, abrowser-dbg (= ${binary:Version})
-Description: Safe and easy web browser from Trisquel - transitional package
- This is a transitional package to ensure that upgrades work correctly.
- It can be safely removed
-
-# Language packs below here
-
-Package: abrowser-locale-af
-Provides: firefox-locale-af
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-af-base
-Description: Afrikaans language pack for Abrowser
- This package contains Afrikaans translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-ar
-Provides: firefox-locale-ar
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-ar-base
-Description: Arabic language pack for Abrowser
- This package contains Arabic translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-ast
-Provides: firefox-locale-ast
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-ast-base
-Description: Asturian language pack for Abrowser
- This package contains Asturian translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-be
-Provides: firefox-locale-be
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-be-base
-Description: Belarusian language pack for Abrowser
- This package contains Belarusian translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-bg
-Provides: firefox-locale-bg
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-bg-base
-Description: Bulgarian language pack for Abrowser
- This package contains Bulgarian translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-bn
-Provides: firefox-locale-bn
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-bn-base
-Description: Bengali language pack for Abrowser
- This package contains Bengali translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-br
-Provides: firefox-locale-br
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-br-base
-Description: Breton language pack for Abrowser
- This package contains Breton translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-bs
-Provides: firefox-locale-bs
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-bs-base
-Description: Bosnian language pack for Abrowser
- This package contains Bosnian translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-ca
-Provides: firefox-locale-ca
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-ca-base
-Description: Catalan; Valencian language pack for Abrowser
- This package contains Catalan; Valencian translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-cs
-Provides: firefox-locale-cs
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-cs-base
-Description: Czech language pack for Abrowser
- This package contains Czech translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-cy
-Provides: firefox-locale-cy
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-cy-base
-Description: Welsh language pack for Abrowser
- This package contains Welsh translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-da
-Provides: firefox-locale-da
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-da-base
-Description: Danish language pack for Abrowser
- This package contains Danish translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-de
-Provides: firefox-locale-de
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-de-base
-Description: German language pack for Abrowser
- This package contains German translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-el
-Provides: firefox-locale-el
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-el-base
-Description: Greek language pack for Abrowser
- This package contains Greek translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-en
-Provides: firefox-locale-en
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-en-base
-Description: English language pack for Abrowser
- This package contains English translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-eo
-Provides: firefox-locale-eo
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-eo-base
-Description: Esperanto language pack for Abrowser
- This package contains Esperanto translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-es
-Provides: firefox-locale-es
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-es-base
-Description: Spanish; Castilian language pack for Abrowser
- This package contains Spanish; Castilian translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-et
-Provides: firefox-locale-et
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-et-base
-Description: Estonian language pack for Abrowser
- This package contains Estonian translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-eu
-Provides: firefox-locale-eu
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-eu-base
-Description: Basque language pack for Abrowser
- This package contains Basque translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-fa
-Provides: firefox-locale-fa
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-fa-base
-Description: Persian language pack for Abrowser
- This package contains Persian translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-fi
-Provides: firefox-locale-fi
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-fi-base
-Description: Finnish language pack for Abrowser
- This package contains Finnish translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-fr
-Provides: firefox-locale-fr
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-fr-base
-Description: French language pack for Abrowser
- This package contains French translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-fy
-Provides: firefox-locale-fy
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-fy-base
-Description: Western Frisian language pack for Abrowser
- This package contains Western Frisian translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-ga
-Provides: firefox-locale-ga
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-ga-base
-Description: Irish language pack for Abrowser
- This package contains Irish translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-gd
-Provides: firefox-locale-gd
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-gd-base
-Description: Gaelic; Scottish Gaelic language pack for Abrowser
- This package contains Gaelic; Scottish Gaelic translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-gl
-Provides: firefox-locale-gl
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-gl-base
-Description: Galician language pack for Abrowser
- This package contains Galician translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-gu
-Provides: firefox-locale-gu
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-gu-base
-Description: Gujarati language pack for Abrowser
- This package contains Gujarati translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-he
-Provides: firefox-locale-he
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-he-base
-Description: Hebrew language pack for Abrowser
- This package contains Hebrew translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-hi
-Provides: firefox-locale-hi
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-hi-base
-Description: Hindi language pack for Abrowser
- This package contains Hindi translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-hr
-Provides: firefox-locale-hr
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-hr-base
-Description: Croatian language pack for Abrowser
- This package contains Croatian translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-hu
-Provides: firefox-locale-hu
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-hu-base
-Description: Hungarian language pack for Abrowser
- This package contains Hungarian translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-hy
-Provides: firefox-locale-hy
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-hy-base
-Description: Armenian language pack for Abrowser
- This package contains Armenian translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-id
-Provides: firefox-locale-id
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-id-base
-Description: Indonesian language pack for Abrowser
- This package contains Indonesian translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-is
-Provides: firefox-locale-is
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-is-base
-Description: Icelandic language pack for Abrowser
- This package contains Icelandic translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-it
-Provides: firefox-locale-it
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-it-base
-Description: Italian language pack for Abrowser
- This package contains Italian translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-ja
-Provides: firefox-locale-ja
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-ja-base
-Description: Japanese language pack for Abrowser
- This package contains Japanese translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-kk
-Provides: firefox-locale-kk
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-kk-base
-Description: Kazakh language pack for Abrowser
- This package contains Kazakh translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-kn
-Provides: firefox-locale-kn
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-kn-base
-Description: Kannada language pack for Abrowser
- This package contains Kannada translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-ko
-Provides: firefox-locale-ko
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-ko-base
-Description: Korean language pack for Abrowser
- This package contains Korean translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-ku
-Provides: firefox-locale-ku
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-ku-base
-Description: Kurdish language pack for Abrowser
- This package contains Kurdish translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-lg
-Provides: firefox-locale-lg
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-lg-base
-Description: Ganda language pack for Abrowser
- This package contains Ganda translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-lt
-Provides: firefox-locale-lt
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-lt-base
-Description: Lithuanian language pack for Abrowser
- This package contains Lithuanian translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-lv
-Provides: firefox-locale-lv
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-lv-base
-Description: Latvian language pack for Abrowser
- This package contains Latvian translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-mai
-Provides: firefox-locale-mai
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-mai-base
-Description: Maithili language pack for Abrowser
- This package contains Maithili translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-mk
-Provides: firefox-locale-mk
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-mk-base
-Description: Macedonian language pack for Abrowser
- This package contains Macedonian translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-ml
-Provides: firefox-locale-ml
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-ml-base
-Description: Malayalam language pack for Abrowser
- This package contains Malayalam translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-mr
-Provides: firefox-locale-mr
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-mr-base
-Description: Marathi language pack for Abrowser
- This package contains Marathi translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-nb
-Provides: firefox-locale-nb
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-nb-base
-Description: Norwegian language pack for Abrowser
- This package contains Norwegian translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-nl
-Provides: firefox-locale-nl
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-nl-base
-Description: Dutch; Flemish language pack for Abrowser
- This package contains Dutch; Flemish translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-nn
-Provides: firefox-locale-nn
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-nn-base
-Description: Norwegian Nynorsk; Nynorsk, Norwegian language pack for Abrowser
- This package contains Norwegian Nynorsk; Nynorsk, Norwegian translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-nso
-Provides: firefox-locale-nso
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-nso-base
-Description: Sotho, Northern language pack for Abrowser
- This package contains Sotho, Northern translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-or
-Provides: firefox-locale-or
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-or-base
-Description: Oriya language pack for Abrowser
- This package contains Oriya translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-pa
-Provides: firefox-locale-pa
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-pa-base
-Description: Panjabi; Punjabi language pack for Abrowser
- This package contains Panjabi; Punjabi translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-pl
-Provides: firefox-locale-pl
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-pl-base
-Description: Polish language pack for Abrowser
- This package contains Polish translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-pt
-Provides: firefox-locale-pt
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-pt-base
-Description: Portuguese language pack for Abrowser
- This package contains Portuguese translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-ro
-Provides: firefox-locale-ro
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-ro-base
-Description: Romanian language pack for Abrowser
- This package contains Romanian translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-ru
-Provides: firefox-locale-ru
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-ru-base
-Description: Russian language pack for Abrowser
- This package contains Russian translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-si
-Provides: firefox-locale-si
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-si-base
-Description: Sinhala; Sinhalese language pack for Abrowser
- This package contains Sinhala; Sinhalese translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-sk
-Provides: firefox-locale-sk
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-sk-base
-Description: Slovak language pack for Abrowser
- This package contains Slovak translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-sl
-Provides: firefox-locale-sl
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-sl-base
-Description: Slovenian language pack for Abrowser
- This package contains Slovenian translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-sq
-Provides: firefox-locale-sq
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-sq-base
-Description: Albanian language pack for Abrowser
- This package contains Albanian translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-sr
-Provides: firefox-locale-sr
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-sr-base
-Description: Serbian language pack for Abrowser
- This package contains Serbian translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-sv
-Provides: firefox-locale-sv
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-sv-base
-Description: Swedish language pack for Abrowser
- This package contains Swedish translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-ta
-Provides: firefox-locale-ta
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-ta-base
-Description: Tamil language pack for Abrowser
- This package contains Tamil translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-te
-Provides: firefox-locale-te
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-te-base
-Description: Telugu language pack for Abrowser
- This package contains Telugu translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-th
-Provides: firefox-locale-th
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-th-base
-Description: Thai language pack for Abrowser
- This package contains Thai translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-tr
-Provides: firefox-locale-tr
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-tr-base
-Description: Turkish language pack for Abrowser
- This package contains Turkish translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-uk
-Provides: firefox-locale-uk
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-uk-base
-Description: Ukrainian language pack for Abrowser
- This package contains Ukrainian translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-vi
-Provides: firefox-locale-vi
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-vi-base
-Description: Vietnamese language pack for Abrowser
- This package contains Vietnamese translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-zh-hans
-Provides: firefox-locale-zh-hans
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-zh-hans-base
-Description: Simplified Chinese language pack for Abrowser
- This package contains Simplified Chinese translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-zh-hant
-Provides: firefox-locale-zh-hant
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-zh-hant-base
-Description: Traditional Chinese language pack for Abrowser
- This package contains Traditional Chinese translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-zu
-Provides: firefox-locale-zu
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: language-pack-zu-base
-Description: Zulu language pack for Abrowser
- This package contains Zulu translations and search plugins
- for Abrowser
-
-Package: abrowser-locale-as
-Provides: firefox-locale-as
-Architecture: all
-Depends: ${misc:Depends}
-Description: Transitional package for unavailable language
- This is an empty transitional package to ensure a clean upgrade
- process. You can safely remove this package after installation.
-
-Package: abrowser-locale-ka
-Provides: firefox-locale-ka
-Architecture: all
-Depends: ${misc:Depends}
-Description: Transitional package for unavailable language
- This is an empty transitional package to ensure a clean upgrade
- process. You can safely remove this package after installation.
-
-Package: abrowser-locale-oc
-Provides: firefox-locale-oc
-Architecture: all
-Depends: ${misc:Depends}
-Description: Transitional package for unavailable language
- This is an empty transitional package to ensure a clean upgrade
- process. You can safely remove this package after installation.
diff --git a/helpers/make-firefox b/helpers/make-firefox
index 7a56bd381d97441be2cb246c96bf83580ab9a441..53c27b32fa87a0f7ed1ef5f1d0d79e85438bbc02 100644
--- a/helpers/make-firefox
+++ b/helpers/make-firefox
@@ -18,7 +18,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=61
+VERSION=62
. ./config
@@ -88,7 +88,7 @@ sed '/gmp-clearkey/d' -i ./debian/firefox.install.in
echo ac_add_options --enable-stdcxx-compat >> debian/config/mozconfig.in
# Locale packages should provide firefox-locale-$LANG
-sed "s/Provides.*/Provides: firefox-locale-@LANGCODE@/" -i debian/control.langpacks
+sed "s/Provides.*/Provides: abrowser-locale-@LANGCODE@/" -i debian/control.langpacks
# Remove Ubuntu bookmarks
sed -i /ubuntu-bookmarks/d debian/patches/series
@@ -131,46 +131,30 @@ sed "s/^MOZ_PKG_NAME\t.*/MOZ_PKG_NAME\t\t:= abrowser/;" debian/build/config.mk
############################################################################3
sed "s_^Maintainer.*_Maintainer: $DEBFULLNAME <$DEBEMAIL>_g" -i debian/control.in
-# Replace Firefox branding
-find -type d | grep firefox | xargs rename s/firefox/abrowser/
-find -type d | grep firefox | xargs rename s/firefox/abrowser/
-find -type f | grep firefox | xargs rename s/firefox/abrowser/
-find -type f | grep Firefox | xargs rename s/Firefox/Abrowser/
-
SEDSCRIPT="
-s/Mozilla Firefox/Abrowser/g;
-s/firefox/abrowser/g;
-s/Firefox/Abrowser/g;
-s/FIREFOX/ABROWSER/g;
-s/ Mozilla / Trisquel /g;
-s|PACKAGES/abrowser|PACKAGES/firefox|g;
-s/iceweasel, abrowser/iceweasel, firefox/g;
-s/Replaces: abrowser/Replaces: firefox/g;
+s/Try Firefox/Try Abrowser/g;
+s/Firefox Home/Abrowser Home/g;
+s/Firefox Account/Sync Account/g;
+s/Updates from Mozilla and Firefox/Updates from Mozilla/g;
s/Adobe Flash/Flash/g;
-s|www.mozilla.com/abrowser/central|trisquel.info/browser|g;
+s|www.mozilla.com/firefox/central|trisquel.info/browser|g;
s|mozilla.com/plugincheck|trisquel.info/browser|g;
s|www.mozilla.com/legal/privacy|trisquel.info/legal|g;
-
-s/Trisquel Public/Mozilla Public/g;
-s/Trisquel Foundation/Mozilla Foundation/g;
-s/Trisquel Corporation/Mozilla Corporation/g;
-s/abrowser.com/firefox.com/g;
"
echo "Running batch replace operation"
find . -type f -not -iregex '.*changelog.*' -not -iregex '.*copyright.*' -not -iregex '.*third_party/rust.*' -execdir /bin/sed --follow-symlinks -i "$SEDSCRIPT" '{}' ';'
-sed -i '2s/^Source:.*/Source: firefox/' debian/control.in
-sed s/ubuntu/trisquel/g debian/distribution.ini -i
-sed 's/ubuntu_version/trisquel_version/; s/Ubuntu 10.10/Trisquel 4.0/; s/1010/40/' -i debian/abrowser.postinst.in
+echo "Replacing Firefox with Abrowser on ./l10n"
+find l10n -type f -not -iregex '.*changelog.*' -not -iregex '.*copyright.*' -execdir /bin/sed --follow-symlinks -i "s/Firefox/Abrowser/" '{}' ';'
-# abrowser should provide firefox
-sed '/Package: @MOZ_PKG_NAME@-dev/,/Description:/ s/Architecture: any/Architecture: any\nProvides: firefox-dev /' debian/control.in -i
-sed '/Package: @MOZ_PKG_NAME@$/,/Description:/ s/Provides:/Provides: firefox, /' debian/control.in -i
+sed s/ubuntu/trisquel/g debian/distribution.ini -i
+sed "s/ubuntu_version/trisquel_version/; s/Ubuntu 10.10/Trisquel $REVISION/; s/1010/40/" -i debian/firefox.postinst.in
# Branding files
rm browser/branding/{official,aurora,nightly,unofficial} -rf
cp -a $DATA/branding/ browser/branding/official
+cp -a $DATA/branding/ browser/branding/unofficial
# Disable preprocessor
sed 's/_PP//' -i browser/branding/branding-common.mozbuild
cat << EOF >> debian/config/branch.mk
@@ -252,18 +236,19 @@ sed -i 's/<a\ href\=\"http\:\/\/www.mozilla.org\/\">Mozilla\ Project<\/a>/<a\ hr
# We went too far...
#sed -i 's/iceweasel, abrowser, icecat,/iceweasel, firefox, icecat,/g' debian/control.in
sed '/Provides/s/abrowser-locale/firefox-locale/' -i debian/control.langpacks
+/bin/sed '/intro-point2-a/s/Abrowser/Firefox/' -i l10n/*/toolkit/chrome/global/aboutRights.dtd
+/bin/sed '/trademarkInfo/s/Abrowser/Firefox/' -i l10n/*/browser/branding/official/brand.ftl
-# Restore useragent to Firefox
-sed '/MOZILLA_UAVERSION/ s:Abrowser/:Firefox/:' -i netwerk/protocol/http/nsHttpHandler.cpp
+/bin/sed 's/prefs_snippets_description=.*/prefs_snippets_description=Mozilla snippets/' -i l10n/*/browser/chrome/browser/activity-stream/newtab.properties
# Set migrator scripts
-sed 's/Abrowser/Firefox/g; s/abrowser/firefox/g' -i browser/components/migration/AbrowserProfileMigrator.js
-sed s/ChromeProfileMigrator/_temp_/ -i browser/components/migration/moz.build
-sed s/AbrowserProfileMigrator/ChromeProfileMigrator/ -i browser/components/migration/moz.build
-sed s/_temp_/AbrowserProfileMigrator/ -i browser/components/migration/moz.build
+#sed 's/Abrowser/Firefox/g; s/abrowser/firefox/g' -i browser/components/migration/FirefoxProfileMigrator.js
+#sed s/ChromeProfileMigrator/_temp_/ -i browser/components/migration/moz.build
+#sed s/AbrowserProfileMigrator/ChromeProfileMigrator/ -i browser/components/migration/moz.build
+#sed s/_temp_/AbrowserProfileMigrator/ -i browser/components/migration/moz.build
# js settings
-cat $DATA/settings.js >> debian/vendor-abrowser.js
+cat $DATA/settings.js >> debian/vendor-firefox.js
#################
# Android stuff #
@@ -329,6 +314,8 @@ exit 0 ' >> debian/abrowser.postinst.in
sed 's/1410/65/; s/1310/60/' -i debian/rules
+sed 's/^Source:.*/Source: firefox/' -i debian/control.in
+
debian/rules debian/control
touch -d "yesterday" debian/control
debian/rules debian/control