[Libreoffice-commits] core.git: android/experimental

[Tor Lillqvist]

 android/experimental/DocumentLoader/Makefile      |    2 +-
 android/experimental/LibreOffice4Android/Makefile |    2 +-
 android/experimental/desktop/Makefile             |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit de8d12acf122322af8412ef1a90e13fe34fcdbcd
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Mar 27 14:34:24 2013 +0200

    Use proper version numbers
    
    Change-Id: Ib0284c3fe63636e42b2e72ab76b02a8197c837e0

diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile
index 40fd6dc..9977215 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -77,7 +77,7 @@ copy-stuff:
 # Set up bootstraprc
 	echo '[Bootstrap]' > assets/program/bootstraprc
 	echo 'InstallMode=<installmode>' >> assets/program/bootstraprc
-	echo 'ProductKey=LibreOffice 3.6' >> assets/program/bootstraprc
+	echo 'ProductKey=LibreOffice $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR)' >> assets/program/bootstraprc
 	echo "UserInstallation=file://$(APP_DATA_PATH)" >> assets/program/bootstraprc
 #
 # Set up versionrc
diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile
index 7984be4..9b1aaa2 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -75,7 +75,7 @@ copy-stuff:
 # Set up bootstraprc
 	echo '[Bootstrap]' > assets/program/bootstraprc
 	echo 'InstallMode=<installmode>' >> assets/program/bootstraprc
-	echo 'ProductKey=LibreOffice 3.6' >> assets/program/bootstraprc
+	echo 'ProductKey=LibreOffice $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR)' >> assets/program/bootstraprc
 	echo 'UserInstallation=file://$$APP_DATA_DIR' >> assets/program/bootstraprc
 #
 # Set up versionrc
diff --git a/android/experimental/desktop/Makefile b/android/experimental/desktop/Makefile
index 273aca6..db35879 100644
--- a/android/experimental/desktop/Makefile
+++ b/android/experimental/desktop/Makefile
@@ -78,7 +78,7 @@ copy-stuff:
 # Set up bootstraprc
 	echo '[Bootstrap]' > assets/program/bootstraprc
 	echo 'InstallMode=<installmode>' >> assets/program/bootstraprc
-	echo 'ProductKey=LibreOffice 3.6' >> assets/program/bootstraprc
+	echo 'ProductKey=LibreOffice $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR)' >> assets/program/bootstraprc
 	echo "UserInstallation=file://$(APP_DATA_PATH)" >> assets/program/bootstraprc
 #
 # Set up versionrc