packages: iceweasel/iceweasel-branding.patch, iceweasel/iceweasel.spec - re...

[arekm]

Author: arekm                        Date: Sun Dec 12 08:47:05 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; fix patch

---- Files affected:
packages/iceweasel:
   iceweasel-branding.patch (1.14 -> 1.15) , iceweasel.spec (1.118 -> 1.119) 

---- Diffs:

================================================================
Index: packages/iceweasel/iceweasel-branding.patch
diff -u packages/iceweasel/iceweasel-branding.patch:1.14 packages/iceweasel/iceweasel-branding.patch:1.15
--- packages/iceweasel/iceweasel-branding.patch:1.14	Sat Feb 13 15:28:36 2010
+++ packages/iceweasel/iceweasel-branding.patch	Sun Dec 12 09:47:00 2010
@@ -207,18 +207,6 @@
  
  // Search codes belong only in builds with official branding
  pref("browser.search.param.yahoo-fr", "");
-diff -urN mozilla.orig/browser/components/nsBrowserContentHandler.js mozilla/browser/components/nsBrowserContentHandler.js
---- mozilla.orig/browser/components/nsBrowserContentHandler.js	2010-02-04 15:47:12.000000000 +0100
-+++ mozilla/browser/components/nsBrowserContentHandler.js	2010-02-04 15:48:50.000000000 +0100
-@@ -818,7 +818,7 @@
-   },
- 
-   // XXX localize me... how?
--  helpInfo : "Usage: firefox [-flags] [<url>]\n",
-+  helpInfo : "Usage: iceweasel [-flags] [<url>]\n",
- 
-   /* nsIFactory */
-   createInstance: function dch_CI(outer, iid) {
 diff -urN mozilla.orig/browser/components/nsBrowserGlue.js mozilla/browser/components/nsBrowserGlue.js
 --- mozilla.orig/browser/components/nsBrowserGlue.js	2010-02-04 15:47:12.000000000 +0100
 +++ mozilla/browser/components/nsBrowserGlue.js	2010-02-04 15:48:50.000000000 +0100

================================================================
Index: packages/iceweasel/iceweasel.spec
diff -u packages/iceweasel/iceweasel.spec:1.118 packages/iceweasel/iceweasel.spec:1.119
--- packages/iceweasel/iceweasel.spec:1.118	Sat Dec 11 14:01:43 2010
+++ packages/iceweasel/iceweasel.spec	Sun Dec 12 09:47:00 2010
@@ -31,7 +31,7 @@
 Summary(pl.UTF-8):	Iceweasel - przeglądarka WWW
 Name:		iceweasel
 Version:	3.6.13
-Release:	1
+Release:	2
 License:	MPL 1.1 or GPL v2+ or LGPL v2.1+
 Group:		X11/Applications/Networking
 Source0:	ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2
@@ -524,6 +524,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.119  2010/12/12 08:47:00  arekm
+- rel 2; fix patch
+
 Revision 1.118  2010/12/11 13:01:43  glen
 - up to 3.6.13
   resolves CVE-2010-3770, CVE-2010-3774, CVE-2010-3773, CVE-2010-3767,
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iceweasel/iceweasel-branding.patch?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iceweasel/iceweasel.spec?r1=1.118&r2=1.119&f=u