diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2013-12-03 08:19:36 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-12-06 05:43:21 -0600 |
| commit | c2f5e09900561d417d53a74fd6bc189cb7d898e1 (patch) | |
| tree | 93580181d603dcdcfb73f5950cbed019be8c1a88 /scp2/source | |
| parent | 9a37ce189881f12d678fdb054219b13c3e4c7e40 (diff) | |
Zip .ui translations per UIConfig target.
Fix installer / scp2 to not ignore directory prefix in 'Name'.
Change-Id: Ib319363c8be73a72029f1ba3833e518e15c55e29
Reviewed-on: https://gerrit.libreoffice.org/6915
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'scp2/source')
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 40 | ||||
| -rw-r--r-- | scp2/source/ooo/ure.scp | 2 |
3 files changed, 22 insertions, 22 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 40b4e75dce25..9c5050190b0d 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -275,7 +275,7 @@ SPECIAL_LIB_FILE(gid_File_Lib_Sqlite3,sqlite3) #else #if !defined(MACOSX) File gid_File_Lib_Sqlite3 - Name = "sqlite/" SPECIAL_NAME(sqlite3); + Name = SPECIAL_NAME(sqlite3); PACKED_LIB_FILE_BODY; End #endif //!defined(MACOSX) diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 965c89fa9709..ab2cfe4c2c7c 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -607,31 +607,31 @@ UI_FILELIST(uui, "UIConfig/uui.filelist") UI_FILELIST(vcl, "UIConfig/vcl.filelist") UI_FILELIST(xmlsec, "UIConfig/xmlsec.filelist") -UI_FILELIST_ALL_LANG(basicide, UIConfig/modules/BasicIDE, filelist) -UI_FILELIST_ALL_LANG(cui, UIConfig/cui, filelist) +UI_FILELIST_ALL_LANG(basicide, modules/BasicIDE) +UI_FILELIST_ALL_LANG(cui, cui) #ifdef DBCONNECTIVITY -UI_FILELIST_ALL_LANG(dbaccess, UIConfig/dbaccess, filelist) -#endif -UI_FILELIST_ALL_LANG(desktop, UIConfig/desktop, filelist) -UI_FILELIST_ALL_LANG(filter, UIConfig/filter, filelist) -UI_FILELIST_ALL_LANG(scalc, UIConfig/modules/scalc, filelist) -UI_FILELIST_ALL_LANG(schart, UIConfig/modules/schart, filelist) -UI_FILELIST_ALL_LANG(sdraw, UIConfig/modules/sdraw, filelist) -UI_FILELIST_ALL_LANG(sfx, UIConfig/sfx, filelist) -UI_FILELIST_ALL_LANG(simpress, UIConfig/modules/simpress, filelist) -UI_FILELIST_ALL_LANG(smath, UIConfig/modules/smath, filelist) +UI_FILELIST_ALL_LANG(dbaccess, dbaccess) +#endif +UI_FILELIST_ALL_LANG(desktop, desktop) +UI_FILELIST_ALL_LANG(filter, filter) +UI_FILELIST_ALL_LANG(scalc, modules/scalc) +UI_FILELIST_ALL_LANG(schart, modules/schart) +UI_FILELIST_ALL_LANG(sdraw, modules/sdraw) +UI_FILELIST_ALL_LANG(sfx, sfx) +UI_FILELIST_ALL_LANG(simpress, modules/simpress) +UI_FILELIST_ALL_LANG(smath, modules/smath) #ifdef GUIBASE_UNX -UI_FILELIST_ALL_LANG(spa, UIConfig/spa, filelist) +UI_FILELIST_ALL_LANG(spa, spa) #endif -UI_FILELIST_ALL_LANG(svt, UIConfig/svt, filelist) -UI_FILELIST_ALL_LANG(svx, UIConfig/svx, filelist) -UI_FILELIST_ALL_LANG(swriter, UIConfig/modules/swriter, filelist) +UI_FILELIST_ALL_LANG(svt, svt) +UI_FILELIST_ALL_LANG(svx, svx) +UI_FILELIST_ALL_LANG(swriter, modules/swriter) #ifdef ENABLE_TELEPATHY -UI_FILELIST_ALL_LANG(tubes, UIConfig/tubes, filelist) +UI_FILELIST_ALL_LANG(tubes, tubes) #endif -UI_FILELIST_ALL_LANG(uui, UIConfig/uui, filelist) -UI_FILELIST_ALL_LANG(vcl, UIConfig/vcl, filelist) -UI_FILELIST_ALL_LANG(xmlsec, UIConfig/xmlsec, filelist) +UI_FILELIST_ALL_LANG(uui, uui) +UI_FILELIST_ALL_LANG(vcl, vcl) +UI_FILELIST_ALL_LANG(xmlsec, xmlsec) #ifdef WNT diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 653fb6f8d2df..3e9983bf9d83 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -571,7 +571,7 @@ End File gid_File_Misc_ServicesRdb TXT_FILE_BODY; Dir = GID_DIR_URE_SHARE_MISC; - Name = "ure/services.rdb"; + Name = "services.rdb"; Styles = (PACKED); End |