diff options
| author | Petr Mladek <pmladek@suse.cz> | 2011-12-05 19:32:00 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2011-12-05 21:08:00 +0100 |
| commit | 8412548e734ddf699ddbffba0cf7edeb2548c86c (patch) | |
| tree | d43b7a9180796c627603bb2b26f4aa0c661897c7 /instsetoo_native/util/openoffice.lst | |
| parent | bee2841519d15d8df1520ef3052e3a8da19eac1b (diff) | |
allow to install desktop integration in Linux dev build
The desktop integration searched for the package name by the dash "-"
delimiter on many locations. It was not easy to add support for
package names with the dash.
In addition, there was an inconsistence. Most package names used the
"libo-dev" prefix name but the ure packages used "lodev". It was
installed into the prefix /opt/lo-dev.
So, I remaned everything to "lodev". It removed the inconsistence
and solved solution with the dash.
Diffstat (limited to 'instsetoo_native/util/openoffice.lst')
| -rw-r--r-- | instsetoo_native/util/openoffice.lst | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index 5cb2baa89653..2c73f1cdb190 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -170,12 +170,12 @@ LibreOffice_Dev { variables { - PRODUCTNAME LibO-dev + PRODUCTNAME LOdev PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION SHORT_PRODUCTEXTENSION beta0 - UNIXBASISROOTNAME lo-dev + UNIXBASISROOTNAME lodev3.5 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.5 @@ -183,13 +183,14 @@ LibreOffice_Dev ABOUTBOXPRODUCTVERSION 3.5.0 BASEPRODUCTVERSION 3.5 DEVELOPMENTPRODUCT 1 - BASISPACKAGEPREFIX libobasis-dev + BASISPACKAGEPREFIX lodevbasis UREPACKAGEPREFIX lodev SOLSUREPACKAGEPREFIX lodev REGISTRYLAYERNAME LayerDev SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93 UPDATEURL http://update.libreoffice.org/check.php ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst + ADDSYSTEMINTEGRATION 1 EVAL FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 @@ -227,7 +228,7 @@ LibreOffice_Dev downloadname LibO-dev_{productversion}_{os}_install_{languages} langpackdownloadname LibO_{productversion}_languagepack_{os}_install_{languages} helppackdownloadname LibO_{productversion}_helppack_{os}_install_{languages} - include {solarenvpath}/{os}/loader2,.,{localpath}/bin/dev,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external + include {solarenvpath}/{os}/loader2,.,{localpath}/bin/dev,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external } } @@ -325,18 +326,18 @@ LibreOffice_Dev_SDK downloadname OOo-Dev-SDK_{packageversion}_{os}_install_{languages} variables { - PRODUCTNAME LibO-dev + PRODUCTNAME LOdev PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION SHORT_PRODUCTEXTENSION beta0 - UNIXBASISROOTNAME lo-dev + UNIXBASISROOTNAME lodev3.5 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 3.5 PACKAGEVERSION 3.5.0 PACKAGEREVISION {buildid} - BASISPACKAGEPREFIX libobasis-dev + BASISPACKAGEPREFIX lodevbasis UREPACKAGEPREFIX lodev SOLSUREPACKAGEPREFIX lodev REGISTRYLAYERNAME LayerDev @@ -423,18 +424,18 @@ LibreOffice_Dev_Test downloadname LO-Dev-Test_{packageversion}_{os}_install_{languages} variables { - PRODUCTNAME LibO-dev + PRODUCTNAME LOdev PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION SHORT_PRODUCTEXTENSION alpha0 - UNIXBASISROOTNAME lo-dev + UNIXBASISROOTNAME lodev3.5 POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSIONUNIX test BRANDPACKAGEVERSION 3.5 PACKAGEVERSION 3.5.0 PACKAGEREVISION {buildid} - BASISPACKAGEPREFIX libobasis-dev + BASISPACKAGEPREFIX lodevbasis UREPACKAGEPREFIX lodev SOLSUREPACKAGEPREFIX lodev REGISTRYLAYERNAME LayerDev |