------------------------------------------------------------
revno: 2043
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Tue 2010-06-29 06:42:04 +0200
message:
use the vanilla app icons when USE_OOO_BUILD_DESKTOPS=n
added:
icons/
icons/sysui/
icons/sysui/desktop/
icons/sysui/desktop/icons/
icons/sysui/desktop/icons/hicolor/
icons/sysui/desktop/icons/hicolor/128x128/
icons/sysui/desktop/icons/hicolor/128x128/apps/
icons/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png
icons/sysui/desktop/icons/hicolor/16x16/
icons/sysui/desktop/icons/hicolor/16x16/apps/
icons/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png
icons/sysui/desktop/icons/hicolor/32x32/
icons/sysui/desktop/icons/hicolor/32x32/apps/
icons/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png
icons/sysui/desktop/icons/hicolor/48x48/
icons/sysui/desktop/icons/hicolor/48x48/apps/
icons/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png
modified:
changelog
copyright
rules
=== modified file 'changelog'
--- a/changelog 2010-06-28 22:52:13 +0000
+++ b/changelog 2010-06-29 04:42:04 +0000
@@ -11,8 +11,12 @@
building without Java
- build without the layout dialogs again, broken in various ways
(closes: #587171, #575908)
+ - use the vanilla app icons when USE_OOO_BUILD_DESKTOPS=n (closes:
#512731);
+ install fixed startcenter.png
* debian/control.in, debian/rules:
- build for only the default python again (closes: #587402)
+ * debian/icons/sysui: add fixed startcenter.png to match the rest from
+ 3.3
-- Rene Engelhard <r...@debian.org> Tue, 29 Jun 2010 00:52:04 +0200
=== modified file 'copyright'
--- a/copyright 2010-05-14 08:08:54 +0000
+++ b/copyright 2010-06-29 04:42:04 +0000
@@ -7,6 +7,13 @@
Copyright: Copyright (C) 2002-2009 Software in the Public Interest, Inc.
License: GPL-2
+Files: debian/icons/sysui/*
+Copyright: Copyright 2000, 2010 Oracle and/or its affiliates.
+License: LGPL-3
+
+(These files are checked out from
http://hg.services.openoffice.org/re/DEV300_next/file/c3ffaa0d55a2/sysui/desktop/icons/hicolor
(3.3 tree) to have a
+matching startcenter icon, not the old one which is in the 3.2 tree)
+
Files: ooo-build-*/*
Copyright: (c) 2002-2010 ooo-build/Go-OO Team
License: LGPL-3
=== added directory 'icons'
=== added directory 'icons/sysui'
=== added directory 'icons/sysui/desktop'
=== added directory 'icons/sysui/desktop/icons'
=== added directory 'icons/sysui/desktop/icons/hicolor'
=== added directory 'icons/sysui/desktop/icons/hicolor/128x128'
=== added directory 'icons/sysui/desktop/icons/hicolor/128x128/apps'
=== added file 'icons/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png'
Binary files a/icons/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png
1970-01-01 00:00:00 +0000 and
b/icons/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png 2010-06-29
04:42:04 +0000 differ
=== added directory 'icons/sysui/desktop/icons/hicolor/16x16'
=== added directory 'icons/sysui/desktop/icons/hicolor/16x16/apps'
=== added file 'icons/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png'
Binary files a/icons/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png
1970-01-01 00:00:00 +0000 and
b/icons/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png 2010-06-29
04:42:04 +0000 differ
=== added directory 'icons/sysui/desktop/icons/hicolor/32x32'
=== added directory 'icons/sysui/desktop/icons/hicolor/32x32/apps'
=== added file 'icons/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png'
Binary files a/icons/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png
1970-01-01 00:00:00 +0000 and
b/icons/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png 2010-06-29
04:42:04 +0000 differ
=== added directory 'icons/sysui/desktop/icons/hicolor/48x48'
=== added directory 'icons/sysui/desktop/icons/hicolor/48x48/apps'
=== added file 'icons/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png'
Binary files a/icons/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png
1970-01-01 00:00:00 +0000 and
b/icons/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png 2010-06-29
04:42:04 +0000 differ
=== modified file 'rules'
--- a/rules 2010-06-28 14:41:21 +0000
+++ b/rules 2010-06-29 04:42:04 +0000
@@ -2665,7 +2665,7 @@
for p in writer calc impress draw math base; do \
mkdir -p -m755 $(PKGDIR)-$$p/usr/share/applications ;\
sed -e 's,Exec=$${UNIXPRODUCTNAME}$${PRODUCTVERSION} \(.*\)
%U,Exec=ooffice$(VER) \1 %U,' \
- -e
's,Icon=$${WITHOUTDOTUNIXPRODUCTNAME}[0123456789]\+,Icon=ooo,' \
+ -e
's,Icon=$${WITHOUTDOTUNIXPRODUCTNAME},Icon=openofficeorg,' \
-e 's,Name=$${PRODUCTNAME}
$${PRODUCTVERSION},Name=OpenOffice.org $(VER),' \
-e 's/ / /' \
< $$dirname/$$p.desktop \
@@ -3109,7 +3109,7 @@
dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*.sh; echo
$$OUTPATH$$PROEXT)/misc/desktopshare >/dev/null; pwd`" ;\
mkdir -p -m755 $(PKGDIR)-common/usr/share/applications ;\
sed -e 's,Exec=$${UNIXPRODUCTNAME}$${PRODUCTVERSION} \(.*\)
%U,Exec=ooffice$(VER) \1 %U,' \
- -e
's,Icon=$${WITHOUTDOTUNIXPRODUCTNAME}[0123456789]\+-startcenter,Icon=ooo-gulls,'
\
+ -e 's,Icon=$${WITHOUTDOTUNIXPRODUCTNAME},Icon=openofficeorg,' \
-e 's,Name=$${PRODUCTNAME} $${PRODUCTVERSION},Name=OpenOffice.org
$(VER),' \
-e 's/ / /' \
< $$dirname/startcenter.desktop \
@@ -3260,6 +3260,13 @@
# convert icons to xpm; we need them for the Debian menu policy...
cd $(PKGDIR)-common/usr/share/icons/hicolor/32x32/apps && \
for x in *.png; do convert $$x `basename $$x .png`.xpm; done
+ifeq "$(USE_OOO_BUILD_DESKTOPS)" "n"
+ # install the matching startcenter.png
+ for i in 16x16 32x32 48x48; do \
+ install -m644
debian/icons/sysui/desktop/icons/hicolor/$$i/apps/startcenter.png \
+
$(PKGDIR)-common/usr/share/icons/hicolor/$$i/apps/openofficeorg$(shell echo
$(OOVER) | cut -d. -f1)-startcenter.png; \
+ done
+endif
ifeq "$(ENABLE_JAVA)" "y"
# symlink jars we use externally
