./packages/openofficeorg/3.0/experimental r1110: merge 2.4.1-1
------------------------------------------------------------
revno: 1110
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2008-06-10 10:42:51 +0200
message:
merge 2.4.1-1
modified:
broffice.org.postrm.in
broffice.org.preinst.in
changelog
control
control.in
rules
------------------------------------------------------------
revno: 1022.1.100
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sat 2008-06-07 12:30:50 +0200
message:
cnflict against libgtk2.0-0 = 2.12.10-1 on amd64
modified:
changelog
control
control.in
------------------------------------------------------------
revno: 1022.1.101
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sat 2008-06-07 12:48:18 +0200
message:
install also other resolutions than 48x48 for the ooo-build/desktop icons
modified:
changelog
rules
------------------------------------------------------------
revno: 1022.1.102
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-06-09 17:43:20 +0200
message:
2.4.1 final (orig copy from rc2); update debian/copyright; update ooo-build
modified:
changelog
copyright
------------------------------------------------------------
revno: 1022.1.103
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-06-09 19:44:12 +0200
message:
fixup openoffice.applications
modified:
broffice.org.postrm.in
broffice.org.preinst.in
changelog
rules
------------------------------------------------------------
revno: 1022.1.104
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-06-09 20:16:13 +0200
message:
don't change unopkg path anymore
modified:
changelog
rules
------------------------------------------------------------
revno: 1022.1.105
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2008-06-10 10:17:43 +0200
message:
update Vcs-Bzr: for new branch
modified:
control
control.in
------------------------------------------------------------
revno: 1022.1.106
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2008-06-10 10:37:19 +0200
message:
-1
modified:
changelog
=== modified file 'broffice.org.postrm.in'
--- a/broffice.org.postrm.in 2008-05-19 20:49:56 +0000
+++ b/broffice.org.postrm.in 2008-06-10 08:42:51 +0000
@@ -9,7 +9,7 @@
#INCLUDE_SHELL_LIB#
-DIVERSIONS="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/program/versionrc /@OOBRANDDIR@/share/registry/data/org/openoffice/Setup.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"
+DIVERSIONS="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/program/versionrc /@OOBRANDDIR@/share/registry/data/org/openoffice/Setup.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"
DIVERSIONS="$DIVERSIONS /@OOBRANDDIR@/program/intro.bmp /@OOBRANDDIR@/program/about.bmp"
LANGPACKISOS="@LANGPACKISOS@"
=== modified file 'broffice.org.preinst.in'
--- a/broffice.org.preinst.in 2008-05-19 20:49:56 +0000
+++ b/broffice.org.preinst.in 2008-06-10 08:42:51 +0000
@@ -9,7 +9,7 @@
#INCLUDE_SHELL_LIB#
-DIVERSIONS="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/program/versionrc /@OOBRANDDIR@/share/registry/data/org/openoffice/Setup.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"
+DIVERSIONS="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/program/versionrc /@OOBRANDDIR@/share/registry/data/org/openoffice/Setup.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"
DIVERSIONS="$DIVERSIONS /@OOBRANDDIR@/program/intro.bmp /@OOBRANDDIR@/program/about.bmp"
LANGPACKISOS="@LANGPACKISOS@"
=== modified file 'changelog'
--- a/changelog 2008-06-07 10:40:11 +0000
+++ b/changelog 2008-06-10 08:42:51 +0000
@@ -56,12 +56,27 @@
-- Rene Engelhard <rene@debian.org> Fri, 06 Jun 2008 14:34:39 +0200
-openoffice.org (1:2.4.1~rc2-1.2pre) experimental; urgency=low
+openoffice.org (1:2.4.1-1) unstable; urgency=low
+ * OpenOffice.org 2.4.1 final
+ * upload to unstable
+ * ooo-build:
+ - update (r12837)
* debian/control.in:
- only recommend -fitler-binfilter. (closes: #484287)
+ - conflict against libgtk2.0-0 = 2.12.10-1 on amd64 because of
+ #484580 and #484758.
+ * debian/rules:
+ - install also other resolutions than 48x48 for the ooo-build/desktop
+ icons, thanks Chris Cheney
+ * debian/rules, debian/broffice.org.*.in:
+ - fixup openoffice.applications (closes: #485437) and stop specifying
+ unopkg with full paths (we don't do it for ooffice either and
+ /usr/bin/unopkg does it)
+ * debian/copyright:
+ - update
- -- Rene Engelhard <rene@debian.org> Wed, 04 Jun 2008 00:10:04 +0200
+ -- Rene Engelhard <rene@debian.org> Mon, 09 Jun 2008 20:15:06 +0200
openoffice.org (1:2.4.1~rc2-1) experimental; urgency=low
=== modified file 'control'
--- a/control 2008-06-06 11:05:32 +0000
+++ b/control 2008-06-10 08:42:51 +0000
@@ -336,7 +336,7 @@
Section: gnome
Enhances: openoffice.org
Replaces: openoffice.org-gnome (<< 2.0.4~rc1-0), openoffice.org-common (<< 2.0.4~rc1-0)
-Conflicts: ooqstart-gnome, oooqs-kde
+Conflicts: ooqstart-gnome, oooqs-kde, libgtk2.0-0 (= 2.12.10-1) [amd64]
Description: GTK+ Integration for OpenOffice.org (Widgets, Dialogs, Quickstarter)
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
=== modified file 'control.in'
--- a/control.in 2008-06-06 11:05:32 +0000
+++ b/control.in 2008-06-10 08:42:51 +0000
@@ -563,7 +563,7 @@
Enhances: openoffice.orgVER
Replaces: openoffice.org-gnome (<< 2.0.4~rc1-0),
openoffice.org-common (<< 2.0.4~rc1-0)
-Conflicts: ooqstart-gnome, oooqs-kde
+Conflicts: ooqstart-gnome, oooqs-kde, libgtk2.0-0 (= 2.12.10-1) [amd64]
Description: GTK+ Integration for OpenOffice.org (Widgets, Dialogs, Quickstarter)
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
=== modified file 'rules'
--- a/rules 2008-06-07 10:40:11 +0000
+++ b/rules 2008-06-10 08:42:51 +0000
@@ -2365,6 +2365,7 @@
rm -rf debian/broffice.org
mkdir -p debian/broffice.org/usr/bin
mkdir -p debian/broffice.org/usr/share/applications
+ mkdir -p debian/broffice.org/usr/share/application-registry
mkdir -p debian/broffice.org/$(OOBRANDDIR)/program/resource
mkdir -p debian/broffice.org/$(OOBRANDDIR)/share/registry/data/org/openoffice
cat $(PKGDIR)-common/$(OOBRANDDIR)/program/bootstraprc \
@@ -2390,6 +2391,9 @@
cat $(PKGDIR)-common/usr/share/applications/ooo-startcenter.desktop \
| sed -e "s/ooff/broff/" | sed -e "s/OpenO/BrO/" \
> debian/broffice.org/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/usr/share/application-registry/openoffice.applications
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 \
@@ -2448,8 +2452,10 @@
# install .applications, .keys and .mime
mkdir -p $(PKGDIR)-common/usr/share/application-registry && \
- install -m644 $(SOURCE_TREE)/sysui/desktop/mimetypes/openoffice.applications \
- $(PKGDIR)-common/usr/share/application-registry
+ cat $(SOURCE_TREE)/sysui/desktop/mimetypes/openoffice.applications \
+ | sed -e s/OFFICENAME/ooffice/g \
+ | sed -e s/\%PRODUCTNAME/OpenOffice.org/g \
+ > $(PKGDIR)-common/usr/share/application-registry/openoffice.applications
mkdir -p $(PKGDIR)-common/usr/share/mime/packages && \
mkdir -p $(PKGDIR)-common/usr/share/mime-info && \
install -m644 $(SOURCE_TREE)/sysui/desktop/mimetypes/openoffice.mime \
@@ -2618,9 +2624,11 @@
rm -rf $(PKGDIR)-common/$(OOBRANDDIR)/share/readme/README*
# install Ximian desktop icons
- mkdir -p $(PKGDIR)-common/usr/share/icons/hicolor/48x48/apps
- cp ooo-build/desktop/48x48/*.png \
- $(PKGDIR)-common/usr/share/icons/hicolor/48x48/apps
+ 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 \
+ $(PKGDIR)-common/usr/share/icons/hicolor/$$r/apps; \
+ done
# move psprint.conf into /etc
mkdir -p $(PKGDIR)-common/etc/$(OODIRNAME)
Reply to: