[docbook-checkins] CVS: releasetools Targets.mk,1.11,1.12 Variables.mk,1.6,1.7

[Michael S. <xm...@us...>]

Update of /cvsroot/docbook/releasetools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12773

Modified Files:
	Targets.mk Variables.mk 
Log Message:
Made a couple of fixes for handling release uploads correctly.


Index: Targets.mk
===================================================================
RCS file: /cvsroot/docbook/releasetools/Targets.mk,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -U2 -r1.11 -r1.12
--- Targets.mk	30 Jun 2005 13:19:25 -0000	1.11
+++ Targets.mk	18 Jul 2005 05:44:42 -0000	1.12
@@ -157,5 +157,7 @@
 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) \
 	  "(\
@@ -164,6 +166,8 @@
 	   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; \

Index: Variables.mk
===================================================================
RCS file: /cvsroot/docbook/releasetools/Variables.mk,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -U2 -r1.6 -r1.7
--- Variables.mk	11 Jul 2005 08:58:00 -0000	1.6
+++ Variables.mk	18 Jul 2005 05:44:43 -0000	1.7
@@ -84,5 +84,5 @@
  /CVS$$ \
  /CVS/ \
- /debian/ \
+ /debian \
  \.classes \
  ~$$ \