[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sysui/desktop
sysui/desktop/productversion.mk |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 58e524761aabb4bfc214e0375aaa4ec94b3e8903 Author: Petr Mladek pmla...@suse.cz Date: Tue Apr 10 16:25:19 2012 +0200 use x.y.z version also for desktop integration packages (fdo#47840) This version scheme is used for other packages as well. It is important for the desktop integration packages now because we started reseting buildid for each bugfix release (fdo#47840). This value is used also for the release number of Linux packages. (cherry picked from commit 4045e770193ae632aca7075105dda89686c597d6) Signed-off-by: Caolán McNamara caol...@redhat.com diff --git a/sysui/desktop/productversion.mk b/sysui/desktop/productversion.mk index 398241d..5a186bc 100755 --- a/sysui/desktop/productversion.mk +++ b/sysui/desktop/productversion.mk @@ -45,7 +45,8 @@ PKGDIR=$(BIN) .INCLUDE : productversion.mk -PKGVERSION = $(PRODUCTVERSION) +PKGVERSION = $(VERSIONMAJOR).$(VERSIONMINOR).$(VERSIONMICRO) + # gnome-vfs treats everything behind the last '.' as an icon extension, # even though the icon_filename in '.keys' is specified as filename # without extension. Since it also does not know how to handle 2-writer ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sysui/desktop
sysui/desktop/icons/base_app.ico|binary sysui/desktop/icons/calc_app.ico|binary sysui/desktop/icons/database.ico|binary sysui/desktop/icons/draw_app.ico|binary sysui/desktop/icons/drawing-template.ico|binary sysui/desktop/icons/drawing.ico |binary sysui/desktop/icons/empty-document.ico |binary sysui/desktop/icons/empty-template.ico |binary sysui/desktop/icons/formula.ico |binary sysui/desktop/icons/hicolor/256x256/apps/calc.png |binary sysui/desktop/icons/hicolor/256x256/apps/writer.png |binary sysui/desktop/icons/impress_app.ico |binary sysui/desktop/icons/main_app.ico|binary sysui/desktop/icons/master-document.ico |binary sysui/desktop/icons/math_app.ico|binary sysui/desktop/icons/oasis-database.ico |binary sysui/desktop/icons/oasis-drawing-template.ico |binary sysui/desktop/icons/oasis-drawing.ico |binary sysui/desktop/icons/oasis-empty-document.ico|binary sysui/desktop/icons/oasis-empty-template.ico|binary sysui/desktop/icons/oasis-formula.ico |binary sysui/desktop/icons/oasis-master-document.ico |binary sysui/desktop/icons/oasis-presentation-template.ico |binary sysui/desktop/icons/oasis-presentation.ico |binary sysui/desktop/icons/oasis-spreadsheet-template.ico |binary sysui/desktop/icons/oasis-spreadsheet.ico |binary sysui/desktop/icons/oasis-text-template.ico |binary sysui/desktop/icons/oasis-text.ico |binary sysui/desktop/icons/oasis-web-template.ico |binary sysui/desktop/icons/open.ico|binary sysui/desktop/icons/presentation-template.ico |binary sysui/desktop/icons/presentation.ico|binary sysui/desktop/icons/spreadsheet-template.ico|binary sysui/desktop/icons/spreadsheet.ico |binary sysui/desktop/icons/text-template.ico |binary sysui/desktop/icons/text.ico|binary sysui/desktop/icons/writer_app.ico |binary 37 files changed New commits: commit 55f45dbf89233f0d529c4c6659c50c05f683add7 Author: Andras Timar ati...@suse.com Date: Thu Jan 12 13:32:38 2012 +0100 256x256 Windows icons fdo#39555 diff --git a/sysui/desktop/icons/base_app.ico b/sysui/desktop/icons/base_app.ico index 02cf7a4..97b6110 100644 Binary files a/sysui/desktop/icons/base_app.ico and b/sysui/desktop/icons/base_app.ico differ diff --git a/sysui/desktop/icons/calc_app.ico b/sysui/desktop/icons/calc_app.ico index a9dd646..388ac6d 100644 Binary files a/sysui/desktop/icons/calc_app.ico and b/sysui/desktop/icons/calc_app.ico differ diff --git a/sysui/desktop/icons/database.ico b/sysui/desktop/icons/database.ico index 02cf7a4..97b6110 100644 Binary files a/sysui/desktop/icons/database.ico and b/sysui/desktop/icons/database.ico differ diff --git a/sysui/desktop/icons/draw_app.ico b/sysui/desktop/icons/draw_app.ico index 5297dae..48749da 100644 Binary files a/sysui/desktop/icons/draw_app.ico and b/sysui/desktop/icons/draw_app.ico differ diff --git a/sysui/desktop/icons/drawing-template.ico b/sysui/desktop/icons/drawing-template.ico index af2e9ff..9991270 100644 Binary files a/sysui/desktop/icons/drawing-template.ico and b/sysui/desktop/icons/drawing-template.ico differ diff --git a/sysui/desktop/icons/drawing.ico b/sysui/desktop/icons/drawing.ico index 5297dae..48749da 100644 Binary files a/sysui/desktop/icons/drawing.ico and b/sysui/desktop/icons/drawing.ico differ diff --git a/sysui/desktop/icons/empty-document.ico b/sysui/desktop/icons/empty-document.ico index 20e665f..ec11e8f 100644 Binary files a/sysui/desktop/icons/empty-document.ico and b/sysui/desktop/icons/empty-document.ico differ diff --git a/sysui/desktop/icons/empty-template.ico b/sysui/desktop/icons/empty-template.ico index 20e665f..ec11e8f 100644 Binary files a/sysui/desktop/icons/empty-template.ico and b/sysui/desktop/icons/empty-template.ico differ diff --git a/sysui/desktop/icons/formula.ico b/sysui/desktop/icons/formula.ico index fb2f651..07b3e8e 100644 Binary files a/sysui/desktop/icons/formula.ico and b/sysui/desktop/icons/formula.ico differ diff --git a/sysui/desktop/icons/hicolor/256x256/apps/calc.png b/sysui/desktop/icons/hicolor/256x256/apps/calc.png index 3ce322a..a3f5fd4 100644 Binary files a/sysui/desktop/icons/hicolor/256x256/apps/calc.png and b/sysui/desktop/icons/hicolor/256x256/apps/calc.png differ diff --git a/sysui/desktop/icons/hicolor/256x256/apps/writer.png b/sysui/desktop/icons/hicolor/256x256/apps/writer.png index 80af4bd..2f4abcb 100644 Binary files a/sysui/desktop/icons/hicolor/256x256/apps/writer.png and b/sysui/desktop/icons/hicolor/256x256/apps/writer.png differ diff --git a/sysui/desktop/icons/impress_app.ico
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sysui/desktop
sysui/desktop/icons/hicolor/256x256/apps/base.png |binary sysui/desktop/icons/hicolor/256x256/apps/calc.png |binary sysui/desktop/icons/hicolor/256x256/apps/draw.png |binary sysui/desktop/icons/hicolor/256x256/apps/impress.png |binary sysui/desktop/icons/hicolor/256x256/apps/main.png |binary sysui/desktop/icons/hicolor/256x256/apps/math.png |binary sysui/desktop/icons/hicolor/256x256/apps/startcenter.png |binary sysui/desktop/icons/hicolor/256x256/apps/writer.png |binary sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-database.png |binary sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-drawing-template.png |binary sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-drawing.png |binary sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-formula.png |binary sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-master-document.png |binary sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-presentation-template.png |binary sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-presentation.png |binary sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-spreadsheet-template.png |binary sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-spreadsheet.png |binary sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-text-template.png |binary sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-text.png |binary sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-web-template.png |binary 20 files changed New commits: commit 8ed9108aea7fa807fa9a6174df0235b0a3b1a09c Author: Petr Mladek pmla...@suse.cz Date: Wed Jan 11 11:14:55 2012 +0100 Add 256x256 desktop and MIME type icons (fdo#39555, bnc#722644) diff --git a/sysui/desktop/icons/hicolor/256x256/apps/base.png b/sysui/desktop/icons/hicolor/256x256/apps/base.png new file mode 100644 index 000..729dbcd Binary files /dev/null and b/sysui/desktop/icons/hicolor/256x256/apps/base.png differ diff --git a/sysui/desktop/icons/hicolor/256x256/apps/calc.png b/sysui/desktop/icons/hicolor/256x256/apps/calc.png new file mode 100644 index 000..3ce322a Binary files /dev/null and b/sysui/desktop/icons/hicolor/256x256/apps/calc.png differ diff --git a/sysui/desktop/icons/hicolor/256x256/apps/draw.png b/sysui/desktop/icons/hicolor/256x256/apps/draw.png new file mode 100644 index 000..b3ee114 Binary files /dev/null and b/sysui/desktop/icons/hicolor/256x256/apps/draw.png differ diff --git a/sysui/desktop/icons/hicolor/256x256/apps/impress.png b/sysui/desktop/icons/hicolor/256x256/apps/impress.png new file mode 100644 index 000..5909f05 Binary files /dev/null and b/sysui/desktop/icons/hicolor/256x256/apps/impress.png differ diff --git a/sysui/desktop/icons/hicolor/256x256/apps/main.png b/sysui/desktop/icons/hicolor/256x256/apps/main.png new file mode 100644 index 000..7e8e2a0 Binary files /dev/null and b/sysui/desktop/icons/hicolor/256x256/apps/main.png differ diff --git a/sysui/desktop/icons/hicolor/256x256/apps/math.png b/sysui/desktop/icons/hicolor/256x256/apps/math.png new file mode 100644 index 000..50b8dc8 Binary files /dev/null and b/sysui/desktop/icons/hicolor/256x256/apps/math.png differ diff --git a/sysui/desktop/icons/hicolor/256x256/apps/startcenter.png b/sysui/desktop/icons/hicolor/256x256/apps/startcenter.png new file mode 100644 index 000..7e8e2a0 Binary files /dev/null and b/sysui/desktop/icons/hicolor/256x256/apps/startcenter.png differ diff --git a/sysui/desktop/icons/hicolor/256x256/apps/writer.png b/sysui/desktop/icons/hicolor/256x256/apps/writer.png new file mode 100644 index 000..80af4bd Binary files /dev/null and b/sysui/desktop/icons/hicolor/256x256/apps/writer.png differ diff --git a/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-database.png b/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-database.png new file mode 100644 index 000..729dbcd Binary files /dev/null and b/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-database.png differ diff --git a/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-drawing-template.png b/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-drawing-template.png new file mode 100644 index 000..4cda813 Binary files /dev/null and b/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-drawing-template.png differ diff --git a/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-drawing.png b/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-drawing.png new file mode 100644 index 000..b3ee114 Binary files /dev/null and b/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-drawing.png differ diff --git a/sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-formula.png
