Update version to 8.0.5

Rserve/DESCRIPTION

@@ -1,5 +1,5 @@
 Package: deployrRserve
-Version: 8.0.0
+Version: 8.0.5
 Title: Binary R server
 Author: Simon Urbanek <Simon.Urbanek@r-project.org>
 Maintainer: Simon Urbanek <Simon.Urbanek@r-project.org>

Rserve/src/Makefile.in

@@ -24,8 +24,8 @@ server:	$(XFILES)
 	-cp Rserve Rserve-bin$(SHLIB_EXT)
 	-cp Rserve.dbg Rserve-dbg$(SHLIB_EXT)
 # merging to bin/Rserve works only if installed from sources, won't work for binary
-	-./mergefat Rserve "$(Rbin)/Rserve7.4"
-	-./mergefat Rserve.dbg "$(Rbin)/Rserve7.4.dbg"
+	-./mergefat Rserve "$(Rbin)/Rserve"
+	-./mergefat Rserve.dbg "$(Rbin)/Rserve.dbg"
 # installing the bin files is disabled for now because additional archs won't work anyway
 #	-cp $(XFILES) $(Rbin)
 #	-mkdir -p ../inst/bin$(R_ARCH) 2>/dev/null
@@ -36,8 +36,8 @@ server:	$(XFILES)
 	-@if test "x$(R_ARCH)" = x; then cp $(XFILES) ../inst/; else echo "Rserve binary was installed in libs because multi-arch support is enabled." > ../inst/Rserve-bin.txt; fi
 
 install: @WITH_SERVER_TRUE@ $(XFILES)
-@WITH_SERVER_TRUE@	-cp Rserve $(Rbin)/Rserve7.4
-@WITH_SERVER_TRUE@	-cp Rserve.dbg $(Rbin)/Rserve7.4.dbg
+@WITH_SERVER_TRUE@	-cp Rserve $(Rbin)/Rserve
+@WITH_SERVER_TRUE@	-cp Rserve.dbg $(Rbin)/Rserve.dbg
 
 Rserve:	Rserv.o session.o md5.o
 	$(CC) $^ -o $@ $(linkR) $(LIBS) $(PKG_LIBS) -lpthread

Rserve/src/Makefile.win

@@ -20,14 +20,14 @@ instdir:
 
 Rserve.exe:	Rserv.o winembed.o
 	$(LINKER) -s -o $@ $^ -lws2_32 -L$(R_BIN) -lR
-	-cp $@ $(INSTDIR)/Rserve7.4.exe
+	-cp $@ $(INSTDIR)/Rserve.exe
 	-cp $@ $(INSTDIR)/Rserve$(ARCH).exe
 	-cp $@ "$(R_BIN)"
 	-cp $@ $(INSTDIR)/libs$(R_ARCH)
 
 Rserve_d.exe:	Rserv_d.o winembed.o
 	$(LINKER) -o $@ $^ -lws2_32 -L$(R_BIN) -lR
-	-cp $@ $(INSTDIR)/Rserve_d7.4.exe
+	-cp $@ $(INSTDIR)/Rserve_d.exe
 	-cp $@ $(INSTDIR)/Rserve_d$(ARCH).exe
 	-cp $@ "$(R_BIN)"
 	-cp $@ $(INSTDIR)/libs$(R_ARCH)