./packages/openofficeorg/3.1/experimental r1355: merge
------------------------------------------------------------
revno: 1355
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Fri 2008-12-19 19:22:24 +0100
message:
merge
removed:
openoffice.org-common.postinst.in
modified:
README
broffice.org.postrm.in
broffice.org.preinst.in
changelog
control
control.in
openoffice.org-common.preinst.in
rules
------------------------------------------------------------
revno: 1332.1.9
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2008-12-17 22:22:41 +0100
message:
obsolete flags
modified:
rules
------------------------------------------------------------
revno: 1332.1.10
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2008-12-18 01:04:32 +0100
message:
cleanup and broffice.org installation fixes
modified:
README
broffice.org.postrm.in
broffice.org.preinst.in
changelog
rules
------------------------------------------------------------
revno: 1332.1.11
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Thu 2008-12-18 15:45:49 +0100
message:
missing \
modified:
rules
------------------------------------------------------------
revno: 1332.1.12
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Thu 2008-12-18 17:04:14 +0100
message:
mkdir necessary patch for the upstream "broffice.org" mimetype iconss; merge
modified:
changelog
control
control.in
rules
------------------------------------------------------------
revno: 1022.1.208
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Thu 2008-12-18 16:46:02 +0100
message:
openoffice.org-base-core needs to depend on openoffice.org-core....
modified:
changelog
control
control.in
------------------------------------------------------------
revno: 1022.1.209
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Thu 2008-12-18 16:48:40 +0100
message:
oops
modified:
control
------------------------------------------------------------
revno: 1332.1.13
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Fri 2008-12-19 10:12:03 +0100
message:
remove "Lohit Hindi" addition for hi-INs help, obsolete
modified:
changelog
rules
------------------------------------------------------------
revno: 1332.1.14
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Fri 2008-12-19 14:53:23 +0100
message:
qstart.desktop is in the brand layer; fix double |
modified:
rules
------------------------------------------------------------
revno: 1332.1.15
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Fri 2008-12-19 16:20:25 +0100
message:
final fix...
modified:
rules
------------------------------------------------------------
revno: 1332.1.16
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Fri 2008-12-19 19:06:32 +0100
message:
rc1
removed:
openoffice.org-common.postinst.in
modified:
changelog
control
control.in
openoffice.org-common.preinst.in
rules
=== modified file 'README'
--- a/README 2006-04-17 20:45:23 +0000
+++ b/README 2008-12-18 00:04:32 +0000
@@ -14,8 +14,9 @@
---------------------------------------------------
These options are supported:
- debug - enable debug build. See the buildprj target for instructions
- about building individual modules with debug.
+ debug - build with FULL debug symbols. Default is just to build
+ with SMALL ones since the deb otherwise gets too big
+ ((>400M, ca. 1GB I-S))
ccache - enable the use of ccache during the build. This is highly
recommended if you plan on building the package more than once,
@@ -26,19 +27,19 @@
$DEB_BUILD_OPTIONS under pbuilder (this has no effect on speed,
though because the cache does not persist in pbuilder)
- num-cups=<n>
+ parallel=<n>
- enable n projects to be built in parallel (-P flag to build.pl).
The log output can get a little confusing, and some projects
may fail still. You need to remove ooo-build/config.status if you
change this value after interrupting a build.
- from=<prj>
- - Resume build from the specified project. Useful if a build is
- interrupted.
-
lang=<code>
- Build only the specified language
+ nocheck
+ - disable run of tests when enabled in rules
+
+
The targets that are built during the package build
---------------------------------------------------
@@ -63,33 +64,11 @@
maintscripts - Generates the maintainer scripts
-- clean targets -
-
-In addition to the normal 'clean', there are some partial clean operations for
-saving space without having to completely rebuild the packages:
-
-clean-debdir - Clean up the package directories (about 830M). Rebuilds
- start at 'setup'.
-
-clean-instsetoo - Clean up the installation sets and package directories
- (about 2.5 Gb!). Rebuilds start at 'insetsetoo'.
-
-clean-objectdirs - Clean compilation results, but leave solver (cleans about
- 600Mb in addition to instsetoo). Rebuilds start at
- 'dmake, but you can still develop and build individual
- projects. This is the equivalent of downloading a
- preinstalled solver tree.
-
-- other targets -
-
get-ooo-build - get ooo-build
download - downloads needed files from ooo.ximian.com, normally
not needed, already done
-cvsupdate - as the name says ;-)
-
-environment - show build environment
-
-makebinariestar - make tarball of binaries in the output tree
+get-orig-source - gets original source (only works for milestones right now)
+vcsupdate - as the name says ;-)
Build system file layout
========================
@@ -101,7 +80,10 @@
patches (patches/); also the installation scripts for installing into
debian/tmp/pkg (-> ooinstall, package-ooo).
- For adding patches; please do so in ooo-build.
+ For adding patches; please do so in ooo-build. To get a source tree
+ unpacked and patched run:
+ debian/rules configure
+ cd ooo-build && make patch.apply
See README and www/* for documentation.
=== modified file 'broffice.org.postrm.in'
--- a/broffice.org.postrm.in 2008-11-27 10:05:17 +0000
+++ b/broffice.org.postrm.in 2008-12-18 00:04:32 +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/ooo@VER@-calc.desktop /usr/share/applications/ooo@VER@-writer.desktop /usr/share/applications/ooo@VER@-draw.desktop /usr/share/applications/ooo@VER@-base.desktop /usr/share/applications/ooo@VER@-impress.desktop /usr/share/applications/ooo@VER@-math.desktop /usr/share/applications/ooo@VER@-extensionmgr.desktop /usr/share/applications/ooo@VER@-startcenter.desktop /usr/share/application-registry/openoffice.applications /usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop"
+DIVERSIONS="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/program/versionrc /@OOBRANDDIR@/share/registry/modules/org/openoffice/Setup/Setup-brand.xcu /usr/share/applications/ooo@VER@-calc.desktop /usr/share/applications/ooo@VER@-writer.desktop /usr/share/applications/ooo@VER@-draw.desktop /usr/share/applications/ooo@VER@-base.desktop /usr/share/applications/ooo@VER@-impress.desktop /usr/share/applications/ooo@VER@-math.desktop /usr/share/applications/ooo@VER@-extensionmgr.desktop /usr/share/applications/ooo@VER@-startcenter.desktop /usr/share/application-registry/openoffice.applications /usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop /usr/share/mime-info/openoffice.keys"
DIVERSIONS="$DIVERSIONS /@OOBRANDDIR@/program/intro.bmp /@OOBRANDDIR@/program/about.bmp"
LANGPACKISOS="@LANGPACKISOS@"
=== modified file 'broffice.org.preinst.in'
--- a/broffice.org.preinst.in 2008-11-27 10:05:17 +0000
+++ b/broffice.org.preinst.in 2008-12-18 00:04:32 +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/ooo@VER@-calc.desktop /usr/share/applications/ooo@VER@-writer.desktop /usr/share/applications/ooo@VER@-draw.desktop /usr/share/applications/ooo@VER@-base.desktop /usr/share/applications/ooo@VER@-impress.desktop /usr/share/applications/ooo@VER@-math.desktop /usr/share/applications/ooo@VER@-extensionmgr.desktop /usr/share/applications/ooo@VER@-startcenter.desktop /usr/share/application-registry/openoffice.applications /usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop"
+DIVERSIONS="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/program/versionrc /@OOBRANDDIR@/share/registry/modules/org/openoffice/Setup/Setup-brand.xcu /usr/share/applications/ooo@VER@-calc.desktop /usr/share/applications/ooo@VER@-writer.desktop /usr/share/applications/ooo@VER@-draw.desktop /usr/share/applications/ooo@VER@-base.desktop /usr/share/applications/ooo@VER@-impress.desktop /usr/share/applications/ooo@VER@-math.desktop /usr/share/applications/ooo@VER@-extensionmgr.desktop /usr/share/applications/ooo@VER@-startcenter.desktop /usr/share/application-registry/openoffice.applications /usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop /usr/share/mime-info/openoffice.keys"
DIVERSIONS="$DIVERSIONS /@OOBRANDDIR@/program/intro.bmp /@OOBRANDDIR@/program/about.bmp"
LANGPACKISOS="@LANGPACKISOS@"
=== modified file 'changelog'
--- a/changelog 2008-12-18 01:27:25 +0000
+++ b/changelog 2008-12-19 18:22:24 +0000
@@ -21,19 +21,34 @@
-- Rene Engelhard <rene@debian.org> Sun, 07 Dec 2008 19:40:24 +0100
-openoffice.org (1:3.0.1~ooo300m13-0.1pre) experimental; urgency=low
+openoffice.org (1:3.0.1~rc1-0.1pre) experimental; urgency=low
- * new upstream snapshot (OOO300_m13)
+ * OpenOffice.org 3.0.1 rc1 (OOO300_m14)
- fixes usage of flash v9 plugin (closes: #434510)
* ooo-build
- - switch to ooo-build-3-0-1 branch (r14842)
+ - switch to ooo-build-3-0-1 branch (r14903)
* debian/source.lintian-overrides: override bogus
missing-build-dependency-for-dh_-command
* debian/rules:
- update .so -> -dev merging to the fact that 3.0s SDK does not have
the .so symlinks for libuno_* anymore but only for the internal xmlsec.
+ - install vnd.openofficeorg.extension.desktop and /openoffice.applications
+ directly from sysui and make install-*/broffice use the directories
+ for the respective flavour directly
+ - also install /usr/share/mime-info/openoffice.keys for broffice.org
+ - remove "Lohit Hindi" addition for hi-INs help, obsolete since (at least)
+ 3.0.0
+ * debian/README, debian/rules: remove obsolete targets, explain
+ make patch.apply
+ * debian/control.in:
+ - openoffice.org-base-core needs to depend on openoffice.org-core....
+ * debian/openoffice.org-common.postinst.in: remove; call to
+ update-openoffice-dicts is obsolete because OOo does not honour
+ dictionary.lst anymore
+ * debian//openoffice.org-common.preinst: remove
+ /etc/openoffice/dictionary.lst*
- -- Rene Engelhard <rene@debian.org> Fri, 12 Dec 2008 22:35:36 +0100
+ -- Rene Engelhard <rene@debian.org> Fri, 19 Dec 2008 17:36:54 +0100
openoffice.org (1:3.0.0-6) experimental; urgency=low
=== modified file 'control'
--- a/control 2008-12-07 23:43:12 +0000
+++ b/control 2008-12-19 18:22:24 +0000
@@ -114,7 +114,7 @@
Package: openoffice.org-common
Architecture: all
-Depends: dictionaries-common (>= 0.10) | openoffice.org-updatedicts, openoffice.org-style-galaxy
+Depends: openoffice.org-style-galaxy
Suggests: openoffice.org-style-industrial, openoffice.org-style-hicontrast
Recommends: openoffice.org-style-tango, openoffice.org-style-crystal
Conflicts: openoffice.org-debian-files, openoffice.org-mimelnk, openoffice.org2-common, openclipart-openoffice.org (<= 0.17+dfsg-4), openoffice.org-l10n-en-us, openoffice.org-debian-menus, openoffice.org-core (= 2.0.4~rc3-1), openoffice.org-base (<< ${base-version}), openoffice.org-writer (<< ${base-version}), openoffice.org-calc (<< ${base-version}), openoffice.org-impress (<< ${base-version}), openoffice.org-draw (<< ${base-version}), openoffice.org-math (<< ${base-version}), broffice.org (<< ${base-version})
@@ -205,7 +205,7 @@
Package: openoffice.org-base-core
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
-Depends: ${shlibs:Depends}
+Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}
Replaces: openoffice.org-base (<< 1:2.3.1)
Suggests: openoffice.org-base
Description: OpenOffice.org office suite -- libdba
=== modified file 'control.in'
--- a/control.in 2008-11-17 23:13:59 +0000
+++ b/control.in 2008-12-19 18:06:32 +0000
@@ -256,8 +256,7 @@
Package: openoffice.orgVER-common
Architecture: all
-Depends: dictionaries-common (>= 0.10) | openoffice.org-updatedicts,
- openoffice.orgVER-style-galaxy
+Depends: openoffice.orgVER-style-galaxy
Suggests: openoffice.orgVER-style-industrial,
openoffice.orgVER-style-hicontrast
Recommends: openoffice.orgVER-style-tango,
@@ -414,7 +413,7 @@
Package: openoffice.orgVER-base-core
Architecture: %OOO_ARCHS%
-Depends: ${shlibs:Depends}
+Depends: openoffice.orgVER-core (= ${Source-Version}), ${shlibs:Depends}
Replaces: openoffice.org-base (<< 1:2.3.1)
Suggests: openoffice.orgVER-base
Description: OpenOffice.org office suite -- libdba
=== removed file 'openoffice.org-common.postinst.in'
--- a/openoffice.org-common.postinst.in 2008-07-30 01:52:28 +0000
+++ b/openoffice.org-common.postinst.in 1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# postinst script for openoffice.org-common
-
-THIS_PACKAGE=openoffice.org-common
-THIS_SCRIPT=postinst
-
-set -e
-
-#INCLUDE_SHELL_LIB#
-
-if [ "$1" = "configure" ]; then
- update-openoffice-dicts
-fi
-
-#DEBHELPER#
-
-exit 0
=== modified file 'openoffice.org-common.preinst.in'
--- a/openoffice.org-common.preinst.in 2008-07-30 01:52:28 +0000
+++ b/openoffice.org-common.preinst.in 2008-12-19 18:06:32 +0000
@@ -18,6 +18,8 @@
if dpkg --compare-versions "$2" lt "2.0.2-2"; then
rm_conffile "/etc/bash_completion.d/ooo-wrapper.sh" $THIS_PACKAGE
fi
+ # obsolete. no conffile.
+ rm -f /etc/openoffice/dictionary.lst /etc/openoffice/dictionary.lst-old
;;
esac
=== modified file 'rules'
--- a/rules 2008-12-18 01:27:25 +0000
+++ b/rules 2008-12-19 18:22:24 +0000
@@ -1,40 +1,30 @@
#!/usr/bin/make -f
-###################################################################################
+################################################################################
# OpenOffice.org source package rules file
#
# Please see debian/README for detailed documentation about the build system, and
# how to build OpenOffice.org.
-###################################################################################
+################################################################################
# Authors:
# Chris Halls <halls@debian.org>
# Rene Engelhard <rene@debian.org>
-# Copyright 2002-2006 Software in the Public Interest, Inc.
+# Copyright 2002-2008 Software in the Public Interest, Inc.
# Licensed under the GNU General Public License, version 2. See the file
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-###################################################################################
-
-#VER:=3
-OOVER:=3.1
-SHELL:=/bin/bash
-PKGDIR:=debian/openoffice.org$(VER)
-OODIRNAME=openoffice$(VER)
-OOBRANDDIR:=usr/lib/$(OODIRNAME)
-OOBASISDIR:=$(OOBRANDDIR)/basis$(OOVER)
-OOSDKDIR:=$(OOBRANDDIR)/sdk
-OOUREDIR:=usr/lib/ure
-# compatability
-OODIR:=$(OOBASISDIR)
+################################################################################
PKGSOURCE := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2;exit 0}')
SOURCE_VERSION:=$(shell head -1 debian/changelog | cut -d\( -f2 | cut -d\) -f1)
UPSTREAM_VERSION:=$(shell echo "$(SOURCE_VERSION)"| cut -d: -f2 | cut -d- -f1)
BASE_VERSION:=$(shell echo $(SOURCE_VERSION) | cut -d: -f1):$(UPSTREAM_VERSION)
-HELP_L10N_VIRTUAL_VERSION:=$(shell echo $(UPSTREAM_VERSION) | cut -d: -f2 | tr [~] [\\-])
-#HELP_L10N_VIRTUAL_VERSION:=3.0
-
BINARY_VERSION=$(SOURCE_VERSION)
#BINARY_VERSION=1:2.4.0-$(shell dpkg-parsechangelog | grep urgency \
| awk '{print $$2}' | sed -e s/"("// -e s/")"// | cut -d"-" -f2)
+HELP_L10N_VIRTUAL_VERSION:=$(shell echo $(UPSTREAM_VERSION) | cut -d: -f2 | tr [~] [\\-])
+#HELP_L10N_VIRTUAL_VERSION:=3.0
+#VER:=3
+OOVER:=3.1
+
PACKAGES := $(shell dh_listpackages)
ARCH_INDEP_PACKAGES := $(shell dh_listpackages -i)
ARCH_DEP_PACKAGES := $(shell dh_listpackages -s)
@@ -47,6 +37,16 @@
DISTREL := sid
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+SHELL:=/bin/bash
+
+PKGDIR:=debian/openoffice.org$(VER)
+OODIRNAME=openoffice$(VER)
+OOBRANDDIR:=usr/lib/$(OODIRNAME)
+OOBASISDIR:=$(OOBRANDDIR)/basis$(OOVER)
+OOSDKDIR:=$(OOBRANDDIR)/sdk
+OOUREDIR:=usr/lib/ure
+# compatability
+OODIR:=$(OOBASISDIR)
# Figure out who's building this package.
OOO_VENDOR:=Debian
@@ -190,6 +190,7 @@
ENABLE_PDFIMPORT=y
BUILD_GTK=y
ENABLE_EVO2=y
+# broken!
ENABLE_GIO=n
ENABLE_RANDR=y
ifeq "$(BUILD_GTK)" "y"
@@ -218,9 +219,7 @@
--with-lang="$(BUILD_ISOS)" \
--with-build-version="openoffice.org$(VER)-core $(BINARY_VERSION), `LC_ALL=C date`" \
--disable-strip \
- --enable-atkbridge \
--enable-lockdown \
- --enable-openxml \
--with-drink=coffee \
--libdir=/usr/lib \
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
@@ -426,10 +425,16 @@
BUILD_DEPS += , libdb$(DBVER)-dev
ifneq "$(BUILD_DBG_PACKAGE)" "y"
+ # build with small symbols anyway
SMALL_SYMBOLS = y
else
- # -g gives a far too big deb (>400M, ca. 1GB I-S)
+ # -g gives a far too big deb (>400M, ca. 1GB I-S)
+ ifeq (debug,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+ # ooo-build defaults to --enable-symbols (without SMALL)
+ SMALL_SYMBOLS = n
+ else
SMALL_SYMBOLS = y
+ endif
DBG_DBG_SUGGESTS+= , libc6.1-dbg [alpha ia64], libc0.1-dbg [kfreebsd-i386 kfreebsd-amd64], libc0.3-dbg [hurd-i386], libc6-dbg [!ia64 !alpha !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], ure-dbg, libatk1.0-dbg, libglib2.0-0-dbg, libgnomevfs2-0-dbg, libstdc++6-$(shell g++ --version | head -n 1 | cut -d' ' -f3 | cut -d'.' -f1,2)-dbg, libx11-6-dbg, libxext6-dbg, libxaw7-dbg, libxml2-dbg, libgtk2.0-0-dbg, libxau6-dbg, libice6-dbg, libsm6-dbg, libxinerama1-dbg, libfontconfig1-dbg
ifeq "$(USE_LIBCURL4)" "y"
DBG_DBG_SUGGESTS+= , libcurl3-dbg
@@ -437,6 +442,10 @@
DBG_DBG_SUGGESTS+= , libcurl4-dbg
endif
endif
+# Small symbols?
+ifeq "$(SMALL_SYMBOLS)" "y"
+ CONFIGURE_FLAGS += --enable-symbols=SMALL
+endif
ifeq "$(BUILD_PYUNO)" "y"
ifeq "$(USE_PYCENTRAL)" "y"
@@ -919,16 +928,6 @@
CONFIGURE_FLAGS += --with-gcc-speedup=ccache
endif
-# Small symbols?
-ifeq "$(SMALL_SYMBOLS)" "y"
- CONFIGURE_FLAGS += --enable-symbols=SMALL
-endif
-
-# Restart build from a particular project?
-# DEB_BUILD_OPTIONS=from=<projectname>
-BUILD_FROM=$(shell echo "$(DEB_BUILD_OPTIONS)," | sed -n 's/^\(.*,\)\?from=\([a-zA-Z0-9]\+\).*$$/\2/p')
-export BUILD_FROM
-
# Build n projects in parallel?
# DEB_BUILD_OPTIONS=parallel=<n>
NUM_CPUS=$(shell echo "$(DEB_BUILD_OPTIONS)," | sed -n 's/^\(.*,\)\?parallel=\([0-9]\+\).*$$/\2/p')
@@ -1788,11 +1787,6 @@
$(PKGDIR)-help-$$pkgiso; \
fi; \
done
- ifeq (hi-IN,$(findstring hi-IN,$(HELPISOS)))
- for i in $(PKGDIR)-help-hi-in/$(OODIR)/help/hi-IN/*.css; do \
- perl -pi -e 's|(font-family: )(.*)|\1 \"Lohit Hindi\", \2|' $$i; \
- done
- endif
endif
endif
@@ -2178,7 +2172,7 @@
for i in writer calc impress draw math base; do \
perl -pi -e 's/Application;//; s/X-Red-Hat-Base;//; s/X-SuSE-Core-Office;//; s/X-MandrivaLinux-.*;//;' $(PKGDIR)-$$i/usr/share/applications/ooo$(VER)-$$i.desktop; \
done
- perl -pi -e 's/Application;//' $(PKGDIR)-gtk/$(OODIR)/share/xdg/qstart.desktop
+ perl -pi -e 's/Application;//' $(PKGDIR)-gtk/$(OOBRANDDIR)/share/xdg/qstart.desktop
else
# menu files from ooo-build/desktop
for p in writer calc impress draw math base; do \
@@ -2511,20 +2505,28 @@
> debian/broffice.org$(VER)/$(OOBRANDDIR)/program/resource/ooo$$iso.res; \
fi; \
done
- for i in writer calc draw impress math base; do \
+ for i in writer calc draw impress math base startcenter; do \
cat $(PKGDIR)-$$i/usr/share/applications/ooo-$$i.desktop \
| sed -e "s/ooff/broff/" | sed -e "s/OpenO/BrO/" \
> debian/broffice.org$(VER)/usr/share/applications/ooo-$$i.desktop; \
done
- cat $(PKGDIR)-common//usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop \
- | sed -e "s/ooff/broff/" | sed -e "s/OpenO/BrO/" \
- > debian/broffice.org//usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop
- cat $(PKGDIR)-common/usr/share/applications/ooo-startcenter.desktop \
- | sed -e "s/ooff/broff/" | sed -e "s/OpenO/BrO/" \
- > debian/broffice.org$(VER)/usr/share/applications/ooo-startcenter.desktop
- cat $(PKGDIR)-common/usr/share/application-registry/openoffice.applications \
- | sed -e "s/ooff/broff/" | sed -e "s/OpenO/BrO/" \
- > debian/broffice.org$(VER)/usr/share/application-registry/openoffice.applications
+ dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/misc/broffice.org >/dev/null; pwd`" ;\
+ mkdir -p -m755 debian/broffice.org/usr/share/mimelnk/application ;\
+ sed -e 's,Comment=Extension,Comment=BrOffice.org $(VER) Extension,' \
+ -e 's,Icon=brofficeorg[0123456789]-extension,Icon=application-vnd.openofficeorg.extension.png,' \
+ -e 's/ / /' \
+ < $$dirname/extension.desktop \
+ > debian/broffice.org/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop || exit 1
+ mkdir -p debian/broffice.org/usr/share/application-registry && \
+ cat $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/misc/broffice.org/openoffice.applications \
+ | sed -e s/OFFICENAME/broffice/g \
+ | sed -e s/\%PRODUCTNAME/BrOffice.org/g \
+ > debian/broffice.org/usr/share/application-registry/openoffice.applications
+ rm -f debian/broffice.org/usr/share/mime-info/openoffice.keys; \
+ mkdir -p debian/broffice.org/usr/share/mime-info/
+ for i in $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/misc/broffice.org/*.keys; do \
+ cat $$i >> debian/broffice.org/usr/share/mime-info/openoffice.keys; \
+ done
if dpkg-parsechangelog | grep urgency | grep -q "\~.*m[0123456789]\+"; then \
debian/scripts/fix_image_rgb \
$(SOURCE_TREE)/ooo_custom_images/dev_nologo_broffice/introabout/intro.bmp \
@@ -2538,6 +2540,12 @@
debian/broffice.org$(VER)/$(OOBRANDDIR)/program/about.bmp
cd debian/broffice.org$(VER)/usr/bin && ln -s ooffice broffice
+ # this is referenced in .keys/.applications
+ for i in `find $(PKGDIR)-common/usr/share/icons -name "openofficeorg*png"`; do \
+ mkdir -p `dirname $$i | sed -e s,openoffice.org-common,broffice.org,`; \
+ ln -s `basename $$i` `echo $$i | sed -e s,openoffice.org-common,broffice.org, | sed -e s/openofficeorg/brofficeorg/`; \
+ done
+
touch $@
# Install files generated by setup into arch-independent package directories
@@ -2584,7 +2592,7 @@
# install .applications, .keys, .mime and openoffice.org.xml for
# shared-mime-info
mkdir -p $(PKGDIR)-common/usr/share/application-registry && \
- cat $(SOURCE_TREE)/sysui/desktop/mimetypes/openoffice.applications \
+ cat $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/misc/openoffice.org/openoffice.applications \
| sed -e s/OFFICENAME/ooffice/g \
| sed -e s/\%PRODUCTNAME/OpenOffice.org/g \
> $(PKGDIR)-common/usr/share/application-registry/openoffice.applications
@@ -2737,7 +2745,7 @@
rm -rf $(PKGDIR)-common/$(OOBRANDDIR)/readmes
rm -f $(PKGDIR)-common/$(OOBRANDDIR)/share/readme/README*
- # install Ximian desktop icons
+ # 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/desktop/$$r/*.png \
@@ -2934,9 +2942,11 @@
dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/misc/openoffice.org >/dev/null; pwd`" ;\
mkdir -p -m755 $(PKGDIR)-common/usr/share/mimelnk/application ;\
sed -e 's,Comment=Extension,Comment=OpenOffice.org $(VER) Extension,' \
+ -e 's,Icon=openofficeorg[0123456789]-extension,Icon=application-vnd.openofficeorg.extension.png,' \
-e 's/ / /' \
< $$dirname/extension.desktop \
> $(PKGDIR)-common/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop || exit 1
+ # install ooo-build mimetype icon
for i in 16x16 22x22 24x24 32x32 48x48; do \
install -D -m644 $(CURDIR)/ooo-build/desktop/mimetypes/$$i/application-vnd.openofficeorg.extension.png \
$(PKGDIR)-common/usr/share/icons/hicolor/$$i/mimetypes/application-vnd.openofficeorg.extension.png; \
Reply to: