diff -u firefox-12.0~b1+build2/debian/rules firefox-12.0~b1+build2/debian/rules --- firefox-12.0~b1+build2/debian/rules +++ firefox-12.0~b1+build2/debian/rules @@ -205,29 +205,29 @@ ifeq ($(MOZ_APP_BASENAME), $(MOZ_APP_NAME)) ifeq (1,$(shell test "$(DISTRIB_VERSION_MAJOR)$(DISTRIB_VERSION_MINOR)" -eq "1004" && echo "1")) -PLUGIN_BREAKS := flashplugin-installer (<= 11.1.102.63ubuntu0.10.04.1), adobe-flashplugin (<= 11.1.102.63-0lucid1), \ - gcu-plugin (<= 0.10.12-2ubuntu1), gecko-mediaplayer (<= 0.9.9.2-1ubuntu0.10.04.1), \ - mozilla-gtk-vnc (<= 0.3.10-2ubuntu2.1), mozilla-opensc (<= 0.11.12-1ubuntu3.2), \ - mozilla-plugin-pcmanx (<= 0.3.9-2ubuntu2), mozplugger (<= 1.13.3-1ubuntu1), \ - xine-plugin (<= 1.0.2-1ubuntu2), mozilla-virt-viewer (<= 0.0.3-6ubuntu7.xul191.1) +PLUGIN_BREAKS := flashplugin-installer (<= 11.1.102.63ubuntu0.10.04.1), adobe-flashplugin (<= 11.1.102.63-0lucid1) +PLUGIN_CONFLICTS := gcu-plugin (<= 0.10.12-2ubuntu1), gecko-mediaplayer (<= 0.9.9.2-1ubuntu0.10.04.1), \ + mozilla-gtk-vnc (<= 0.3.10-2ubuntu2.1), mozilla-opensc (<= 0.11.12-1ubuntu3.2), \ + mozilla-plugin-pcmanx (<= 0.3.9-2ubuntu2), mozplugger (<= 1.13.3-1ubuntu1), \ + xine-plugin (<= 1.0.2-1ubuntu2), mozilla-virt-viewer (<= 0.0.3-6ubuntu7.xul191.1) else ifeq (1,$(shell test "$(DISTRIB_VERSION_MAJOR)$(DISTRIB_VERSION_MINOR)" -eq "1010" && echo "1")) -PLUGIN_BREAKS := flashplugin-installer (<= 11.1.102.63ubuntu0.10.10.1), adobe-flashplugin (<= 11.1.102.63-0maverick1), \ - gcu-plugin (<= 0.12.3-1), gecko-mediaplayer (<= 0.9.9.2-1ubuntu0.10.10.1), \ - mozilla-gtk-vnc (<= 0.4.1-3ubuntu2), mozilla-opensc (<= 0.11.13-1ubuntu2.1), \ - mozilla-plugin-pcmanx (<= 0.3.9-2ubuntu2), mozplugger (<= 1.14.1-2~exp3ubuntu1), \ - xine-plugin (<= 1.0.2-2ubuntu1) +PLUGIN_BREAKS := flashplugin-installer (<= 11.1.102.63ubuntu0.10.10.1), adobe-flashplugin (<= 11.1.102.63-0maverick1) +PLUGIN_CONFLICTS := gcu-plugin (<= 0.12.3-1), gecko-mediaplayer (<= 0.9.9.2-1ubuntu0.10.10.1), \ + mozilla-gtk-vnc (<= 0.4.1-3ubuntu2), mozilla-opensc (<= 0.11.13-1ubuntu2.1), \ + mozilla-plugin-pcmanx (<= 0.3.9-2ubuntu2), mozplugger (<= 1.14.1-2~exp3ubuntu1), \ + xine-plugin (<= 1.0.2-2ubuntu1) else ifeq (1,$(shell test "$(DISTRIB_VERSION_MAJOR)$(DISTRIB_VERSION_MINOR)" -eq "1104" && echo "1")) -PLUGIN_BREAKS := flashplugin-installer (<= 11.1.102.63ubuntu0.11.04.1), adobe-flashplugin (<= 11.1.102.63-0natty1), \ - gcu-plugin (<= 0.12.7-1ubuntu1) +PLUGIN_BREAKS := flashplugin-installer (<= 11.1.102.63ubuntu0.11.04.1), adobe-flashplugin (<= 11.1.102.63-0natty1) +PLUGIN_CONFLICTS := gcu-plugin (<= 0.12.7-1ubuntu1) else ifeq (1,$(shell test "$(DISTRIB_VERSION_MAJOR)$(DISTRIB_VERSION_MINOR)" -eq "1110" && echo "1")) -PLUGIN_BREAKS := flashplugin-installer (<= 11.1.102.63ubuntu0.11.10.1), adobe-flashplugin (<= 11.1.102.63-0oneiric1), \ - gcu-plugin (<= 0.12.8-1ubuntu3) +PLUGIN_BREAKS := flashplugin-installer (<= 11.1.102.63ubuntu0.11.10.1), adobe-flashplugin (<= 11.1.102.63-0oneiric1) +PLUGIN_CONFLICTS := gcu-plugin (<= 0.12.8-1ubuntu3) else -PLUGIN_BREAKS := flashplugin-installer (<= 11.1.102.63ubuntu1), adobe-flashplugin (<= 11.1.102.63-0precise1), \ - gcu-plugin (<= 0.12.10-1ubuntu1) +PLUGIN_BREAKS := flashplugin-installer (<= 11.1.102.63ubuntu1), adobe-flashplugin (<= 11.1.102.63-0precise1) +PLUGIN_CONFLICTS := gcu-plugin (<= 0.12.10-1ubuntu1) endif endif endif @@ -235,14 +235,15 @@ ifeq (1,$(shell test "$(DISTRIB_VERSION_MAJOR)$(DISTRIB_VERSION_MINOR)" -ge "1010" && echo "1")) APP_CONTROL_ARGS := -Vapp:Replaces="abrowser, abrowser-branding, firefox-branding, kubuntu-firefox-installer" \ -Vapp:Breaks="abrowser (<= 4.0~b11+build3+nobinonly-0ubuntu1), abrowser-branding (<= 4.0~b11+build3+nobinonly-0ubuntu1), \ - firefox-branding (<= 4.0~b11+build3+nobinonly-0ubuntu1), $(PLUGIN_BREAKS)" + firefox-branding (<= 4.0~b11+build3+nobinonly-0ubuntu1), $(PLUGIN_BREAKS)" \ + -Vapp:Conflicts="$(PLUGIN_CONFLICTS)" else APP_CONTROL_ARGS := -Vapp:Provides="firefox-3.6, firefox-3.5, firefox-3.0, firefox-2, firefox-2-dom-inspector, firefox-2-libthai" \ -Vapp:Conflicts="firefox-3.6 (<< 3.6~hg20100117r33523), firefox-3.5 (<< 3.6~hg20100117r33523), \ firefox-3.0 (<< 3.6~hg20100117r33523), firefox-3.6-gnome-support (<< 3.6~hg20100117r33523), \ firefox-2 (<< 3), firefox-2-libthai (<< 3), firefox-2-dom-inspector (<< 3), \ abrowser (<= 4.0~b11+build3+nobinonly-0ubuntu1), abrowser-branding (<= 4.0~b11+build3+nobinonly-0ubuntu1), \ - firefox-branding (<= 4.0~b11+build3+nobinonly-0ubuntu1)" \ + firefox-branding (<= 4.0~b11+build3+nobinonly-0ubuntu1), $(PLUGIN_CONFLICTS)" \ -Vapp:Replaces="firefox-3.6, firefox-3.5, firefox-3.0, firefox-3.6-gnome-support, firefox-2, firefox-2-libthai, \ firefox-2-dom-inspector, abrowser, abrowser-branding, firefox-branding, kubuntu-firefox-installer" \ -Vapp:Breaks="$(PLUGIN_BREAKS)" diff -u firefox-12.0~b1+build2/debian/changelog firefox-12.0~b1+build2/debian/changelog --- firefox-12.0~b1+build2/debian/changelog +++ firefox-12.0~b1+build2/debian/changelog @@ -1,4 +1,4 @@ -firefox (12.0~b1+build2-0ubuntu0.12.04.1~mfn1) precise; urgency=low +firefox (12.0~b1+build2-0ubuntu0.12.04.1~mfn2) precise; urgency=low * New upstream release from the beta channel (FIREFOX_12_0b1_BUILD2) @@ -20,7 +20,7 @@ - refresh debian/config/locales.shipped - refresh debian/control - -- Chris Coulson Thu, 15 Mar 2012 11:45:33 +0000 + -- Chris Coulson Thu, 15 Mar 2012 12:06:44 +0000 firefox (11.0+build1-0ubuntu1) precise; urgency=low