From: N. Brouard <brouard@ined.fr>
Date: Wed, 16 Dec 2015 09:07:10 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: imach-099s7~294
X-Git-Url: https://henry.ined.fr/git/?a=commitdiff_plain;h=52e5184ee15325eb7f89737abcb1f6cae7390f6a;p=.git

*** empty log message ***
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9214183..8f8fb6c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,13 +18,13 @@ SET(@NOREG@ )
 SET(@IMACHSETUPVERSION@ imach-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR}-icl-setup)
 SET(@APPCOMPILATIONMODE@ icl)
 SET(@VERSION@ ${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR})
-SET(@GNUPLOTVERSION@ 4.6)
+SET(@GNUPLOTVERSION@ 5.1)
 SET(@INFOBEFOREFILE@ README.txt)
 SET(@LICENSEFILE@ Copying)
 SET(@PACKAGE@ imach)
 SET(@DICTLANG@ en)
 SET(@VERMAJOR@ )
-SET(@COPYRIGHT@ "Copyright (C)  2002-2015 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121) - Intel Software 2015")
+SET(@COPYRIGHT@ "Copyright (C)  2002-2015 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121) 2013-2016- Intel Software 2015-2018")
 #SET(IMACH_VERSION ${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR}.${IMACH_VERSION_PATCH})
 #MATH(EXPR IMACH_VERSION_NUMBER "100000*${IMACH_VERSION_MAJOR} + 100*${IMACH_VERSION_MINOR} + ${IMACH_VERSION_PATCH}")
 
@@ -95,7 +95,7 @@ install(FILES "html/doc/data1.txt" DESTINATION "${DOCDIR}")
 
 set(CPACK_PACKAGE_VERSION ${IMACH_VERSION})
 set(CPACK_PACKAGE_NAME "imach")
-set(CPACK_PACKAGE_RELEASE 2)
+set(CPACK_PACKAGE_RELEASE 1)
 set(CPACK_PACKAGE_CONTACT "Nicolas Brouard")
 set(CPACK_PACKAGE_VENDOR "INED")
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "IMaCh Interpolated Markov Chain program")
diff --git a/src/Makefile b/src/Makefile
index 1c243d9..7b2489a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -490,7 +490,7 @@ imachrpm : imachopt.o
 	cmake --build . ; \
 	echo $(OSTYPE);\
 	cpack -D CPACK_RPM_PACKAGE_DEBUG=1 -D CPACK_RPM_SPEC_INSTALL_POST="/bin/true" -G RPM;\
-	cp  imach$(VERSION)-*.rpm ../../src/Output/ ;)
+	cp  imach-$(VERSION)-*.rpm ../../src/Output/ ;)
 
 #imachdmg : imachopt.o create-dmg applet IMaChInfo.plist.in IMaChPkgInfo.in IMaCh.icns main.scpt.in IMaCh-ecrandemarrage.rsrc TXT.rtf
 #	$(CC) $(LFLAGSOPT) -o imach imachopt.o
@@ -540,8 +540,9 @@ imachdmg : imachopt.o ../distributions/osx/create-dmg ../distributions/osx/creat
 md5:
 	ls Output/* | xargs md5sum
 upload:
-	rsync -v Output/IMaCh-0.98r3-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
-	rsync -v Output/imach0.98r3.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+	rsync -v Output/imach-0.98r4-1.x86_64.rpm brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#	rsync -v Output/IMaCh-0.98r4-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#	rsync -v Output/imach0.98r4.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
 #	rsync -v Output/* brouard@henry.ined.fr:/home/euroreves/html/imach/Download
 
 imachcyg : imachcyg.o