------------------------------------------------------------
revno: 994
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2008-02-11 18:09:06 +0100
message:
update ooo-build
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-02-08 13:40:45 +0000
+++ b/changelog 2008-02-11 17:09:06 +0000
@@ -1,7 +1,7 @@
openoffice.org (1:2.4.0~ooh680m6-3.4pre) experimental; urgency=low
* ooo-build:
- update (r11534)
+ update (r11548)
* debian/control.in:
- fix logic error, we of course should conflict against old
openoffice.org-calcs in the new common, not the other way around
@@ -17,7 +17,7 @@
* debian/control.postgresql.in:
- s/postgresql/PostgreSQL/, thanks linttian
- -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 08 Feb 2008 14:37:10 +0100
+ -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 11 Feb 2008 14:46:13 +0100
openoffice.org (1:2.4.0~ooh680m6-3) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2008-02-08 13:40:45 +0000
+++ b/rules 2008-02-11 17:09:06 +0000
@@ -1569,7 +1569,7 @@
# to install them later in install-arch
ifeq "$(ENABLE_MONO)" "y"
cd debian/tmp/pkg; \
- mv openoffice.org-common/$(OODIR)/program/cli_*.dll \
+ mv openoffice.org-common/$(OODIR)/program/cli_*.dll* \
openoffice.org-core/$(OODIR)/program
if [ -d openoffice.org-common/$(OODIR)/program/assembly ]; then \
rm -rf openoffice.org-common/$(OODIR)/program/assembly; \
@@ -2073,6 +2073,8 @@
debian/libuno-cil/$(OODIR)/program
mv $(PKGDIR)-core/$(OODIR)/program/cli_*.dll \
debian/libuno-cil/$(OODIR)/program
+ mv $(PKGDIR)-core/$(OODIR)/program/cli_*.config \
+ debian/libuno-cil/$(OODIR)/program
mkdir -p debian/libuno-cil/usr/lib/mono
mkdir -p debian/libuno-cil/usr/lib/pkgconfig
cat debian/tmp/usr/lib/pkgconfig/mono-openoffice$(VER).pc \
