Mercurial Mercurial > hg > mozilla / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge from firefox16
authorWolfgang Rosenauer <wr@rosenauer.org>
Tue, 11 Sep 2012 19:27:36 +0200
changeset 540 55fe9dc16b1f
parent 539 b1134fe91f9a (current diff)
parent 538 be682f8c9361 (diff)
child 541 830e50bbfc79
merge from firefox16
MozillaFirefox/MozillaFirefox.changes file | annotate | diff | comparison | revisions
MozillaFirefox/MozillaFirefox.spec file | annotate | diff | comparison | revisions 
--- a/MozillaFirefox/MozillaFirefox.changes	Tue Sep 11 19:27:09 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Tue Sep 11 19:27:36 2012 +0200
@@ -12,7 +12,7 @@
 - removed upstreamed mozilla-crashreporter-restart-args.patch
 - webapprt now included
 - use kmozillahelper's new REVEAL command (bnc#777415)
-  (requires new API version 7)
+  (requires mozilla-kde4-integration >= 0.6.4)
 
 -------------------------------------------------------------------
 Sun Aug 26 13:47:43 UTC 2012 - wr@rosenauer.org
--- a/MozillaFirefox/MozillaFirefox.spec	Tue Sep 11 19:27:09 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Tue Sep 11 19:27:36 2012 +0200
@@ -61,7 +61,7 @@
 Provides:       browser(npapi)
 # this is needed to match this package with the kde4 helper package without the main package
 # having a hard requirement on the kde4 package
-%define kde_helper_version 7
+%define kde_helper_version 6
 Provides:       mozilla-kde4-version = %{kde_helper_version}
 Summary:        Mozilla Firefox Web Browser
 License:        MPL-2.0
--- a/mozilla-kde.patch	Tue Sep 11 19:27:09 2012 +0200
+++ b/mozilla-kde.patch	Tue Sep 11 19:27:36 2012 +0200
@@ -2249,7 +2249,7 @@
 +#define KMOZILLAHELPER "/usr/lib/mozilla/kmozillahelper"
 +#endif
 +
-+#define KMOZILLAHELPER_VERSION 7
++#define KMOZILLAHELPER_VERSION 6
 +#define MAKE_STR2( n ) #n
 +#define MAKE_STR( n ) MAKE_STR2( n )
 +
mozilla