[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - configure.ac instsetoo_native/inc_ooohelppack instsetoo_native/util

[Thorsten Behrens (via logerrit)]

 configure.ac                                                        |    2 +-
 instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt |    7 +++----
 instsetoo_native/util/openoffice.lst.in                             |   10 +++++-----
 3 files changed, 9 insertions(+), 10 deletions(-)

New commits:
commit bd1314fbde12cd8d90903fa520edc0f0458d347e
Author:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
AuthorDate: Sun Jun 16 17:09:46 2019 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Sun Jun 16 17:11:43 2019 +0200

    Bump version to 6.1.7.1, cleanup product links
    
    Final 1st release LibreOffice powered by CIB 6.1
    
    Change-Id: Ife79b1bec111a7a67a280482ea1c73dcf7a59f7b

diff --git a/configure.ac b/configure.ac
index 7cdabf456c3e..eb496653b5f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea.
 
-AC_INIT([LibreOffice Powered by CIB],[6.1.7.0.0+],[],[],[http://libreoffice.cib.eu/])
+AC_INIT([LibreOffice Powered by CIB],[6.1.7.1],[],[],[https://libreoffice.cib.eu/])
 
 AC_PREREQ([2.59])
 
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
index b44bdd11887b..1e78c7476822 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
@@ -8,10 +8,9 @@ ApplicationUsers	AllUsers
 ALLUSERS	1
 ARPCOMMENTS	ARPCOMMENTSTEMPLATE
 ARPCONTACT	CIB software GmbH
-ARPHELPLINK	http://libreoffice.cib.eu
-ARPHELPTELEPHONE libreoffice at cib.de
-ARPURLINFOABOUT	http://libreoffice.cib.eu
-ARPURLUPDATEINFO	http://libreoffice.cib.eu
+ARPHELPLINK	https://libreoffice.cib.eu
+ARPURLINFOABOUT	https://libreoffice.cib.eu
+ARPURLUPDATEINFO	https://libreoffice.cib.eu
 DefaultUIFont	Tahoma8
 DialogCaption	Windows Installer
 DiskPrompt	[1]
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 5b5f62bd0d75..7c8daf33f52f 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -70,7 +70,7 @@ LibreOfficePoweredByCIB
             CHANGETARGETDIR 1
             PATCHCODEFILE ooo_patchcodes.txt
             STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
-            STARTCENTER_INFO_URL http://libreoffice.cib.eu
+            STARTCENTER_INFO_URL https://libreoffice.cib.eu
             STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
             DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
             STARTCENTER_HIDE_EXTERNAL_LINKS 0
@@ -81,7 +81,7 @@ LibreOfficePoweredByCIB
         downloadname           LibreOfficePoweredByCIB_{productversion}_{os}_install_{languages}
         langpackdownloadname   LibreOfficePoweredByCIB_{productversion}_languagepack_{os}_install_{languages}
         helppackdownloadname   LibreOfficePoweredByCIB_{productversion}_helppack_{os}_install_{languages}
-        include  {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{extensionsdir},{licensepath},{customtargetpath}/readlicense_oo/license,{packinfopath}
+        include         {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{filelistpath}/CustomTarget/helpcontent2/help3xsl/filelists,{extensionsdir},{licensepath},{packinfopath}
     }
 }
 
@@ -123,7 +123,7 @@ LibreOfficePoweredByCIBDev
             CODEFILENAME codes_ooodev.txt
             LOCALUSERDIR $ORIGIN/..
             STARTCENTER_ADDFEATURE_URL https://extensions.libreoffice.org/
-            STARTCENTER_INFO_URL http://libreoffice.cib.eu
+            STARTCENTER_INFO_URL https://libreoffice.cib.eu
             STARTCENTER_TEMPLREP_URL https://templates.libreoffice.org/
             DICT_REPO_URL https://extensions.libreoffice.org/dictionaries/
         }
@@ -164,7 +164,7 @@ LibreOfficePoweredByCIB_SDK
             CHANGETARGETDIR 1
             DONTUSESTARTMENUFOLDER 1
             STARTCENTER_ADDFEATURE_URL https://extensions.libreoffice.org/
-            STARTCENTER_INFO_URL http://libreoffice.cib.eu
+            STARTCENTER_INFO_URL https://libreoffice.cib.eu
             STARTCENTER_TEMPLREP_URL https://templates.libreoffice.org/
             DICT_REPO_URL https://extensions.libreoffice.org/dictionaries/
         }
@@ -209,7 +209,7 @@ LibreOfficePoweredByCIBDev_SDK
             CHANGETARGETDIR 1
             DONTUSESTARTMENUFOLDER 1
             STARTCENTER_ADDFEATURE_URL https://extensions.libreoffice.org/
-            STARTCENTER_INFO_URL http://libreoffice.cib.eu
+            STARTCENTER_INFO_URL https://libreoffice.cib.eu
             STARTCENTER_TEMPLREP_URL https://templates.libreoffice.org/
             DICT_REPO_URL https://extensions.libreoffice.org/dictionaries/
         }