./packages/openofficeorg/3.2/experimental r1686: move images*.zip to /usr/share; merge
------------------------------------------------------------
revno: 1686 [merge]
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Fri 2009-10-30 19:47:33 +0100
message:
move images*.zip to /usr/share; merge
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-10-30 09:01:02 +0000
+++ b/changelog 2009-10-30 18:47:33 +0000
@@ -15,7 +15,7 @@
- no duplicate shortcut in Insert Menu anymore (closes: #550510)
* ooo-build:
- - update (812388f3e353454f4c61b31e127bd8b9124d1763)
+ - update (a6b7deb5f8ae4ecdb217c1e94a5baa38a5f6324f)
* debian/rules:
- revert back to internal redland libs because odfmetadata2 now is in.
@@ -34,7 +34,7 @@
- for now, only build with en-US
- work around the fact that this is a beta version but has no beta splash
but we're supposed to use the "Developer Snapshot" splash
- - move help into /usr/share (see #218067)
+ - move help and images*.zip into /usr/share (see #218067)
* debian/control.mediawiki.in:
- we don't need a strict depends on lucene anymore, remove it again.
Bump dependencies to >= 1:3.0.0~ matching description.xml
@@ -47,7 +47,7 @@
- remove hardcoded libldap2-dev builddep and add ENABLE_LDAP conditional.
Only suggest it because it's now dlopen()'ed anyway.
- -- Rene Engelhard <rene@debian.org> Fri, 30 Oct 2009 09:57:37 +0100
+ -- Rene Engelhard <rene@debian.org> Fri, 30 Oct 2009 19:33:22 +0100
openoffice.org (1:3.1.1-6) UNRELEASED; urgency=low
@@ -74,6 +74,8 @@
- add conflict against (<< <minor version of lucene OOo was built with)
for -help-en-us as newer versions necessarily don't create indexes a old
version can read...
+ - actually add lucene-depends to -wiki-publishers dh_gencontrol call
+ (closes: #553370)
* debian/control.in:
- conflict against libhsqldb-java (>= 1.8.1~)
@@ -81,7 +83,7 @@
* debian/po:
- update ru.po, tr.po
- -- Rene Engelhard <rene@debian.org> Thu, 29 Oct 2009 20:47:58 +0100
+ -- Rene Engelhard <rene@debian.org> Fri, 30 Oct 2009 12:48:32 +0100
openoffice.org (1:3.1.1-5) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2009-10-24 20:56:58 +0000
+++ b/rules 2009-10-30 18:47:33 +0000
@@ -3054,9 +3054,9 @@
z=images_$$i.zip; p=$$i; \
case "$$i" in $(DEFAULT_IMAGE)) z=images.zip; esac; \
case "$$i" in classic) p=andromeda; esac; \
- mkdir -p $(PKGDIR)-style-$$p/$(OODIR)/share/config; \
+ mkdir -p $(PKGDIR)-style-$$p/$(shell echo $(OODIR) | sed -e s/lib/share/)/share/config; \
mv $(PKGDIR)-common/$(OODIR)/share/config/$$z \
- $(PKGDIR)-style-$$p/$(OODIR)/share/config/; \
+ $(PKGDIR)-style-$$p/$(shell echo $(OODIR) | sed -e s/lib/share/)/share/config/; \
done
rm -rf $(PKGDIR)-dtd-officedocument1.0
@@ -3167,6 +3167,15 @@
sed -i 's,$$(instpath)/help,/$(shell echo $(OODIR) | sed -e s/lib/share/)/help,' \
$(PKGDIR)-common/$(OOBASISDIR)/share/registry/data/org/openoffice/Office/Paths.xcu
+ # compat dirs, the split icons thing need it
+ mkdir -p $(PKGDIR)-common/$(shell echo $(OOBRANDDIR) | sed -e s/lib/share/)/program
+ mkdir -p $(PKGDIR)-common/$(shell echo $(OODIR) | sed -e s/lib/share/)/program
+ # three-layer symlinks also for /usr/share
+ ln -s basis$(OOVER) \
+ $(PKGDIR)-common/$(shell echo $(OOBRANDDIR) | sed -e s/lib/share/)/basis-link
+ ln -s /usr/lib/ure \
+ $(PKGDIR)-common/$(shell echo $(OODIR) | sed -e s/lib/share/)/ure-link
+
touch $@
binary-arch: $(STAMP_DIR)/binary-arch
@@ -3498,6 +3507,7 @@
ifeq "$(ENABLE_MEDIAWIKI)" "y"
dh_gencontrol -popenoffice.org$(VER)-wiki-publisher -- \
-V'mediawiki-jar-depends=$(MEDIAWIKI_JAR_DEPENDS)' \
+ -V'lucene-depends=$(LUCENE_DEPENDS)' \
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
-v$(shell grep "<version" $(SOURCE_TREE)/swext/mediawiki/src/description.xml | perl -pi -e 's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
endif
Reply to: