------------------------------------------------------------
revno: 1171
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Sun 2008-07-13 16:33:15 +0200
message:
fix merge error; -1
modified:
changelog
control.mono.in
rules
------------------------------------------------------------
revno: 1022.1.134
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Fri 2008-07-11 23:16:26 +0200
message:
actually add the hardcoded depends..
modified:
control
control.mono.in
------------------------------------------------------------
revno: 1022.1.135
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Sat 2008-07-12 00:24:07 +0200
message:
missing ,
modified:
control
control.mono.in
------------------------------------------------------------
revno: 1022.1.136
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Sat 2008-07-12 15:28:46 +0200
message:
oops
modified:
rules
------------------------------------------------------------
revno: 1022.1.137
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Sun 2008-07-13 12:43:33 +0200
message:
-6
modified:
changelog
=== modified file 'changelog'
--- a/changelog 2008-07-11 21:03:30 +0000
+++ b/changelog 2008-07-13 14:33:15 +0000
@@ -1,4 +1,4 @@
-openoffice.org (1:3.0.0~beta2-0.1pre) experimental; urgency=low
+openoffice.org (1:3.0.0~beta2-1) experimental; urgency=low
* OpenOffice 3.0.0 beta2 (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 (r13168)
+ - update (r13171)
* 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,7 +64,21 @@
* debian/rules, debian/control.ure.in: package the public UNO libs
into a specific uno-libs3 package
- -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 11 Jul 2008 22:26:10 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Sun, 13 Jul 2008 03:09:05 +0200
+
+openoffice.org (1:2.4.1-6) unstable; urgency=low
+
+ * ooo-build
+ - update (r13167)
+ * debian/rules:
+ - only try to copy debian/tmp/pkg/openoffice.org-{help,l10n}-xx when
+ it's there
+ * debian/control.mono.in, debian/rules:
+ - hrm, we probably shouldn't make binary-arch depend on binary-indep.
+ Hardcode cli-uno-bridges dependencies instead of relying on
+ dh_clideps
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 11 Jul 2008 22:25:33 +0200
openoffice.org (1:2.4.1-5) unstable; urgency=medium
=== modified file 'control.mono.in'
--- a/control.mono.in 2008-07-08 22:08:09 +0000
+++ b/control.mono.in 2008-07-13 14:33:15 +0000
@@ -2,8 +2,11 @@
Architecture: %OOO_MONO_ARCHS%
Depends: ${shlibs:Depends},
openoffice.orgVER-core (>> ${base-version}),
- ${cli:Depends},
- libuno-cli-cppuhelper1.0-cil
+ libuno-cli-basetypes1.0-cil,
+ libuno-cli-types1.1-cil,
+ libuno-cli-cppuhelper1.0-cil,
+ libuno-cli-ure1.0-cil,
+ ${cli:Depends}
Conflicts: libuno-cil
Provides: libuno-cil
Replaces: libuno-cil
=== modified file 'rules'
--- a/rules 2008-07-11 21:03:30 +0000
+++ b/rules 2008-07-13 14:33:15 +0000
@@ -1743,9 +1743,11 @@
set -e; \
for iso in $(filter-out en-US,$(HELPISOS)); do \
pkgiso=`echo $$iso | tr \[:upper:\] \[:lower:\]`; \
- rm -rf $(PKGDIR)-help-$$pkgiso $(PKGDIR)-help-$$pkgiso.*.debhelper; \
- cp -r --preserve=mode debian/tmp/pkg/openoffice.org-help-$$iso \
- $(PKGDIR)-help-$$pkgiso; \
+ if [ -d debian/tmp/pkg/openoffice.org-help-$$iso ]; then \
+ rm -rf $(PKGDIR)-help-$$pkgiso $(PKGDIR)-help-$$pkgiso.*.debhelper;
\
+ cp -r --preserve=mode debian/tmp/pkg/openoffice.org-help-$$iso \
+ $(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 \
@@ -1770,9 +1772,11 @@
for iso in $(LANGPACKISOS); do \
if [ "$$iso" = "en-US" ]; then continue; fi ; \
pkgiso=`echo $$iso | tr \[:upper:\] \[:lower:\]`; \
- rm -rf $(PKGDIR)-l10n-$$pkgiso $(PKGDIR)-l10n-$$pkgiso.*.debhelper; \
- cp -r --preserve=mode debian/tmp/pkg/openoffice.org-l10n-$$iso \
- $(PKGDIR)-l10n-$$pkgiso || exit 1; \
+ if [ -d debian/tmp/pkg/openoffice.org-l10n-$$iso ]; then \
+ rm -rf $(PKGDIR)-l10n-$$pkgiso $(PKGDIR)-l10n-$$pkgiso.*.debhelper;
\
+ cp -r --preserve=mode debian/tmp/pkg/openoffice.org-l10n-$$iso \
+ $(PKGDIR)-l10n-$$pkgiso || exit 1; \
+ fi; \
done
# remove empty uno_packages dirs somehow in the langpacks(?)
@@ -2459,9 +2463,11 @@
>
debian/broffice.org/$(OOBRANDDIR)/share/registry/data/org/openoffice/Setup.xcu
for iso in $(LANGPACKISOS); do \
if [ "$$iso" = "en-US" ]; then p=common; else p=l10n-`echo
$$iso | tr A-Z a-z`; fi; \
- cat $(PKGDIR)-$$p/$(OOBRANDDIR)/program/resource/ooo$$iso.res \
- | sed -e "s/OpenO/BrO/" \
- >
debian/broffice.org/$(OOBRANDDIR)/program/resource/ooo$$iso.res; \
+ if [ -f
$(PKGDIR)-$$p/$(OOBRANDDIR)/program/resource/ooo$$iso.res ]; then \
+ cat
$(PKGDIR)-$$p/$(OOBRANDDIR)/program/resource/ooo$$iso.res \
+ | sed -e "s/OpenO/BrO/" \
+ >
debian/broffice.org/$(OOBRANDDIR)/program/resource/ooo$$iso.res; \
+ fi; \
done
for i in writer calc draw impress math base; do \
cat $(PKGDIR)-$$i/usr/share/applications/ooo-$$i.desktop \
@@ -2891,7 +2897,7 @@
touch $@
binary-arch: $(STAMP_DIR)/binary-arch
-$(STAMP_DIR)/binary-arch: $(STAMP_DIR)/install-arch debian/control
$(STAMP_DIR)/maintscripts $(STAMP_DIR)/binary-indep
+$(STAMP_DIR)/binary-arch: $(STAMP_DIR)/install-arch debian/control
$(STAMP_DIR)/maintscripts
dh_testdir
dh_testroot
