./packages/openofficeorg/3.0/experimental r1161: fix changelog; merge
------------------------------------------------------------
revno: 1161
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2008-07-09 00:08:09 +0200
message:
fix changelog; merge
modified:
changelog
control.mono.in
rules
------------------------------------------------------------
revno: 1022.1.129
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-07-07 12:45:55 +0200
message:
fix dependency
modified:
control
control.mono.in
------------------------------------------------------------
revno: 1022.1.130
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-07-07 12:46:06 +0200
message:
fix installation
modified:
changelog
rules
------------------------------------------------------------
revno: 1022.1.131
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2008-07-08 21:18:32 +0200
message:
more mono fix(es)
renamed:
cli-uno-bridge.lintian-overrides => cli-uno-bridge.overrides.lintian
modified:
rules
=== modified file 'changelog'
--- a/changelog 2008-07-07 01:24:27 +0000
+++ b/changelog 2008-07-08 22:08:09 +0000
@@ -1,4 +1,4 @@
-openoffice.org (1:3.0.0~beta3~beb300m3-0.1pre) experimental; urgency=low
+openoffice.org (1:3.0.0~beta2~beb300m3-0.1pre) experimental; urgency=low
* OpenOffice 3.0.0 beta2 milestone 3 (BEB300_m3)
- Base now doesn't quit anymore on "recently used files" in the wizard
@@ -7,7 +7,7 @@
to a read-only location (closes: #238906)
- fixes printing of handouts in grayscale mode (closes: #416309)
* ooo-build:
- - update (r13024)
+ - update (r13118)
* debian/template.desktop.in: move to ..
* debian/startcenter.desktop.in: .. this and run ooffice now, which
will bring us to the new StartCenter. Reuse writers icon.
@@ -64,10 +64,12 @@
* debian/rules, debian/control.ure.in: package the public UNO libs
into a specific uno-libs3 package
- -- Rene Engelhard <rene@debian.org> Mon, 07 Jul 2008 00:51:39 +0200
+ -- Rene Engelhard <rene@debian.org> Wed, 09 Jul 2008 00:07:00 +0200
openoffice.org (1:2.4.1-4.5pre) unstable; urgency=medium
+ * ooo-build:
+ - update (13085)
* debian/rules:
- reenable Java for armel, gcj-4.3 OOM reportedly fixed. Add build-dep
on gcj-4,3 (>= 4.3.1-2) for armel
@@ -84,7 +86,7 @@
to register mailmerge.py as it otherwise doesn't seem to work
(closes: #488875)
- -- Rene Engelhard <rene@debian.org> Sun, 06 Jul 2008 23:28:58 +0200
+ -- Rene Engelhard <rene@debian.org> Mon, 07 Jul 2008 12:45:09 +0200
openoffice.org (1:2.4.1-4) unstable; urgency=medium
=== modified file 'control.mono.in'
--- a/control.mono.in 2008-07-07 00:49:43 +0000
+++ b/control.mono.in 2008-07-08 22:08:09 +0000
@@ -40,7 +40,7 @@
Package: libuno-cli-cppuhelper1.0-cil
Architecture: all
-Depends: ${cli:Depends}, cli-uno-bridge (= ${binary:Version})
+Depends: ${cli:Depends}, cli-uno-bridge
Description: CLI-UNO Bridge - bootstrapping library
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-07-07 01:24:27 +0000
+++ b/rules 2008-07-08 22:08:09 +0000
@@ -2194,7 +2194,7 @@
mkdir -p debian/cli-uno-bridge/usr/lib/pkgconfig
cat debian/tmp/usr/lib/pkgconfig/mono-$(OODIRNAME).pc \
| sed -e s,/usr/lib/mono/openoffice,/usr/lib/cli/uno-1.0,g \
- | sed -e s,/usr/lib/cli/uno-1.0/cli_uno_bridge.dll,/$(OODIR)/progam/cli_uno_bridge.dll, \
+ | sed -e s,/usr/lib/cli/uno-1.0/cli_uno_bridge.dll,/$(OODIR)/program/cli_uno_bridge.dll, \
| sed -e s,/usr/lib/cli/uno-1.0/cli_types.dll,/usr/lib/cli/uno-1.1/cli_types.dll, \
> debian/cli-uno-bridge/usr/lib/pkgconfig/mono-$(OODIRNAME).pc
endif
@@ -2882,7 +2882,7 @@
ifeq "$(ENABLE_MONO)" "y"
for i in libuno-cli-basetypes1.0-cil libuno-cli-types1.1-cil \
libuno-cli-cppuhelper1.0-cil libuno-cli-ure1.0-cil; do \
- rm -rf debian/$$i && mkdir -p -m755 debian/$$i/usr/lib/cli/uno; \
+ rm -rf debian/$$i && mkdir -p -m755 debian/$$i/usr/lib/cli/uno-`echo $$i | perl -pi -e 's/.*(\d.\d).*/$$1/'`; \
mv $(PKGDIR)-common/$(OODIR)/program/`echo $$i | sed -e "s/libuno-//" | sed -e "s/-cil$$//" | sed -e "s/-/_/" | perl -pi -e 's/\d.\d//'`.dll* \
debian/$$i/usr/lib/cli/uno-`echo $$i | perl -pi -e 's/.*(\d.\d).*/$$1/'`; \
done
Reply to: