------------------------------------------------------------
revno: 1155
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Fri 2008-07-11 17:01:41 +0200
message:
fix install for binary-only/en-US only builds; remove
binary-arch->binary-indep dependency again
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-07-09 01:29:34 +0000
+++ b/changelog 2008-07-11 15:01:41 +0000
@@ -1,3 +1,15 @@
+openoffice.org (1:2.4.1-5.6pre) unstable; urgency=low
+
+ * 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 16:20:45 +0200
+
openoffice.org (1:2.4.1-5) unstable; urgency=medium
* ooo-build:
=== modified file 'rules'
--- a/rules 2008-07-08 19:18:32 +0000
+++ b/rules 2008-07-11 15:01:41 +0000
@@ -197,7 +197,7 @@
ifeq "$(DIST)" "Debian"
# we don't need to build all languages and the thesaurus on the buildds;
# they do binary-only builds anyway
- ifeq (buildd,$(shell whoami))
+ ifeq (rene,$(shell whoami))
BUILD_ONLY_EN_US=y
endif
endif
@@ -1651,9 +1651,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 \
@@ -1678,9 +1680,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(?)
@@ -2315,9 +2319,11 @@
>
debian/broffice.org/$(OODIR)/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/$(OODIR)/program/resource/ooo$(SRCNUM)$$iso.res \
- | sed -e "s/OpenO/BrO/" \
- >
debian/broffice.org/$(OODIR)/program/resource/ooo$(SRCNUM)$$iso.res; \
+ if [ -f
$(PKGDIR)-$$p/$(OODIR)/program/resource/ooo$(SRCNUM)$$iso.res ]; then \
+ cat
$(PKGDIR)-$$p/$(OODIR)/program/resource/ooo$(SRCNUM)$$iso.res \
+ | sed -e "s/OpenO/BrO/" \
+ >
debian/broffice.org/$(OODIR)/program/resource/ooo$(SRCNUM)$$iso.res; \
+ fi; \
done
for i in writer calc draw impress math base; do \
cat $(PKGDIR)-$$i/usr/share/applications/ooo-$$i.desktop \
@@ -2756,7 +2762,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
