diff -u mozilla-firefox-locale-all-2.0.0.7+1/debian/templates/package.template mozilla-firefox-locale-all-2.0.0.7+1/debian/templates/package.template --- mozilla-firefox-locale-all-2.0.0.7+1/debian/templates/package.template +++ mozilla-firefox-locale-all-2.0.0.7+1/debian/templates/package.template @@ -1,7 +1,7 @@ Package: mozilla-firefox-locale-CURLOCALESMALL Architecture: all -Depends: firefox-2 | language-support-CURLANG +Depends: language-support-CURLANG | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox CURLANGNAME language/region package Menu and message resource and region property package diff -u mozilla-firefox-locale-all-2.0.0.7+1/debian/control mozilla-firefox-locale-all-2.0.0.7+1/debian/control --- mozilla-firefox-locale-all-2.0.0.7+1/debian/control +++ mozilla-firefox-locale-all-2.0.0.7+1/debian/control @@ -8,7 +8,7 @@ Package: mozilla-firefox-locale-af Architecture: all -Depends: firefox-2 | language-support-af +Depends: language-support-af | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Afrikaans language/region package Menu and message resource and region property package @@ -18,7 +18,7 @@ Package: mozilla-firefox-locale-ar Architecture: all -Depends: firefox-2 | language-support-ar +Depends: language-support-ar | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Arabic language/region package Menu and message resource and region property package @@ -28,7 +28,7 @@ Package: mozilla-firefox-locale-be Architecture: all -Depends: firefox-2 | language-support-be +Depends: language-support-be | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Belarusian language/region package Menu and message resource and region property package @@ -38,7 +38,7 @@ Package: mozilla-firefox-locale-bg-bg Architecture: all -Depends: firefox-2 | language-support-bg +Depends: language-support-bg | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Bulgarian language/region package Menu and message resource and region property package @@ -48,7 +48,7 @@ Package: mozilla-firefox-locale-ca Architecture: all -Depends: firefox-2 | language-support-ca +Depends: language-support-ca | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Catalan; Valencian language/region package Menu and message resource and region property package @@ -58,7 +58,7 @@ Package: mozilla-firefox-locale-cs-cz Architecture: all -Depends: firefox-2 | language-support-cs +Depends: language-support-cs | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Czech language/region package Menu and message resource and region property package @@ -68,7 +68,7 @@ Package: mozilla-firefox-locale-da-dk Architecture: all -Depends: firefox-2 | language-support-da +Depends: language-support-da | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Danish language/region package Menu and message resource and region property package @@ -78,7 +78,7 @@ Package: mozilla-firefox-locale-de-de Architecture: all -Depends: firefox-2 | language-support-de +Depends: language-support-de | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox German language/region package Menu and message resource and region property package @@ -88,7 +88,7 @@ Package: mozilla-firefox-locale-el Architecture: all -Depends: firefox-2 | language-support-el +Depends: language-support-el | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Greek, Modern (1453-) language/region package Menu and message resource and region property package @@ -98,7 +98,7 @@ Package: mozilla-firefox-locale-en-gb Architecture: all -Depends: firefox-2 | language-support-en +Depends: language-support-en | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox English language/region package Menu and message resource and region property package @@ -108,7 +108,7 @@ Package: mozilla-firefox-locale-es-ar Architecture: all -Depends: firefox-2 | language-support-es +Depends: language-support-es | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Spanish; Castilian language/region package Menu and message resource and region property package @@ -118,7 +118,7 @@ Package: mozilla-firefox-locale-es-es Architecture: all -Depends: firefox-2 | language-support-es +Depends: language-support-es | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Spanish; Castilian language/region package Menu and message resource and region property package @@ -128,7 +128,7 @@ Package: mozilla-firefox-locale-eu Architecture: all -Depends: firefox-2 | language-support-eu +Depends: language-support-eu | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Basque language/region package Menu and message resource and region property package @@ -138,7 +138,7 @@ Package: mozilla-firefox-locale-fi-fi Architecture: all -Depends: firefox-2 | language-support-fi +Depends: language-support-fi | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Finnish language/region package Menu and message resource and region property package @@ -148,7 +148,7 @@ Package: mozilla-firefox-locale-fr-fr Architecture: all -Depends: firefox-2 | language-support-fr +Depends: language-support-fr | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox French language/region package Menu and message resource and region property package @@ -158,7 +158,7 @@ Package: mozilla-firefox-locale-fy-nl Architecture: all -Depends: firefox-2 | language-support-fy +Depends: language-support-fy | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Western Frisian language/region package Menu and message resource and region property package @@ -168,7 +168,7 @@ Package: mozilla-firefox-locale-ga-ie Architecture: all -Depends: firefox-2 | language-support-ga +Depends: language-support-ga | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Irish language/region package Menu and message resource and region property package @@ -178,7 +178,7 @@ Package: mozilla-firefox-locale-gu-in Architecture: all -Depends: firefox-2 | language-support-gu +Depends: language-support-gu | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Gujarati language/region package Menu and message resource and region property package @@ -188,7 +188,7 @@ Package: mozilla-firefox-locale-he-il Architecture: all -Depends: firefox-2 | language-support-he +Depends: language-support-he | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Hebrew language/region package Menu and message resource and region property package @@ -198,7 +198,7 @@ Package: mozilla-firefox-locale-hu-hu Architecture: all -Depends: firefox-2 | language-support-hu +Depends: language-support-hu | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Hungarian language/region package Menu and message resource and region property package @@ -208,7 +208,7 @@ Package: mozilla-firefox-locale-it-it Architecture: all -Depends: firefox-2 | language-support-it +Depends: language-support-it | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Italian language/region package Menu and message resource and region property package @@ -218,7 +218,7 @@ Package: mozilla-firefox-locale-ja-jp Architecture: all -Depends: firefox-2 | language-support-ja +Depends: language-support-ja | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Japanese language/region package Menu and message resource and region property package @@ -228,7 +228,7 @@ Package: mozilla-firefox-locale-ka-ge Architecture: all -Depends: firefox-2 | language-support-ka +Depends: language-support-ka | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Georgian language/region package Menu and message resource and region property package @@ -238,7 +238,7 @@ Package: mozilla-firefox-locale-ko Architecture: all -Depends: firefox-2 | language-support-ko +Depends: language-support-ko | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Korean language/region package Menu and message resource and region property package @@ -248,7 +248,7 @@ Package: mozilla-firefox-locale-ku Architecture: all -Depends: firefox-2 | language-support-ku +Depends: language-support-ku | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Kurdish language/region package Menu and message resource and region property package @@ -258,7 +258,7 @@ Package: mozilla-firefox-locale-lt Architecture: all -Depends: firefox-2 | language-support-lt +Depends: language-support-lt | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Lithuanian language/region package Menu and message resource and region property package @@ -268,7 +268,7 @@ Package: mozilla-firefox-locale-mk-mk Architecture: all -Depends: firefox-2 | language-support-mk +Depends: language-support-mk | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Macedonian language/region package Menu and message resource and region property package @@ -278,7 +278,7 @@ Package: mozilla-firefox-locale-mn Architecture: all -Depends: firefox-2 | language-support-mn +Depends: language-support-mn | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Mongolian language/region package Menu and message resource and region property package @@ -288,7 +288,7 @@ Package: mozilla-firefox-locale-nb-no Architecture: all -Depends: firefox-2 | language-support-nb +Depends: language-support-nb | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Norwegian Bokmål; Bokmål, Norwegian language/region package Menu and message resource and region property package @@ -298,7 +298,7 @@ Package: mozilla-firefox-locale-nl-nl Architecture: all -Depends: firefox-2 | language-support-nl +Depends: language-support-nl | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Dutch; Flemish language/region package Menu and message resource and region property package @@ -308,7 +308,7 @@ Package: mozilla-firefox-locale-nn-no Architecture: all -Depends: firefox-2 | language-support-nn +Depends: language-support-nn | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Norwegian Nynorsk; Nynorsk, Norwegian language/region package Menu and message resource and region property package @@ -318,7 +318,7 @@ Package: mozilla-firefox-locale-nso Architecture: all -Depends: firefox-2 | language-support-nso +Depends: language-support-nso | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Northern Sotho language/region package Menu and message resource and region property package @@ -328,7 +328,7 @@ Package: mozilla-firefox-locale-pa-in Architecture: all -Depends: firefox-2 | language-support-pa +Depends: language-support-pa | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Panjabi; Punjabi language/region package Menu and message resource and region property package @@ -338,7 +338,7 @@ Package: mozilla-firefox-locale-pl-pl Architecture: all -Depends: firefox-2 | language-support-pl +Depends: language-support-pl | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Polish language/region package Menu and message resource and region property package @@ -348,7 +348,7 @@ Package: mozilla-firefox-locale-pt-br Architecture: all -Depends: firefox-2 | language-support-pt +Depends: language-support-pt | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Portuguese language/region package Menu and message resource and region property package @@ -358,7 +358,7 @@ Package: mozilla-firefox-locale-pt-pt Architecture: all -Depends: firefox-2 | language-support-pt +Depends: language-support-pt | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Portuguese language/region package Menu and message resource and region property package @@ -368,7 +368,7 @@ Package: mozilla-firefox-locale-ro-ro Architecture: all -Depends: firefox-2 | language-support-ro +Depends: language-support-ro | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Romanian language/region package Menu and message resource and region property package @@ -378,7 +378,7 @@ Package: mozilla-firefox-locale-ru-ru Architecture: all -Depends: firefox-2 | language-support-ru +Depends: language-support-ru | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Russian language/region package Menu and message resource and region property package @@ -388,7 +388,7 @@ Package: mozilla-firefox-locale-sk Architecture: all -Depends: firefox-2 | language-support-sk +Depends: language-support-sk | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Slovak language/region package Menu and message resource and region property package @@ -398,7 +398,7 @@ Package: mozilla-firefox-locale-sl-si Architecture: all -Depends: firefox-2 | language-support-sl +Depends: language-support-sl | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Slovenian language/region package Menu and message resource and region property package @@ -408,7 +408,7 @@ Package: mozilla-firefox-locale-sv-se Architecture: all -Depends: firefox-2 | language-support-sv +Depends: language-support-sv | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Swedish language/region package Menu and message resource and region property package @@ -418,7 +418,7 @@ Package: mozilla-firefox-locale-tr-tr Architecture: all -Depends: firefox-2 | language-support-tr +Depends: language-support-tr | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Turkish language/region package Menu and message resource and region property package @@ -428,7 +428,7 @@ Package: mozilla-firefox-locale-zh-cn Architecture: all -Depends: firefox-2 | language-support-zh +Depends: language-support-zh | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Chinese language/region package Menu and message resource and region property package @@ -438,7 +438,7 @@ Package: mozilla-firefox-locale-zh-tw Architecture: all -Depends: firefox-2 | language-support-zh +Depends: language-support-zh | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Chinese language/region package Menu and message resource and region property package @@ -448,7 +448,7 @@ Package: mozilla-firefox-locale-zu Architecture: all -Depends: firefox-2 | language-support-zu +Depends: language-support-zu | firefox-2 Conflicts: firefox (<< 1.99) Description: Mozilla Firefox Zulu language/region package Menu and message resource and region property package diff -u mozilla-firefox-locale-all-2.0.0.7+1/debian/changelog mozilla-firefox-locale-all-2.0.0.7+1/debian/changelog --- mozilla-firefox-locale-all-2.0.0.7+1/debian/changelog +++ mozilla-firefox-locale-all-2.0.0.7+1/debian/changelog @@ -1,3 +1,12 @@ +mozilla-firefox-locale-all (2.0.0.7+1-0ubuntu4) hardy; urgency=low + + * make firefox-2 a secondary depends to prevent auto install of + firefox-2 when upgrading from gutsy (LP: #217876) + - update debian/control + - update debian/templates/package.template + + -- Alexander Sack Wed, 16 Apr 2008 15:22:26 +0200 + mozilla-firefox-locale-all (2.0.0.7+1-0ubuntu3) hardy; urgency=low * drop conflicts for firefox >> 2.0.999; firefox-3.0 installs its