summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <atimar@suse.com>2012-10-03 15:17:09 +0200
committerAndras Timar <atimar@suse.com>2012-10-03 16:59:30 +0200
commit55c2619f689ed2666d95b2270f4e56821dd5478c (patch)
treeb4ca0c26a9e1fc75aa67c92f33e247e04c1c96c7
parent02394b10d348aeabcbaceaa7659794a6b74a3768 (diff)
rename THIRDPARTYLICENSEREADME.html to LICENSE.html
Change-Id: Idff5f43190f75f4ac8fee8fa989948ca35ca6095
-rw-r--r--readlicense_oo/Package_files.mk2
-rw-r--r--readlicense_oo/html/LICENSE.html (renamed from readlicense_oo/html/THIRDPARTYLICENSEREADME.html)0
-rw-r--r--scp2/source/ooo/common_brand.scp2
-rw-r--r--scp2/source/ooo/scpaction_ooo.scp4
-rw-r--r--sfx2/source/appl/app.src2
5 files changed, 5 insertions, 5 deletions
diff --git a/readlicense_oo/Package_files.mk b/readlicense_oo/Package_files.mk
index 1cace5a4207f..f3f146b7f7a2 100644
--- a/readlicense_oo/Package_files.mk
+++ b/readlicense_oo/Package_files.mk
@@ -20,6 +20,6 @@ $(eval $(call gb_Package_add_file,readlicense_oo_files,bin/osl/LICENSE.odt,odt/L
$(eval $(call gb_Package_add_file,readlicense_oo_files,bin/LICENSE.odt,odt/LICENSE.odt))
$(eval $(call gb_Package_add_file,readlicense_oo_files,bin/CREDITS.odt,odt/CREDITS.odt))
-$(eval $(call gb_Package_add_file,readlicense_oo_files,bin/THIRDPARTYLICENSEREADME.html,html/THIRDPARTYLICENSEREADME.html))
+$(eval $(call gb_Package_add_file,readlicense_oo_files,bin/LICENSE.html,html/LICENSE.html))
# vim: set noet sw=4 ts=4:
diff --git a/readlicense_oo/html/THIRDPARTYLICENSEREADME.html b/readlicense_oo/html/LICENSE.html
index 46fc32f771f0..46fc32f771f0 100644
--- a/readlicense_oo/html/THIRDPARTYLICENSEREADME.html
+++ b/readlicense_oo/html/LICENSE.html
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index b000c0a7492a..5c90285ecbe7 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -467,7 +467,7 @@ End
// Files
File gid_Brand_File_Html_Thirdpartylicensereadme
- Name = "THIRDPARTYLICENSEREADME.html";
+ Name = "LICENSE.html";
#ifdef MACOSX
Dir = gid_Dir_Bundle_Contents;
#else
diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp
index a54d1a078c0e..462273175237 100644
--- a/scp2/source/ooo/scpaction_ooo.scp
+++ b/scp2/source/ooo/scpaction_ooo.scp
@@ -29,8 +29,8 @@
#ifdef MACOSX
ScpAction scp_Copy_Thirdpartylicense_Readme_Html
- Copy = "THIRDPARTYLICENSEREADME.html";
- Name= "THIRDPARTYLICENSEREADME.html";
+ Copy = "LICENSE.html";
+ Name= "LICENSE.html";
Subdir = "LICENSEs";
End
#endif
diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src
index f3782c7ede5f..6eae48d2f327 100644
--- a/sfx2/source/appl/app.src
+++ b/sfx2/source/appl/app.src
@@ -517,7 +517,7 @@ ModalDialog DLG_HELP_LICENSING
{
Text [ en-US ] =
"Third Party Code Additional copyright notices and license terms applicable to\n"
- "portions of the Software are set forth in the THIRDPARTYLICENSEREADME.html\n"
+ "portions of the Software are set forth in the LICENSE.html\n"
"file; choose Show License to see exact details in English." ;
};
String STR_LICENSING_INFORMATION_3