------------------------------------------------------------
revno: 1375
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Fri 2009-01-02 06:54:16 +0100
message:
merge
modified:
broffice.org.postrm.in
broffice.org.preinst.in
changelog
rules
------------------------------------------------------------
revno: 1332.1.29
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Fri 2009-01-02 06:09:15 +0100
message:
also change UI-brand.xcu for BrOffice.org
modified:
broffice.org.postrm.in
broffice.org.preinst.in
changelog
rules
------------------------------------------------------------
revno: 1332.1.30
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Fri 2009-01-02 06:53:34 +0100
message:
- for writer/calc/impress/draw/math/base, do our changes on
the versions in share/xdg directly
modified:
changelog
rules
=== modified file 'broffice.org.postrm.in'
--- a/broffice.org.postrm.in 2008-12-18 00:04:32 +0000
+++ b/broffice.org.postrm.in 2009-01-02 05:09:15 +0000
@@ -9,7 +9,7 @@
#INCLUDE_SHELL_LIB#
-DIVERSIONS="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/program/versionrc
/@OOBRANDDIR@/share/registry/modules/org/openoffice/Setup/Setup-brand.xcu
/usr/share/applications/o...@ver@-calc.desktop
/usr/share/applications/o...@ver@-writer.desktop
/usr/share/applications/o...@ver@-draw.desktop
/usr/share/applications/o...@ver@-base.desktop
/usr/share/applications/o...@ver@-impress.desktop
/usr/share/applications/o...@ver@-math.desktop
/usr/share/applications/o...@ver@-extensionmgr.desktop
/usr/share/applications/o...@ver@-startcenter.desktop
/usr/share/application-registry/openoffice.applications
/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop
/usr/share/mime-info/openoffice.keys"
+DIVERSIONS="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/program/versionrc
/@OOBRANDDIR@/share/registry/modules/org/openoffice/Setup/Setup-brand.xcu
/usr/share/applications/o...@ver@-calc.desktop
/usr/share/applications/o...@ver@-writer.desktop
/usr/share/applications/o...@ver@-draw.desktop
/usr/share/applications/o...@ver@-base.desktop
/usr/share/applications/o...@ver@-impress.desktop
/usr/share/applications/o...@ver@-math.desktop
/usr/share/applications/o...@ver@-extensionmgr.desktop
/usr/share/applications/o...@ver@-startcenter.desktop
/usr/share/application-registry/openoffice.applications
/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop
/usr/share/mime-info/openoffice.keys
@OOBRANDDIR@/share/registry/modules/org/openoffice/Office/UI/UI-brand.xcu"
DIVERSIONS="$DIVERSIONS /@OOBRANDDIR@/program/intro.bmp
/@OOBRANDDIR@/program/about.bmp"
LANGPACKISOS="@LANGPACKISOS@"
=== modified file 'broffice.org.preinst.in'
--- a/broffice.org.preinst.in 2008-12-18 00:04:32 +0000
+++ b/broffice.org.preinst.in 2009-01-02 05:09:15 +0000
@@ -9,7 +9,7 @@
#INCLUDE_SHELL_LIB#
-DIVERSIONS="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/program/versionrc
/@OOBRANDDIR@/share/registry/modules/org/openoffice/Setup/Setup-brand.xcu
/usr/share/applications/o...@ver@-calc.desktop
/usr/share/applications/o...@ver@-writer.desktop
/usr/share/applications/o...@ver@-draw.desktop
/usr/share/applications/o...@ver@-base.desktop
/usr/share/applications/o...@ver@-impress.desktop
/usr/share/applications/o...@ver@-math.desktop
/usr/share/applications/o...@ver@-extensionmgr.desktop
/usr/share/applications/o...@ver@-startcenter.desktop
/usr/share/application-registry/openoffice.applications
/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop
/usr/share/mime-info/openoffice.keys"
+DIVERSIONS="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/program/versionrc
/@OOBRANDDIR@/share/registry/modules/org/openoffice/Setup/Setup-brand.xcu
/usr/share/applications/o...@ver@-calc.desktop
/usr/share/applications/o...@ver@-writer.desktop
/usr/share/applications/o...@ver@-draw.desktop
/usr/share/applications/o...@ver@-base.desktop
/usr/share/applications/o...@ver@-impress.desktop
/usr/share/applications/o...@ver@-math.desktop
/usr/share/applications/o...@ver@-extensionmgr.desktop
/usr/share/applications/o...@ver@-startcenter.desktop
/usr/share/application-registry/openoffice.applications
/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop
/usr/share/mime-info/openoffice.keys
@OOBRANDDIR@/share/registry/modules/org/openoffice/Office/UI/UI-brand.xcu"
DIVERSIONS="$DIVERSIONS /@OOBRANDDIR@/program/intro.bmp
/@OOBRANDDIR@/program/about.bmp"
LANGPACKISOS="@LANGPACKISOS@"
=== modified file 'changelog'
--- a/changelog 2008-12-30 23:53:12 +0000
+++ b/changelog 2009-01-02 05:54:16 +0000
@@ -4,7 +4,7 @@
- build without -march=armv5te for arm (closes: #501957)
- lbnames.h supports gcc 4.4 (closes: #505669)
* ooo-build:
- - back on trunk (r14975)
+ - back on trunk (r14987)
- updates openoffice.1 to remove --version (closes: #505768)
* debian/shlibs.override.icu: update for new icu
* debian/shlibs.override.xmlsec: remove, xmlsec went static
@@ -29,7 +29,7 @@
* debian/rules, debian/startcenter.desktop: remove own startcenter.desktop;
OOo now has one upstream
- -- Rene Engelhard <r...@debian.org> Wed, 31 Dec 2008 00:25:12 +0100
+ -- Rene Engelhard <r...@debian.org> Thu, 01 Jan 2009 19:33:16 +0100
openoffice.org (1:3.0.1~rc1-2.3pre) experimental; urgency=low
@@ -39,6 +39,8 @@
- apply Python26 patchset if building with python 2.6
- install libsalalloc_malloc.so.3 into -qa-tools
- remove rest of if(n)eq ETCH_BACKPORT conditionals
+ - for writer/calc/impress/draw/math/base, do our changes on
+ the versions in share/xdg directly
* debian/control.reportdesign.in:
- add missing Depends: on ${java-runtime-depends}
* debian/control.in:
@@ -47,8 +49,10 @@
* debian/rules, control.gcj.in: disable ppc for -gcj as gij doesn't work
there anyway (#478760). Fix Architecture: of -gcj to not include
non-Java archs.
+ * debian/rules, debian/broffice.org.{preinst,postrm}.in: also change
+ UI-brand.xcu for BrOffice.org
- -- Rene Engelhard <r...@debian.org> Sun, 28 Dec 2008 01:36:01 +0100
+ -- Rene Engelhard <r...@debian.org> Fri, 02 Jan 2009 06:53:22 +0100
openoffice.org (1:3.0.1~rc1-2) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2008-12-31 00:41:13 +0000
+++ b/rules 2009-01-02 05:54:16 +0000
@@ -2123,15 +2123,13 @@
endif
ifeq "$(USE_OOO_BUILD_DESKTOPS)" "n"
- # menu files from sysui
- dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*.sh; echo
$$OUTPATH$$PROEXT)/misc/desktopshare >/dev/null; pwd`" ;\
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,Name=$${PRODUCTNAME}
$${PRODUCTVERSION},Name=OpenOffice.org $(VER),' \
+ sed -e 's,Exec=openoffice.org$(VER) \(.*\)
%U,Exec=ooffice$(VER) \1 %U,' \
+ -e 's,Icon=openofficeorg[0123456789]\+,Icon=ooo,' \
+ -e 's,Name=OpenOffice.org $(OOVER),Name=OpenOffice.org
$(VER),' \
-e 's/ / /' \
- < $$dirname/$$p.desktop \
+ < $(PKGDIR)-$$p/$(OOBRANDDIR)/share/xdg/$$p.desktop \
> $(PKGDIR)-$$p/usr/share/applications/ooo$(VER)-$$p.desktop
|| exit 1 ;\
done
@@ -2145,7 +2143,7 @@
-e "s/ / /" \
$(PKGDIR)-gtk/$(OOBRANDDIR)/share/xdg/qstart.desktop
endif
- # we don't need the share/xdgs except qstart
+ # we don't need the share/xdgs (anymore) except qstart
for f in `find debian -name '*.desktop' | grep xdg | grep -v qstart`;
do \
rm -f $$f; done
for f in `find debian -name '*.desktop'`; do \
@@ -2477,6 +2475,7 @@
mkdir -p debian/broffice.org$(VER)/usr/share/mimelnk/application
mkdir -p debian/broffice.org$(VER)/$(OOBRANDDIR)/program/resource
mkdir -p
debian/broffice.org$(VER)/$(OOBRANDDIR)/share/registry/modules/org/openoffice/Setup
+ mkdir -p
debian/broffice.org$(VER)/$(OOBRANDDIR)/share/registry/modules/org/openoffice/Office/UI
cat $(PKGDIR)-common/$(OOBRANDDIR)/program/bootstraprc \
| sed -e "s/OpenO/BrO/" | sed -e "s/openo/bro/" \
> debian/broffice.org$(VER)/$(OOBRANDDIR)/program/bootstraprc
@@ -2486,6 +2485,9 @@
cat
$(PKGDIR)-common/$(OOBRANDDIR)/share/registry/modules/org/openoffice/Setup/Setup-brand.xcu
\
| sed -e "s/OpenO/BrO/" \
>
debian/broffice.org$(VER)/$(OOBRANDDIR)/share/registry/modules/org/openoffice/Setup/Setup-brand.xcu
+ cat
$(PKGDIR)-common/$(OOBRANDDIR)/share/registry/modules/org/openoffice/Office/UI/UI-brand.xcu
\
+ | sed -e "s/OpenO/BrO/" \
+ >
debian/broffice.org$(VER)/$(OOBRANDDIR)/share/registry/modules/org/openoffice/Office/UI/UI-brand.xcu
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 \
