./packages/openofficeorg/3.0/experimental r1224: some cleanup
------------------------------------------------------------
revno: 1224
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sat 2008-08-16 03:36:27 -0300
message:
some cleanup
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-08-16 06:06:13 +0000
+++ b/changelog 2008-08-16 06:36:27 +0000
@@ -23,6 +23,7 @@
- don't run ldconfig in ure package, thanks lintian
- add Replaces: for above help fix, ended up in -common in beta2-1
- update get-orig-source
+ - adapt for new source split
- remove xalan/xerces conditionals, add saxon ones
- build with OpenJDK
- add conditional to decide whether to build with Suns Solver or Koheis
@@ -33,19 +34,21 @@
liblucene2-java/openoffice.org-java-common. We don't depend on it as we
don't want to make the help depend on Java (lucene is needed for "search"
now)
- * debian/rules: adapt for new source split
* debian/rules, debian/control.etch_lenny_transitional.diff: remove
etch->lenny transitional package
* debian/rules, debian/scripts/vars.m68k: yes, we do have a m68k port now...
* debian/rules, debian/control.in:
- -style-andromeda is back (contains the "Classic" theme)
- split kab support into -kab to not make -kde depend on kdepimlibs5
- * debian/rules, debian/control.mono.in: update for cli_types.dll split due
- to the three layer OOo; Section: libs to fix override disparity. Install
- more (upstream-generated) .config and policy* files. Don't make ure
- contain/depend on cli*dll as that would make all OOo packages depend on
- mono and people might not need it. Make cli-uno-bridge conflict against
- the old libuno-cli-types1.1-cil
+ * debian/rules, debian/control.mono.in:
+ - update for cli_types.dll split due to the three layer OOo and other
+ restructuring inside OOo. Don't make ure contain/depend on cli*dll as
+ that would make all OOo packages depend on mono and people might not
+ want/need it
+ - Section: libs to fix override disparity.
+ - Install more (upstream-generated) .config and policy* files for the mono
+ bridge
+ - make cli-uno-bridge conflict against the old libuno-cli-types1.1-cil
* debian/control.in:
- Standards-Version: 3.8.0 (already following it)
- fix -andromedas Replaces:
=== modified file 'rules'
--- a/rules 2008-08-16 05:49:17 +0000
+++ b/rules 2008-08-16 06:36:27 +0000
@@ -183,6 +183,9 @@
endif
# y means Koheis solver
USE_SCSOLVER=n
+# "new" source split? This is to be n when to use
+# Suns tarballs.
+WITH_SPLIT=y
# when we have a package we want to have to be installed on older things with some older
# C++ ABI (like it was the case with openoffice.org2), we need to set this. Don't touch
@@ -211,9 +214,12 @@
--with-external-dict-dir=/usr/share/myspell/dicts \
--with-external-hyph-dir=/usr/share/myspell/dicts \
--with-external-thes-dir=/usr/share/myspell/dicts \
- --with-split \
--with-additional-sections="$(ADDITIONAL_SECTIONS)"
+ifneq "$(WITH_SPLIT)" "y"
+ CONFIGURE_FLAGS += --without-split
+endif
+
# distro-configs is too late; it already gets searched in unpack
# when we don't do that here, too.
CONFIGURE_FLAGS += --disable-access
Reply to: