[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - instsetoo_native/util

David Tardon dtardon at redhat.com
Tue Jun 18 04:47:45 PDT 2013


 instsetoo_native/util/openoffice.lst.in |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a9de59240243542033d798e7b55b849d9daaccc6
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Jun 18 13:39:29 2013 +0200

    prefer filelist from GeneratedPackage over Package
    
    This broke incremental builds on MacOS X in the past, where
    Package/python3.filelist was created for some reason, so the installer
    did not install the Python framework.
    
    (cherry picked from commit d72e170d6a956cf2cc7da1c0b5917bca3e79f5ce)
    
    Signed-off-by: David Tardon <dtardon at redhat.com>
    
    Conflicts:
    	instsetoo_native/util/openoffice.lst.in
    
    Change-Id: I290da24d6385eaf514cd9f7db92b1a959902dcae

diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 2c8e8fd..589781e 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -82,7 +82,7 @@ LibreOffice
         downloadname    LibreOffice_{productversion}_{os}_install_{languages}
         langpackdownloadname    LibreOffice_{productversion}_languagepack_{os}_install_{languages}
         helppackdownloadname    LibreOffice_{productversion}_helppack_{os}_install_{languages}
-        include         {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/Package,{filelistpath}/GeneratedPackage
+        include         {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package
     }
 }
 
@@ -138,7 +138,7 @@ LibreOffice_Dev
         downloadname    LibreOfficeDev_{productversion}_{os}_install_{languages}
         langpackdownloadname    LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages}
         helppackdownloadname    LibreOfficeDev_{productversion}_helppack_{os}_install_{languages}
-        include         {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/Package,{filelistpath}/GeneratedPackage
+        include         {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package
     }
 }
 
@@ -177,7 +177,7 @@ LibreOffice_SDK
         active 1
         compression 5
         script sdkoo
-        include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{filelistpath}/PackageSet,{filelistpath}/Package,{filelistpath}/GeneratedPackage
+        include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package
     }
 }
 
@@ -223,7 +223,7 @@ LibreOffice_Dev_SDK
         active 1
         compression 5
         script sdkoo
-        include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{filelistpath}/PackageSet,{filelistpath}/Package,{filelistpath}/GeneratedPackage
+        include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package
     }
 }
 


More information about the Libreoffice-commits mailing list