------------------------------------------------------------
revno: 2162
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Fri 2010-10-22 15:44:41 +0200
message:
more BrOffice.org/BrOffice.org icon fixes
modified:
broffice.org.postinst.in
broffice.org.postrm.in
broffice.org.preinst.in
changelog
rules
=== modified file 'broffice.org.postinst.in'
--- a/broffice.org.postinst.in 2010-10-20 19:42:34 +0000
+++ b/broffice.org.postinst.in 2010-10-22 13:44:41 +0000
@@ -11,6 +11,9 @@
if [ -n "$2" ]; then
if dpkg --compare-versions $2 lt 1:3.3.0~beta3; then
dpkg-divert --package $THIS_PACKAGE --remove --rename
--divert /@OOBRANDDIR@/program/intro.bmp.ooo /@OOBRANDDIR@/program/intro.bmp
+ for i in $LANGPACKISOS; do
+ dpkg-divert --package $THIS_PACKAG --remove
--rename --divert /@OOBRANDDIR@/program/resource/ooo$i.res.ooo
/@OOBRANDDIR@/program/resource/ooo$i.res
+ done
fi
fi
esac
=== modified file 'broffice.org.postrm.in'
--- a/broffice.org.postrm.in 2010-10-20 19:42:34 +0000
+++ b/broffice.org.postrm.in 2010-10-22 13:44:41 +0000
@@ -13,9 +13,6 @@
for i in $DIVERSIONS; do
dpkg-divert --package $DPKG_MAINTSCRIPT_PACKAGE --remove
--rename --divert $i.ooo $i
done
- for i in $LANGPACKISOS; do
- dpkg-divert --package $DPKG_MAINTSCRIPT_PACKAGE --remove
--rename --divert /@OOBRANDDIR@/program/resource/ooo$i.res.ooo
/@OOBRANDDIR@/program/resource/ooo$i.res
- done
fi
#DEBHELPER#
=== modified file 'broffice.org.preinst.in'
--- a/broffice.org.preinst.in 2010-10-20 19:42:34 +0000
+++ b/broffice.org.preinst.in 2010-10-22 13:44:41 +0000
@@ -14,9 +14,6 @@
for i in $DIVERSIONS; do
dpkg-divert --package $DPKG_MAINTSCRIPT_PACKAGE --add --rename
--divert $i.ooo $i
done
- for i in $LANGPACKISOS; do
- dpkg-divert --package $DPKG_MAINTSCRIPT_PACKAGE --add --rename
--divert /@OOBRANDDIR@/program/resource/ooo$i.res.ooo
/@OOBRANDDIR@/program/resource/ooo$i.res
- done
;;
esac
=== modified file 'changelog'
--- a/changelog 2010-10-22 09:27:10 +0000
+++ b/changelog 2010-10-22 13:44:41 +0000
@@ -19,9 +19,13 @@
- remove manual installing of LibO splash (LibO now also supports
intro.png)
- update .desktop file/icon installation to actually give sensible results
(Exec= and Icon=; fix up broffice.org changes)
- * debian/broffice.org.p*.in: adapt diversions for new intro.png
- * debian/soffice-template.desktop.in: update for LibreOffice
- -- Rene Engelhard <r...@debian.org> Thu, 21 Oct 2010 12:58:31 +0200
+ - stop trying to change the product name in ooo*.res; apparently is not
+ needed anymore (and doing so breaks BrOffice.org About)
+ * debian/broffice.org.p*.in: adapt diversions for new intro.png;
+ remove ooo*.res diversions
+ * debian/soffice-template.desktop.in: update for LibreOffice *
+
+ -- Rene Engelhard <r...@debian.org> Fri, 22 Oct 2010 13:44:54 +0200
libreoffice (1:3.3.0~beta2-2) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2010-10-22 13:44:23 +0000
+++ b/rules 2010-10-22 13:44:41 +0000
@@ -3066,17 +3066,10 @@
>
debian/broffice.org$(VER)/usr/share/templates/soffice.$${i}.desktop; \
done
endif
- for iso in $(LANGPACKISOS); do \
- if [ "$$iso" = "en-US" ]; then p=common; else p=l10n-`echo
$$iso | tr A-Z a-z`; fi; \
- if [ -f
$(PKGDIR)-$$p/$(OOBRANDDIR)/program/resource/ooo$$iso.res ]; then \
- cat
$(PKGDIR)-$$p/$(OOBRANDDIR)/program/resource/ooo$$iso.res \
- | sed -e "s/LibreOffice/BrOffice.org/" \
- >
debian/broffice.org$(VER)/$(OOBRANDDIR)/program/resource/ooo$$iso.res; \
- fi; \
- done
for i in writer calc draw impress math base startcenter javafilter; do \
case "$$i" in startcenter) d=common ;; javafilter)
d=filter-mobiledev ;; *) d=$$i;; esac; \
cat
$(PKGDIR)-$$d/usr/share/applications/libreoffice$(VER)-$$i.desktop \
+ | sed -e "s/libreoffice\(.*\).png/brofficeorg\1.png/" \
| sed -e "s/libreoffice/broffice/" | sed -e
"s/LibreOffice/BrOffice.org/" \
>
debian/broffice.org$(VER)/usr/share/applications/libreoffice$(VER)-$$i.desktop;
\
done
@@ -3107,7 +3100,7 @@
cd debian/broffice.org$(VER)/usr/bin && ln -s ooffice$(VER)
broffice$(VER)
# this is referenced in .keys/.applications
- for i in `find $(PKGDIR)-common/usr/share/icons -name
"openofficeorg*png"`; do \
+ for i in `find $(PKGDIR)-common/usr/share/icons -name
"libreoffice*png"`; do \
mkdir -p `dirname $$i | sed -e
s,libreoffice-common,broffice.org,`; \
ln -s `basename $$i` `echo $$i | sed -e
s,libreoffice-common,broffice.org, | sed -e s/libreoffice/brofficeorg/`; \
done
