------------------------------------------------------------
revno: 2052
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Tue 2010-07-13 21:30:22 +0200
message:
move startcenter-png install to the rest of hicolor icons install; don't
install ooo-build desktop icons when using sysui desktops
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2010-07-09 18:37:34 +0000
+++ b/changelog 2010-07-13 19:30:22 +0000
@@ -5,8 +5,10 @@
* debian/rules:
- for safety, add a build-conflicts against libhsqldb-java (>> 1.8.1~)
- - disable Java on mips as (some new) mips buildds have serious problems
with
- Java. Make mipsel follow for consistency.
+ - disable Java on mips as (some new) mips buildds have serious problems
+ with Java. Make mipsel follow for consistency.
+ - move startcenter.png install to the rest of hicolor icons install;
+ don't install ooo-build desktop icons when using sysui desktops
* debian/control.in:
- make new -common Breaks: older openoffice.org-core (closes: #587750)
=== modified file 'rules'
--- a/rules 2010-06-30 20:19:07 +0000
+++ b/rules 2010-07-13 19:30:22 +0000
@@ -3271,13 +3271,6 @@
# 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
@@ -3309,12 +3302,20 @@
fi; \
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
+else
# install ooo-build desktop icons
for r in 16x16 22x22 24x24 32x32 48x48; do \
mkdir -p $(PKGDIR)-common/usr/share/icons/hicolor/$$r/apps; \
cp $(OOO_BUILD_TREE)/desktop/$$r/*.png \
$(PKGDIR)-common/usr/share/icons/hicolor/$$r/apps; \
done
+endif
# move psprint.conf into /etc
mkdir -p $(PKGDIR)-common/etc/$(OODIRNAME)
