SOURCES (DEVEL): xulrunner-install.patch - cp from mozilla-firefox-install....

[glen]

Author: glen                         Date: Tue May 27 13:29:20 2008 GMT
Module: SOURCES                       Tag: DEVEL
---- Log message:
- cp from mozilla-firefox-install.patch r1.2

---- Files affected:
SOURCES:
   xulrunner-install.patch (1.2 -> 1.2.2.1) 

---- Diffs:

================================================================
Index: SOURCES/xulrunner-install.patch
diff -u SOURCES/xulrunner-install.patch:1.2 SOURCES/xulrunner-install.patch:1.2.2.1
--- SOURCES/xulrunner-install.patch:1.2	Wed Jan  3 21:50:55 2007
+++ SOURCES/xulrunner-install.patch	Tue May 27 15:29:14 2008
@@ -1,15 +1,23 @@
---- mozilla/toolkit/mozapps/installer/packager.mk~	2006-12-23 03:31:40.882927000 +0200
-+++ mozilla/toolkit/mozapps/installer/packager.mk	2006-12-23 03:38:32.302235167 +0200
-@@ -301,7 +301,7 @@
+--- 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 @@
  # 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)
-+	@install -d $(DESTDIR)$(MOZ_PKG_APPDIR)
++	@mkdir -p $(DESTDIR)$(MOZ_PKG_APPDIR)
  ifdef MOZ_PKG_MANIFEST
  	$(RM) -rf $(DIST)/xpt
- 	$(PERL) -I$(topsrcdir)/xpinstall/packager -e 'use Packager; \
-@@ -316,7 +316,7 @@
+ 	$(call PACKAGER_COPY, "$(DIST)",\
+-		 "$(DIST)/$(MOZ_PKG_APPNAME)", \
++		 "$(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)"
+ 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)
  endif
  else
@@ -18,7 +26,7 @@
  endif # DMG
  endif # MOZ_PKG_MANIFEST
  ifndef PKG_SKIP_STRIP
-@@ -348,7 +348,7 @@
+@@ -375,7 +375,7 @@
  endif
  	@echo "Removing unpackaged files..."
  ifdef NO_PKG_FILES
@@ -27,9 +35,3 @@
  endif
  ifdef MOZ_PKG_REMOVALS
  	$(SYSINSTALL) $(MOZ_PKG_REMOVALS_GEN) $(DIST)/$(STAGEPATH)$(MOZ_PKG_APPNAME)$(_BINPATH)
-@@ -355,5 +355,3 @@
- endif # MOZ_PKG_REMOVALS
- 
- make-package: stage-package
--	@echo "Compressing..."
--	cd $(DIST); $(MAKE_PACKAGE)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/xulrunner-install.patch?r1=1.2&r2=1.2.2.1&f=u