packages: iceweasel/iceweasel-branding.patch, iceweasel/iceweasel-install.p...

Fri Feb 3 11:20:37 CET 2012

Author: arekm                        Date: Fri Feb  3 10:20:37 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 10.0

---- Files affected:
packages/iceweasel:
   iceweasel-branding.patch (1.20 -> 1.21) , iceweasel-install.patch (1.10 -> 1.11) , iceweasel.spec (1.169 -> 1.170) , iceweasel-ppc.patch (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/iceweasel/iceweasel-branding.patch
diff -u packages/iceweasel/iceweasel-branding.patch:1.20 packages/iceweasel/iceweasel-branding.patch:1.21

--- packages/iceweasel/iceweasel-branding.patch:1.20	Sun Aug 28 16:59:22 2011
+++ packages/iceweasel/iceweasel-branding.patch	Fri Feb  3 11:20:31 2012
@@ -55,7 +55,7 @@
 diff -urN mozilla.orig/browser/locales/en-US/chrome/overrides/appstrings.properties mozilla/browser/locales/en-US/chrome/overrides/appstrings.properties
 --- mozilla.orig/browser/locales/en-US/chrome/overrides/appstrings.properties	2010-02-04 15:47:13.000000000 +0100
 +++ mozilla/browser/locales/en-US/chrome/overrides/appstrings.properties	2010-02-04 15:48:50.000000000 +0100
-@@ -35,23 +35,23 @@
+@@ -35,24 +35,24 @@
  # ***** END LICENSE BLOCK *****
  
  malformedURI=The URL is not valid and cannot be loaded.
@@ -77,6 +77,7 @@
 -unknownSocketType=Firefox doesn't know how to communicate with the server.
 +unknownSocketType=Iceweasel doesn't know how to communicate with the server.
  netReset=The connection to the server was reset while the page was loading.
+ notCached=This document is no longer available.
 -netOffline=Firefox is currently in offline mode and can't browse the Web.
 +netOffline=Iceweasel is currently in offline mode and can't browse the Web.
  isprinting=The document cannot change while Printing or in Print Preview.

================================================================
Index: packages/iceweasel/iceweasel-install.patch
diff -u packages/iceweasel/iceweasel-install.patch:1.10 packages/iceweasel/iceweasel-install.patch:1.11
--- packages/iceweasel/iceweasel-install.patch:1.10	Wed Sep 28 13:43:17 2011
+++ packages/iceweasel/iceweasel-install.patch	Fri Feb  3 11:20:31 2012
@@ -1,11 +1,11 @@
 --- mozilla/browser/app/Makefile.in	2008-06-22 22:54:03.000000000 +0200
 +++ mozilla/browser/app/Makefile.in	2008-06-23 10:34:59.000000000 +0200
 @@ -397,7 +397,7 @@
- 	rsync -a $(DIST)/bin/ $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)
- 	$(RM) $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)/mangle $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)/shlibsign
+ 	rsync -a $(DIST)/bin/ $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/$(APPFILES)
+ 	$(RM) $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/$(APPFILES)/mangle $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/$(APPFILES)/shlibsign
  ifdef LIBXUL_SDK
--	cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(APP_NAME).app/Contents/MacOS/firefox
-+	cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(APP_NAME).app/Contents/MacOS/$(MOZ_APP_NAME)
+-	cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/firefox
++	cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/$(MOZ_APP_NAME)
  else
  	rm -f $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM)
  	rsync -aL $(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS

================================================================
Index: packages/iceweasel/iceweasel.spec
diff -u packages/iceweasel/iceweasel.spec:1.169 packages/iceweasel/iceweasel.spec:1.170
--- packages/iceweasel/iceweasel.spec:1.169	Sat Jan 21 09:07:44 2012
+++ packages/iceweasel/iceweasel.spec	Fri Feb  3 11:20:31 2012
@@ -16,8 +16,8 @@
 %endif
 
 # convert firefox release number to platform version: 9.0.x -> 9.0.x
-%define		xulrunner_main	9.0
-%define		xulrunner_ver	%(v=%{version}; echo %{xulrunner_main}${v#9.0})
+%define		xulrunner_main	10.0
+%define		xulrunner_ver	%(v=%{version}; echo %{xulrunner_main}${v#10.0})
 
 %if %{without xulrunner}
 # The actual sqlite version (see RHBZ#480989):
@@ -28,12 +28,12 @@
 Summary(hu.UTF-8):	Iceweasel web böngésző
 Summary(pl.UTF-8):	Iceweasel - przeglądarka WWW
 Name:		iceweasel
-Version:	9.0.1
+Version:	10.0
 Release:	1
 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
-# Source0-md5:	7cf2bd379792a9b232267c6a79680566
+# Source0-md5:	13c61203ccfa583e5a54b4dc22f41233
 Source1:	%{name}-branding.tar.bz2
 # Source1-md5:	7ab5e80db1ffe8784f1cb55dc5651e2f
 Source2:	%{name}-rm_nonfree.sh
@@ -49,7 +49,6 @@
 Patch7:		%{name}-prefs.patch
 Patch8:		%{name}-pld-branding.patch
 Patch9:		%{name}-no-subshell.patch
-Patch10:	%{name}-ppc.patch
 URL:		http://www.pld-linux.org/Packages/Iceweasel
 BuildRequires:	GConf2-devel >= 1.2.1
 BuildRequires:	OpenGL-devel
@@ -169,7 +168,6 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p2
-%patch10 -p1
 
 # config/rules.mk is patched by us and js/src/config/rules.mk
 # is supposed to be exact copy
@@ -539,6 +537,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.170  2012/02/03 10:20:31  arekm
+- up to 10.0
+
 Revision 1.169  2012/01/21 08:07:44  qboosh
 - no more gnomevfs bcond; GConf2 is always on for gnome component
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iceweasel/iceweasel-branding.patch?r1=1.20&r2=1.21&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iceweasel/iceweasel-install.patch?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iceweasel/iceweasel.spec?r1=1.169&r2=1.170&f=u

