Author: hawk Date: Tue Jun 24 10:17:15 2008 GMT Module: SOURCES Tag: HEAD ---- Log message: - taken from thunderbird 2.0.0.14 for iceweasel 2.0.0.14, updated for icedove rebranding
---- Files affected: SOURCES: icedove-install.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/icedove-install.patch diff -u /dev/null SOURCES/icedove-install.patch:1.1 --- /dev/null Tue Jun 24 12:17:16 2008 +++ SOURCES/icedove-install.patch Tue Jun 24 12:17:10 2008 @@ -0,0 +1,101 @@ +--- mozilla/toolkit/mozapps/installer/packager.mk~ 2006-12-28 22:23:47.000000000 +0200 ++++ mozilla/toolkit/mozapps/installer/packager.mk 2007-02-26 15:31:13.000000000 +0200 +@@ -307,7 +307,7 @@ + # 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 $(DESTDIR)$(MOZ_PKG_APPDIR) + ifdef MOZ_PKG_MANIFEST + $(RM) -rf $(DIST)/xpt + $(call PACKAGER_COPY, "$(DIST)",\ +@@ -322,7 +322,7 @@ + @cd $(DIST) && rsync -auv --copy-unsafe-links $(_APPNAME) $(MOZ_PKG_APPNAME) + endif + else +- @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_APPNAME); tar -xf -) ++ cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_APPDIR) + endif # DMG + endif # MOZ_PKG_MANIFEST + ifndef PKG_SKIP_STRIP +@@ -354,7 +354,7 @@ + endif + @echo "Removing unpackaged files..." + ifdef NO_PKG_FILES +- cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_APPNAME)$(_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) +--- mozilla/mail/app/Makefile.in 2008-06-23 14:04:11.000000000 +0200 ++++ mozilla/mail/app/Makefile.in 2008-06-23 18:42:40.000000000 +0200 +@@ -46,7 +46,7 @@ + + AB_CD = $(MOZ_UI_LOCALE) + +-DEFINES += -DTHUNDERBIRD_ICO=\"$(DIST)/branding/thunderbird.ico\" -DAB_CD=$(AB_CD) ++DEFINES += -DTHUNDERBIRD_ICO=\"$(DIST)/branding/$(MOZ_APP_NAME).ico\" -DAB_CD=$(AB_CD) + + DIRS = profile + +@@ -60,9 +60,9 @@ + endif + + ifeq ($(USE_SHORT_LIBNAME), 1) +-PROGRAM = thunderbird$(BIN_SUFFIX) ++PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX) + else +-PROGRAM = thunderbird-bin$(BIN_SUFFIX) ++PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX) + endif + + REQUIRES = \ +@@ -243,11 +243,11 @@ + ifndef MOZ_BRANDING_DIRECTORY + $(NSINSTALL) -D $(DIST)/branding + ifeq ($(OS_ARCH),WINNT) +- cp $(srcdir)/thunderbird.ico $(DIST)/branding/thunderbird.ico ++ cp $(srcdir)/thunderbird.ico $(DIST)/branding/$(MOZ_APP_NAME).ico + cp $(srcdir)/thunderbird.ico $(DIST)/branding/app.ico + endif + ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) +- cp $(srcdir)/macbuild/thunderbird.icns $(DIST)/branding/thunderbird.icns ++ cp $(srcdir)/macbuild/thunderbird.icns $(DIST)/branding/$(MOZ_APP_NAME).icns + cp $(srcdir)/macbuild/dsstore $(DIST)/branding/dsstore + cp $(srcdir)/macbuild/background.png $(DIST)/branding/background.png + cp $(srcdir)/macbuild/disk.icns $(DIST)/branding/disk.icns +@@ -263,20 +263,20 @@ + endif + + ifneq (,$(filter-out OS2 WINNT Darwin,$(OS_ARCH))) +-thunderbird:: mozilla.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk ++$(MOZ_APP_NAME):: mozilla.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk + cat $< | sed -e "s|%MOZAPPDIR%|$(mozappdir)|" \ +- -e "s|%MOZ_USER_DIR%|.thunderbird|" \ ++ -e "s|%MOZ_USER_DIR%|.$(MOZ_APP_NAME)|" \ + -e "s|%MREDIR%|$(mredir)|" \ + -e "s|%MOZILLA-BIN%|$(PROGRAM)|g" > $@ + chmod +x $@ + +-libs:: thunderbird ++libs:: $(MOZ_APP_NAME) + $(INSTALL) $< $(DIST)/bin + +-install:: thunderbird ++install:: $(MOZ_APP_NAME) + $(SYSINSTALL) $< $(DESTDIR)$(bindir) + +-GARBAGE += thunderbird ++GARBAGE += $(MOZ_APP_NAME) + GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, all.js all-thunderbird.js channel-prefs.js mailnews.js) + endif + +@@ -322,7 +322,7 @@ + # go away once that bug has been closed for a while. + rm -rf $(DIST)/$(APP_NAME).app/Contents/Plug-Ins/PrintPDE.plugin + rsync -a --copy-unsafe-links $(DIST)/package/PrintPDE.plugin $(DIST)/$(APP_NAME).app/Contents/Plug-Ins +- cp -RL $(DIST)/branding/thunderbird.icns $(DIST)/$(APP_NAME).app/Contents/Resources/thunderbird.icns ++ cp -RL $(DIST)/branding/thunderbird.icns $(DIST)/$(APP_NAME).app/Contents/Resources/$(MOZ_APP_NAME).icns + cp -RL $(srcdir)/macbuild/mail-biff-badge.png $(DIST)/$(APP_NAME).app/Contents/Resources/mail-biff-badge.png + echo -n APPLMOZM > $(DIST)/$(APP_NAME).app/Contents/PkgInfo + # remove CVS dirs from packaged app ================================================================ _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
