icedove-install.patch

   1 --- comm-1.9.1/mozilla/toolkit/mozapps/installer/packager.mk.orig       2009-12-18 14:28:59.997141166 +0100
   2 +++ comm-1.9.1/mozilla/toolkit/mozapps/installer/packager.mk    2009-12-18 14:32:54.201542762 +0100
   3 @@ -369,7 +369,7 @@
   4  # NOTE: this must be a tar now that dist links into the tree so that we
   5  # do not strip the binaries actually in the tree.
   6         @echo "Creating package directory..."
   7 -       @mkdir $(DIST)/$(MOZ_PKG_DIR)
   8 +       @mkdir $(DESTDIR)/$(MOZ_PKG_DIR)
   9  ifdef MOZ_PKG_MANIFEST
  10         $(RM) -rf $(DIST)/xpt
  11         $(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\
  12 @@ -384,11 +384,11 @@
  13  ifndef STAGE_SDK
  14         @cd $(DIST) && rsync -auv --copy-unsafe-links $(_APPNAME) $(MOZ_PKG_DIR)
  15  else
  16 -       @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
  17 +       cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_APPDIR)
  18  endif
  19  endif
  20  else
  21 -       @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
  22 +       cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_APPDIR)
  23         @echo "Linking XPT files..."
  24         @rm -rf $(DIST)/xpt
  25         @$(NSINSTALL) -D $(DIST)/xpt
  26 @@ -431,7 +431,7 @@
  27  endif # PKG_SKIP_STRIP
  28         @echo "Removing unpackaged files..."
  29  ifdef NO_PKG_FILES
  30 -       cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH); rm -rf $(NO_PKG_FILES)
  31 +       cd $(DESTDIR)$(MOZ_PKG_APPDIR)$(_BINPATH); rm -rf $(NO_PKG_FILES)
  32  endif
  33  ifdef MOZ_PKG_REMOVALS
  34         $(SYSINSTALL) $(IFLAGS1) $(MOZ_PKG_REMOVALS_GEN) $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)
  35 --- comm-1.9.1/mail/app/Makefile.in.orig        2009-12-18 14:49:43.990647725 +0100
  36 +++ comm-1.9.1/mail/app/Makefile.in     2009-12-18 14:49:53.830739781 +0100
  37 @@ -48,7 +48,7 @@
  38  GRE_BUILDID = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build BuildID)
  39
  40  DEFINES += \
  41 -  -DTHUNDERBIRD_ICO=\"$(DIST)/branding/thunderbird.ico\" \
  42 +  -DTHUNDERBIRD_ICO=\"$(DIST)/branding/$(MOZ_APP_NAME).ico\" -DAB_CD=$(AB_CD) \
  43    -DAB_CD=$(AB_CD) \
  44    -DGRE_MILESTONE=$(GRE_MILESTONE) \
  45    -DGRE_BUILDID=$(GRE_BUILDID) \
  46 @@ -359,7 +359,7 @@
  47  endif
  48         mkdir -p $(DIST)/$(APP_NAME).app/Contents/Library/Spotlight
  49         rsync -a --copy-unsafe-links $(DIST)/package/Thunderbird.mdimporter $(DIST)/$(APP_NAME).app/Contents/Library/Spotlight
  50 -       cp -RL $(DIST)/branding/thunderbird.icns $(DIST)/$(APP_NAME).app/Contents/Resources/thunderbird.icns
  51 +       cp -RL $(DIST)/branding/thunderbird.icns $(DIST)/branding/$(MOZ_APP_NAME).icns
  52         printf APPLMOZM > $(DIST)/$(APP_NAME).app/Contents/PkgInfo
  53  #       remove CVS dirs from packaged app
  54         find $(DIST)/$(APP_NAME).app -type d -name "CVS" -prune -exec rm -rf {} \;