From da642f01e1e6add09073e6bde8357e580ee26e60b7e3b5598b942ea8ebe92ec2 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Fri, 23 Oct 2009 12:11:43 +0000 Subject: [PATCH 1/5] fix bnc#549496 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox-branding-openSUSE?expand=0&rev=54 --- MozillaFirefox-branding-openSUSE.changes | 6 ++++++ MozillaFirefox-branding-openSUSE.spec | 3 +-- susefox-20090928.tar.bz2 | 3 --- susefox-20091023.tar.bz2 | 3 +++ 4 files changed, 10 insertions(+), 5 deletions(-) delete mode 100644 susefox-20090928.tar.bz2 create mode 100644 susefox-20091023.tar.bz2 diff --git a/MozillaFirefox-branding-openSUSE.changes b/MozillaFirefox-branding-openSUSE.changes index 31dd141..7614471 100644 --- a/MozillaFirefox-branding-openSUSE.changes +++ b/MozillaFirefox-branding-openSUSE.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 23 14:09:45 CEST 2009 - wr@rosenauer.org + +- update susefox to snapshot 20091023 + * remove unneeded error dialog (bnc#549496) + ------------------------------------------------------------------- Mon Sep 28 07:23:19 CEST 2009 - wr@rosenauer.org diff --git a/MozillaFirefox-branding-openSUSE.spec b/MozillaFirefox-branding-openSUSE.spec index 6beeafd..39a97c2 100644 --- a/MozillaFirefox-branding-openSUSE.spec +++ b/MozillaFirefox-branding-openSUSE.spec @@ -19,14 +19,13 @@ # norootforbuild BuildRequires: MozillaFirefox bc unzip zip - Name: MozillaFirefox-branding-openSUSE License: BSD 3-clause (or similar) ; GPL v2 or later Version: 3.5 Release: 7 Summary: openSUSE branding of MozillaFirefox Group: Productivity/Networking/Web/Browsers -Source: susefox-20090928.tar.bz2 +Source: susefox-20091023.tar.bz2 Source1: search-addons.tar.bz2 Source2: bookmarks.html.suse Source3: firefox-suse-default-prefs.js diff --git a/susefox-20090928.tar.bz2 b/susefox-20090928.tar.bz2 deleted file mode 100644 index 2f0cfcc..0000000 --- a/susefox-20090928.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1efe59585b24a700d9bd11be2c19e016b7e920493d096a78488b6c6af3f44398 -size 49493 diff --git a/susefox-20091023.tar.bz2 b/susefox-20091023.tar.bz2 new file mode 100644 index 0000000..df808b1 --- /dev/null +++ b/susefox-20091023.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b287eb215e6ab9e327150b74073293bec85231971111dfde179f5c86b2b30a3b +size 49426 From 8090d432da282c137d87c14e52d55de6808bb038c0cfbc0b9810d639176f3274 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 26 Oct 2009 16:04:17 +0000 Subject: [PATCH 2/5] checked in OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox-branding-openSUSE?expand=0&rev=55 --- MozillaFirefox-branding-openSUSE.changes | 6 ------ MozillaFirefox-branding-openSUSE.spec | 3 ++- susefox-20090928.tar.bz2 | 3 +++ susefox-20091023.tar.bz2 | 3 --- 4 files changed, 5 insertions(+), 10 deletions(-) create mode 100644 susefox-20090928.tar.bz2 delete mode 100644 susefox-20091023.tar.bz2 diff --git a/MozillaFirefox-branding-openSUSE.changes b/MozillaFirefox-branding-openSUSE.changes index 7614471..31dd141 100644 --- a/MozillaFirefox-branding-openSUSE.changes +++ b/MozillaFirefox-branding-openSUSE.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Fri Oct 23 14:09:45 CEST 2009 - wr@rosenauer.org - -- update susefox to snapshot 20091023 - * remove unneeded error dialog (bnc#549496) - ------------------------------------------------------------------- Mon Sep 28 07:23:19 CEST 2009 - wr@rosenauer.org diff --git a/MozillaFirefox-branding-openSUSE.spec b/MozillaFirefox-branding-openSUSE.spec index 39a97c2..6beeafd 100644 --- a/MozillaFirefox-branding-openSUSE.spec +++ b/MozillaFirefox-branding-openSUSE.spec @@ -19,13 +19,14 @@ # norootforbuild BuildRequires: MozillaFirefox bc unzip zip + Name: MozillaFirefox-branding-openSUSE License: BSD 3-clause (or similar) ; GPL v2 or later Version: 3.5 Release: 7 Summary: openSUSE branding of MozillaFirefox Group: Productivity/Networking/Web/Browsers -Source: susefox-20091023.tar.bz2 +Source: susefox-20090928.tar.bz2 Source1: search-addons.tar.bz2 Source2: bookmarks.html.suse Source3: firefox-suse-default-prefs.js diff --git a/susefox-20090928.tar.bz2 b/susefox-20090928.tar.bz2 new file mode 100644 index 0000000..2f0cfcc --- /dev/null +++ b/susefox-20090928.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1efe59585b24a700d9bd11be2c19e016b7e920493d096a78488b6c6af3f44398 +size 49493 diff --git a/susefox-20091023.tar.bz2 b/susefox-20091023.tar.bz2 deleted file mode 100644 index df808b1..0000000 --- a/susefox-20091023.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b287eb215e6ab9e327150b74073293bec85231971111dfde179f5c86b2b30a3b -size 49426 From a580a771fdc3726bff81f08b0ffd4fef4dd1aea59538b2b3265d57e6afe2f80f Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Sat, 7 Nov 2009 09:14:23 +0000 Subject: [PATCH 3/5] merge from mozilla (after trademark review) OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox-branding-openSUSE?expand=0&rev=56 --- MozillaFirefox-branding-openSUSE.changes | 11 +++++++++++ MozillaFirefox-branding-openSUSE.spec | 5 ++--- firefox-suse-default-prefs.js | 3 --- susefox-20090928.tar.bz2 | 3 --- susefox-20091023.tar.bz2 | 3 +++ 5 files changed, 16 insertions(+), 9 deletions(-) delete mode 100644 susefox-20090928.tar.bz2 create mode 100644 susefox-20091023.tar.bz2 diff --git a/MozillaFirefox-branding-openSUSE.changes b/MozillaFirefox-branding-openSUSE.changes index 31dd141..9c13b45 100644 --- a/MozillaFirefox-branding-openSUSE.changes +++ b/MozillaFirefox-branding-openSUSE.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Nov 4 19:53:19 UTC 2009 - wr@rosenauer.org + +- removed obsolete prefs + +------------------------------------------------------------------- +Fri Oct 23 14:09:45 CEST 2009 - wr@rosenauer.org + +- update susefox to snapshot 20091023 + * remove unneeded error dialog (bnc#549496) + ------------------------------------------------------------------- Mon Sep 28 07:23:19 CEST 2009 - wr@rosenauer.org diff --git a/MozillaFirefox-branding-openSUSE.spec b/MozillaFirefox-branding-openSUSE.spec index 6beeafd..12c3a41 100644 --- a/MozillaFirefox-branding-openSUSE.spec +++ b/MozillaFirefox-branding-openSUSE.spec @@ -19,14 +19,13 @@ # norootforbuild BuildRequires: MozillaFirefox bc unzip zip - Name: MozillaFirefox-branding-openSUSE License: BSD 3-clause (or similar) ; GPL v2 or later Version: 3.5 -Release: 7 +Release: 8 Summary: openSUSE branding of MozillaFirefox Group: Productivity/Networking/Web/Browsers -Source: susefox-20090928.tar.bz2 +Source: susefox-20091023.tar.bz2 Source1: search-addons.tar.bz2 Source2: bookmarks.html.suse Source3: firefox-suse-default-prefs.js diff --git a/firefox-suse-default-prefs.js b/firefox-suse-default-prefs.js index cbaa4eb..fcf839c 100644 --- a/firefox-suse-default-prefs.js +++ b/firefox-suse-default-prefs.js @@ -9,7 +9,4 @@ pref("print.print_edge_top", 14); // 1/100 of an inch pref("print.print_edge_left", 16); // 1/100 of an inch pref("print.print_edge_right", 16); // 1/100 of an inch pref("print.print_edge_bottom", 14); // 1/100 of an inch -pref("browser.backspace_action", 2); -pref("browser.tabs.loadFolderAndReplace", false); -pref("browser.identity.ssl_domain_display", 1); pref("accessibility.typeaheadfind.soundURL", "default"); diff --git a/susefox-20090928.tar.bz2 b/susefox-20090928.tar.bz2 deleted file mode 100644 index 2f0cfcc..0000000 --- a/susefox-20090928.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1efe59585b24a700d9bd11be2c19e016b7e920493d096a78488b6c6af3f44398 -size 49493 diff --git a/susefox-20091023.tar.bz2 b/susefox-20091023.tar.bz2 new file mode 100644 index 0000000..df808b1 --- /dev/null +++ b/susefox-20091023.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b287eb215e6ab9e327150b74073293bec85231971111dfde179f5c86b2b30a3b +size 49426 From 8ab6e108c6cc8d37105aab7e9a0252c7c65db529248f75b272e0f7c0931c0c99 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 10 Nov 2009 11:37:38 +0000 Subject: [PATCH 4/5] checked in OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox-branding-openSUSE?expand=0&rev=57 --- MozillaFirefox-branding-openSUSE.changes | 5 ----- MozillaFirefox-branding-openSUSE.spec | 1 + firefox-suse-default-prefs.js | 3 +++ 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/MozillaFirefox-branding-openSUSE.changes b/MozillaFirefox-branding-openSUSE.changes index 9c13b45..7614471 100644 --- a/MozillaFirefox-branding-openSUSE.changes +++ b/MozillaFirefox-branding-openSUSE.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Wed Nov 4 19:53:19 UTC 2009 - wr@rosenauer.org - -- removed obsolete prefs - ------------------------------------------------------------------- Fri Oct 23 14:09:45 CEST 2009 - wr@rosenauer.org diff --git a/MozillaFirefox-branding-openSUSE.spec b/MozillaFirefox-branding-openSUSE.spec index 12c3a41..a87f4c8 100644 --- a/MozillaFirefox-branding-openSUSE.spec +++ b/MozillaFirefox-branding-openSUSE.spec @@ -19,6 +19,7 @@ # norootforbuild BuildRequires: MozillaFirefox bc unzip zip + Name: MozillaFirefox-branding-openSUSE License: BSD 3-clause (or similar) ; GPL v2 or later Version: 3.5 diff --git a/firefox-suse-default-prefs.js b/firefox-suse-default-prefs.js index fcf839c..cbaa4eb 100644 --- a/firefox-suse-default-prefs.js +++ b/firefox-suse-default-prefs.js @@ -9,4 +9,7 @@ pref("print.print_edge_top", 14); // 1/100 of an inch pref("print.print_edge_left", 16); // 1/100 of an inch pref("print.print_edge_right", 16); // 1/100 of an inch pref("print.print_edge_bottom", 14); // 1/100 of an inch +pref("browser.backspace_action", 2); +pref("browser.tabs.loadFolderAndReplace", false); +pref("browser.identity.ssl_domain_display", 1); pref("accessibility.typeaheadfind.soundURL", "default"); From fd3d49ad6ea469bb1f362afebedb274c154a589e1a75fb04f8459cc2864d6f76 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 10 Nov 2009 11:37:40 +0000 Subject: [PATCH 5/5] Updating link to change in openSUSE:Factory/MozillaFirefox-branding-openSUSE revision 17.0 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox-branding-openSUSE?expand=0&rev=6b4301bad2b064663236210a5e3571cb --- MozillaFirefox-branding-openSUSE.changes | 5 +++++ MozillaFirefox-branding-openSUSE.spec | 2 +- firefox-suse-default-prefs.js | 3 --- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/MozillaFirefox-branding-openSUSE.changes b/MozillaFirefox-branding-openSUSE.changes index 7614471..9c13b45 100644 --- a/MozillaFirefox-branding-openSUSE.changes +++ b/MozillaFirefox-branding-openSUSE.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 4 19:53:19 UTC 2009 - wr@rosenauer.org + +- removed obsolete prefs + ------------------------------------------------------------------- Fri Oct 23 14:09:45 CEST 2009 - wr@rosenauer.org diff --git a/MozillaFirefox-branding-openSUSE.spec b/MozillaFirefox-branding-openSUSE.spec index a87f4c8..0e3470d 100644 --- a/MozillaFirefox-branding-openSUSE.spec +++ b/MozillaFirefox-branding-openSUSE.spec @@ -23,7 +23,7 @@ BuildRequires: MozillaFirefox bc unzip zip Name: MozillaFirefox-branding-openSUSE License: BSD 3-clause (or similar) ; GPL v2 or later Version: 3.5 -Release: 8 +Release: 9 Summary: openSUSE branding of MozillaFirefox Group: Productivity/Networking/Web/Browsers Source: susefox-20091023.tar.bz2 diff --git a/firefox-suse-default-prefs.js b/firefox-suse-default-prefs.js index cbaa4eb..fcf839c 100644 --- a/firefox-suse-default-prefs.js +++ b/firefox-suse-default-prefs.js @@ -9,7 +9,4 @@ pref("print.print_edge_top", 14); // 1/100 of an inch pref("print.print_edge_left", 16); // 1/100 of an inch pref("print.print_edge_right", 16); // 1/100 of an inch pref("print.print_edge_bottom", 14); // 1/100 of an inch -pref("browser.backspace_action", 2); -pref("browser.tabs.loadFolderAndReplace", false); -pref("browser.identity.ssl_domain_display", 1); pref("accessibility.typeaheadfind.soundURL", "default");