diff -Nru cinnamon-2.2.16/debian/changelog cinnamon-2.2.16/debian/changelog --- cinnamon-2.2.16/debian/changelog 2014-12-05 14:43:28.000000000 +0000 +++ cinnamon-2.2.16/debian/changelog 2015-02-28 13:36:49.000000000 +0000 @@ -1,3 +1,11 @@ +cinnamon (2.2.16-5ubuntu1) vivid; urgency=medium + + * Do not apply debian/patches/replace_firefox_with_iceweasel as it's not + needed. + * Use firefox instead of iceweasel in debian/cinnamon.gsettings-override. + + -- Fabio Fantoni Sat, 28 Feb 2015 14:32:02 +0100 + cinnamon (2.2.16-5) unstable; urgency=medium [ Fabio Fantoni ] diff -Nru cinnamon-2.2.16/debian/cinnamon.gsettings-override cinnamon-2.2.16/debian/cinnamon.gsettings-override --- cinnamon-2.2.16/debian/cinnamon.gsettings-override 2014-12-05 14:43:28.000000000 +0000 +++ cinnamon-2.2.16/debian/cinnamon.gsettings-override 2015-02-28 13:36:49.000000000 +0000 @@ -1,3 +1,3 @@ [org.cinnamon] -favorite-apps=[ 'iceweasel.desktop', 'cinnamon-settings.desktop', 'pidgin.desktop', 'gnome-terminal.desktop', 'nemo.desktop' ] +favorite-apps=[ 'firefox.desktop', 'cinnamon-settings.desktop', 'pidgin.desktop', 'gnome-terminal.desktop', 'nemo.desktop' ] diff -Nru cinnamon-2.2.16/debian/patches/series cinnamon-2.2.16/debian/patches/series --- cinnamon-2.2.16/debian/patches/series 2014-12-05 14:43:28.000000000 +0000 +++ cinnamon-2.2.16/debian/patches/series 2015-02-28 13:36:49.000000000 +0000 @@ -16,7 +16,6 @@ fix-cinnamon-screensaver-path fix-cinnamon-json-makepot-path add_policykit-1-gnome_to_session -replace_firefox_with_iceweasel calendar-applet-upower-support make_nm_optional add_capi_search_path