diff --git a/README.md b/README.md index 3c57350..adfa5e3 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ sudo post_install_sid.sh * preferences.d directory: Use apt/preferences.d directory from git repository to provide the preferences.d system directory. * Backup initials files if exists. * Default preferences: Sid < Stretch < Stable < Old-stable < Experimental - * Iceweasel/Icedove preferences: Experimental + * Firefox/Icedove preferences: Experimental * Update Debian repositories. ##### Add @@ -171,7 +171,7 @@ apt-rdepends -r vim-nox ``` * Get a graph of dependencies: ```sh -apt-rdepends -d iceweasel|dot -Tsvg > iceweaseldep.svg +apt-rdepends -d firefox|dot -Tsvg > firefoxdep.svg ``` * apt-show-source: Shouws source-package information. * apt-show-versions: Lists available package versions with version. @@ -326,14 +326,14 @@ iface enp0s25 inet dhcp #### Internet tools for X11 ##### Add -* browser-plugin-freshplayer-pepperflash: PPAPI-host NPAPI-plugin adapter for pepperflash to get the latest Flash Plugin into Iceweasel/Firefox. +* browser-plugin-freshplayer-pepperflash: PPAPI-host NPAPI-plugin adapter for pepperflash to get the latest Flash Plugin into Firefox/Firefox. * dwb: Lightweight WebKit browser. * filezilla: Full-featured FTP client with an easy-to-use GUI. * icedove: Mail/news client with RSS and integrated spam filter support. * icedove-l10n-fr: French language package for Icedove. * iceowl-extension: Calendar Extension for Thunderbird/Icedove (Lightning addon replacement). -* iceweasel: Web browser based on Firefox. -* iceweasel-l10n-fr: French language package for Iceweasel. +* firefox: Web browser based on Firefox. +* firefox-l10n-fr: French language package for Firefox. * luakit: Fast and small web browser extensible by Lua. * midori: Fast, lightweight graphical web browser based on WebKit. * mumble: Low latency encrypted VoIP client. diff --git a/apt/preferences.d/firefox.pref b/apt/preferences.d/firefox.pref new file mode 100644 index 0000000..406d117 --- /dev/null +++ b/apt/preferences.d/firefox.pref @@ -0,0 +1,4 @@ +Explanation: Version expérimentale de Firefox +Package: firefox firefox-l10n-fr +Pin: release o=Debian,a=experimental,n=experimental,l=Debian +Pin-Priority: 1001 diff --git a/apt/preferences.d/iceweasel.pref b/apt/preferences.d/iceweasel.pref deleted file mode 100644 index 5d82540..0000000 --- a/apt/preferences.d/iceweasel.pref +++ /dev/null @@ -1,5 +0,0 @@ -Explanation: Version expérimentale d'Iceweasel -Explanation: xulrunner et libmozjs à incrémenter en fonction des versions -Package: iceweasel iceweasel-l10n-fr xulrunner-40 libmozjs40d -Pin: release o=Debian,a=experimental,n=experimental,l=Debian -Pin-Priority: 1001 diff --git a/post_install_sid.sh b/post_install_sid.sh index af779a0..3c47918 100755 --- a/post_install_sid.sh +++ b/post_install_sid.sh @@ -639,7 +639,7 @@ fi ########################################################### #### Internet tools for X11 ##### Installation -ains "Internet tools for X11" browser-plugin-freshplayer-pepperflash dwb filezilla icedove icedove-l10n-fr iceowl-extension iceweasel iceweasel-l10n-fr luakit midori mumble pepperflashplugin-nonfree pidgin pidgin-otr pidgin-microblog rdesktop transmission xvnc4viewer +ains "Internet tools for X11" browser-plugin-freshplayer-pepperflash dwb filezilla icedove icedove-l10n-fr iceowl-extension firefox firefox-l10n-fr luakit midori mumble pepperflashplugin-nonfree pidgin pidgin-otr pidgin-microblog rdesktop transmission xvnc4viewer ##### Remove arem "Purge: Internet tools for X11" flashplugin-nonfree flashplugin-nonfree-extrasound