Made a couple of fixes for handling release uploads correctly.

diff --git a/releasetools/Targets.mk b/releasetools/Targets.mk
index b855373691c35e60320bb8684e4573f952588199..5b3bb4c5610077ad88a5b61f357caa256d461763 100644 (file)
--- a/releasetools/Targets.mk
+++ b/releasetools/Targets.mk
@@ -156,15 +156,19 @@ endif
 
 install: zip
        -$(FTP) $(FTP_OPTS) "mput -O $(SF_UPLOAD_DIR) $(TMP)/docbook-$(DISTRO)-*-$(ZIPVER).*; quit" $(SF_UPLOAD_HOST)
+       -$(FTP) $(FTP_OPTS) "mput -O $(SF_UPLOAD_DIR) $(TMP)/docbook-$(DISTRO)-$(ZIPVER).*; quit" $(SF_UPLOAD_HOST)
        $(SCP) $(SCP_OPTS) $(TMP)/docbook-$(DISTRO)-$(ZIPVER).tar.bz2 $(PROJECT_USER)@$(PROJECT_HOST):$(RELEASE_DIR)/$(DISTRO)/
+       $(SCP) $(SCP_OPTS) $(TMP)/docbook-$(DISTRO)-*-$(ZIPVER).tar.bz2 $(PROJECT_USER)@$(PROJECT_HOST):$(RELEASE_DIR)/$(DISTRO)/
        $(SSH) $(SSH_OPTS)-l $(PROJECT_USER) $(PROJECT_HOST) \
          "(\
           umask 002; \
           cd $(RELEASE_DIR)/$(DISTRO); \
           rm -rf $(ZIPVER); \
           tar xfj docbook-$(DISTRO)-$(ZIPVER).tar.bz2; \
+          tar xfj docbook-$(DISTRO)-*-$(ZIPVER).tar.bz2; \
           mv docbook-$(DISTRO)-$(ZIPVER) $(ZIPVER); \
           rm -rf docbook-$(DISTRO)-$(ZIPVER).tar.bz2; \
+          rm -rf docbook-$(DISTRO)-*-$(ZIPVER).tar.bz2; \
           chmod -R g+w $(ZIPVER); \
           rm -f current; \
           ln -s $(ZIPVER) current; \

diff --git a/releasetools/Variables.mk b/releasetools/Variables.mk
index d2171060e9100fbd1963dd9d9986c1b93545f51c..20f7b34bbe0d0d4708133fe524afcba203e0d85f 100644 (file)
--- a/releasetools/Variables.mk
+++ b/releasetools/Variables.mk
@@ -83,7 +83,7 @@ endif
 ZIP_EXCLUDES = \
  /CVS$$ \
  /CVS/ \
- /debian/ \
+ /debian \
  \.classes \
  ~$$ \
  \..*\.pyc \