Author: paszczus Date: Tue Jun 30 13:36:38 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 3.5 (merged from DEVEL)
---- Files affected:
packages/iceweasel:
iceweasel-install.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/iceweasel/iceweasel-install.patch
diff -u packages/iceweasel/iceweasel-install.patch:1.1
packages/iceweasel/iceweasel-install.patch:1.2
--- packages/iceweasel/iceweasel-install.patch:1.1 Mon Jun 23 12:19:22 2008
+++ packages/iceweasel/iceweasel-install.patch Tue Jun 30 15:36:33 2009
@@ -1,40 +1,45 @@
--- mozilla/toolkit/mozapps/installer/packager.mk 2006-12-23
03:38:32.302235167 +0200
+++ mozilla/toolkit/mozapps/installer/packager.mk 2008-03-05
22:59:55.020447000 +0000
-@@ -328,13 +328,13 @@
+@@ -370,13 +370,13 @@
# NOTE: this must be a tar now that dist links into the tree so that we
# do not strip the binaries actually in the tree.
@echo "Creating package directory..."
-- @mkdir $(DIST)/$(MOZ_PKG_APPNAME)
-+ @mkdir -p $(DESTDIR)$(MOZ_PKG_APPDIR)
+- @mkdir $(DIST)/$(MOZ_PKG_DIR)
++ @mkdir $(DESTDIR)/$(MOZ_PKG_APPDIR)
ifdef MOZ_PKG_MANIFEST
$(RM) -rf $(DIST)/xpt
$(call PACKAGER_COPY, "$(DIST)",\
-- "$(DIST)/$(MOZ_PKG_APPNAME)", \
+- "$(DIST)/$(MOZ_PKG_DIR)", \
+ "$(DESTDIR)/$(MOZ_PKG_APPDIR)", \
"$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1)
-- $(PERL) $(topsrcdir)/xpinstall/packager/xptlink.pl -s $(DIST) -d
$(DIST)/xpt -f $(DIST)/$(MOZ_PKG_APPNAME)/components -v -x "$(XPIDL_LINK)"
-+ $(PERL) $(topsrcdir)/xpinstall/packager/xptlink.pl -s $(DIST) -d
$(DIST)/xpt -f $(DESTDIR)/$(MOZ_PKG_APPDIR)/components -v -x "$(XPIDL_LINK)"
+- $(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d
$(DIST)/xpt -f $(DIST)/$(MOZ_PKG_DIR)/components -v -x "$(XPIDL_LINK)"
++ $(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d
$(DIST)/xpt -f $(DESTDIR)/$(MOZ_PKG_APPDIR)/components -v -x "$(XPIDL_LINK)"
else # !MOZ_PKG_MANIFEST
ifeq ($(MOZ_PKG_FORMAT),DMG)
# If UNIVERSAL_BINARY, the package will be made from an already-prepared
-@@ -343,7 +343,7 @@
- @cd $(DIST) && rsync -auv --copy-unsafe-links $(_APPNAME)
$(MOZ_PKG_APPNAME)
+@@ -385,11 +385,11 @@
+ ifndef STAGE_SDK
+ @cd $(DIST) && rsync -auv --copy-unsafe-links $(_APPNAME) $(MOZ_PKG_DIR)
+ else
+- @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR);
tar -xf -)
++ cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_APPDIR)
+ endif
endif
else
-- @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd
../$(MOZ_PKG_APPNAME); tar -xf -)
+- @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR);
tar -xf -)
+ cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_APPDIR)
endif # DMG
endif # MOZ_PKG_MANIFEST
ifndef PKG_SKIP_STRIP
-@@ -375,7 +375,7 @@
+@@ -421,7 +421,7 @@
endif
@echo "Removing unpackaged files..."
ifdef NO_PKG_FILES
-- cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_APPNAME)$(_BINPATH); rm -rf
$(NO_PKG_FILES)
+- cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH); rm -rf $(NO_PKG_FILES)
+ cd $(DESTDIR)$(MOZ_PKG_APPDIR)$(_BINPATH); rm -rf $(NO_PKG_FILES)
endif
ifdef MOZ_PKG_REMOVALS
- $(SYSINSTALL) $(MOZ_PKG_REMOVALS_GEN)
$(DIST)/$(STAGEPATH)$(MOZ_PKG_APPNAME)$(_BINPATH)
+ $(SYSINSTALL) $(IFLAGS1) $(MOZ_PKG_REMOVALS_GEN)
$(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)
--- 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 @@
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iceweasel/iceweasel-install.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
