Fixed bug 2919 & 2915

9 files changed, 19 insertions, 18 deletions

diff --git a/CHANGES.txt b/CHANGES
index cd745028cd3..2ae264cbf1b 100644
--- a/CHANGES.txt
+++ b/CHANGES
@@ -10,9 +10,9 @@ The entries below contain brief descriptions of the changes in this
 release, in no particular order. Some of the entries reflect
 significant new additions, while others represent minor corrections.
 We recommend that you use the release notes included in your Ice
-distribution (see RELEASE_NOTES.txt) as a guide for migrating your
-applications to this release, and the Ice manual for complete details
-on a particular aspect of Ice.
+distribution as a guide for migrating your applications to this
+release, and the Ice manual for complete details on a particular
+aspect of Ice.
 
 
 General Changes
diff --git a/distribution/src/common/RELEASE_NOTES.txt b/RELEASE_NOTES
index b745991b12e..b745991b12e 100644
--- a/distribution/src/common/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES
diff --git a/distribution/bin/makebindist.py b/distribution/bin/makebindist.py
index 219686a5383..2fc3a0404b8 100755
--- a/distribution/bin/makebindist.py
+++ b/distribution/bin/makebindist.py
@@ -207,7 +207,8 @@ platform.completeDistribution(buildDir, version)
 print "Copying distribution files (README, SOURCES, etc)...",
 sys.stdout.flush()
 platform.copyDistributionFiles(distDir, buildDir)
-copy(os.path.join(distDir, "src", "common","RELEASE_NOTES.txt"), os.path.join(buildDir, "RELEASE_NOTES.txt"))
+copy(os.path.join(srcDir, "CHANGES"), os.path.join(buildDir, "CHANGES"))
+copy(os.path.join(srcDir, "RELEASE_NOTES"), os.path.join(buildDir, "RELEASE_NOTES"))
 print "ok"
 
 #
diff --git a/distribution/src/rpm/ice.spec b/distribution/src/rpm/ice.spec
index a6a18054a82..5cc27b8a9f4 100644
--- a/distribution/src/rpm/ice.spec
+++ b/distribution/src/rpm/ice.spec
@@ -440,7 +440,8 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/slice2cs
 # Doc
 #
 mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}
-cp -p $RPM_BUILD_DIR/Ice-rpmbuild-%{version}/RELEASE_NOTES.txt $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}/RELEASE_NOTES
+cp -p $RPM_BUILD_DIR/Ice-%{version}/RELEASE_NOTES $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}/RELEASE_NOTES
+cp -p $RPM_BUILD_DIR/Ice-%{version}/CHANGES $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}/CHANGES
 cp -p $RPM_BUILD_DIR/Ice-rpmbuild-%{version}/README.Linux-RPM $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}/README
 cp -p $RPM_BUILD_DIR/Ice-rpmbuild-%{version}/THIRD_PARTY_LICENSE.Linux $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}/THIRD_PARTY_LICENSE
 cp -p $RPM_BUILD_DIR/Ice-rpmbuild-%{version}/SOURCES.Linux $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}/SOURCES
diff --git a/distribution/src/unix/README.Darwin b/distribution/src/unix/README.Darwin
index 74cf994ae21..f8ba97655cf 100644
--- a/distribution/src/unix/README.Darwin
+++ b/distribution/src/unix/README.Darwin
@@ -209,5 +209,5 @@ Ice patch releases are binary compatible. For example, Ice version
 built against Ice <x>.<y>.0 with Ice <x>.<y>.1 (or later) without 
 having to recompile or relink this application.
 
-Please refer to the RELEASE_NOTES.txt file included in this
-distribution for detailed upgrade instructions.
+Please refer to the RELEASE_NOTES file included in this distribution
+for detailed upgrade instructions.
diff --git a/distribution/src/unix/README.HP-UX b/distribution/src/unix/README.HP-UX
index 0993b0a2fac..d6cc0f4d640 100644
--- a/distribution/src/unix/README.HP-UX
+++ b/distribution/src/unix/README.HP-UX
@@ -149,8 +149,8 @@ Ice patch releases are binary compatible. For example, Ice version
 built against Ice <x>.<y>.0 with Ice <x>.<y>.1 (or later) without 
 having to recompile or relink this application.
 
-Please refer to the RELEASE_NOTES.txt file included in this
-distribution for detailed upgrade instructions.
+Please refer to the RELEASE_NOTES file included in this distribution
+for detailed upgrade instructions.
 
 
 ======================================================================
diff --git a/distribution/src/unix/README.SunOS-sparc b/distribution/src/unix/README.SunOS-sparc
index f90f66d2dec..9f9a4ddaec2 100644
--- a/distribution/src/unix/README.SunOS-sparc
+++ b/distribution/src/unix/README.SunOS-sparc
@@ -231,5 +231,5 @@ Ice patch releases are binary compatible. For example, Ice version
 built against Ice <x>.<y>.0 with Ice <x>.<y>.1 (or later) without 
 having to recompile or relink this application.
 
-Please refer to the RELEASE_NOTES.txt file included in this
-distribution for detailed upgrade instructions.
+Please refer to the RELEASE_NOTES file included in this distribution
+for detailed upgrade instructions.
diff --git a/distribution/src/unix/README.SunOS-x86 b/distribution/src/unix/README.SunOS-x86
index f84f960d40a..42d27696ad1 100644
--- a/distribution/src/unix/README.SunOS-x86
+++ b/distribution/src/unix/README.SunOS-x86
@@ -236,5 +236,5 @@ Ice patch releases are binary compatible. For example, Ice version
 built against Ice <x>.<y>.0 with Ice <x>.<y>.1 (or later) without 
 having to recompile or relink this application.
 
-Please refer to the RELEASE_NOTES.txt file included in this
-distribution for detailed upgrade instructions.
+Please refer to the RELEASE_NOTES file included in this distribution
+for detailed upgrade instructions.
diff --git a/makedist.py b/makedist.py
index 0103288a3c9..114e6317f2d 100755
--- a/makedist.py
+++ b/makedist.py
@@ -584,17 +584,16 @@ rpmBuildFiles = [ \
     os.path.join("src", "rpm", "*.suse"), \
     os.path.join("src", "rpm", "*.redhat"), \
     os.path.join("src", "rpm", "ice.pth"), \
-    os.path.join("src", "common", "RELEASE_NOTES.txt"), \
     os.path.join("src", "unix", "*Linux*"), \
     os.path.join("src", "thirdparty", "php", "ice.ini"), \
 ]
 copyMatchingFiles(os.path.join(distDir, "distribution"), rpmBuildDistDir, rpmBuildFiles)
 
 #
-# Copy CHANGES and RELEASE_NOTES.txt
+# Copy CHANGES and RELEASE_NOTES
 #
-copy(os.path.join(srcDistDir, "cpp", "CHANGES"), os.path.join(distDir, "Ice-" + version + "-CHANGES"))
-copy(os.path.join(distDir, "distribution", "src", "common", "RELEASE_NOTES.txt"), distDir)
+copy(os.path.join(srcDistDir, "CHANGES"), os.path.join(distDir, "Ice-" + version + "-CHANGES"))
+copy(os.path.join(srcDistDir, "RELEASE_NOTES"), os.path.join(distDir, "Ice-" + version + "-RELEASE_NOTES"))
 
 #
 # Everything should be clean now, we can create the source distributions archives
@@ -633,7 +632,7 @@ for d in [srcDistDir]:
         os.system("zip -9rq " + dist +".zip " + dist)
     print "ok"
 
-readme = open("README.txt", "w")
+readme = open("README", "w")
 print >>readme, "This directory contains the source distributions of Ice " + version + ".\n"
 print >>readme, "Creation time: " + time.strftime("%a %b %d %Y, %I:%M:%S %p (%Z)")
 (sysname, nodename, release, ver, machine) = os.uname();