------------------------------------------------------------
revno: 1354
committer: Rene Engelhard <[email protected]>
branch nick: experimental
timestamp: Thu 2008-12-18 02:27:25 +0100
message:
hardcode --without-writer2latex
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-12-16 10:14:49 +0000
+++ b/changelog 2008-12-18 01:27:25 +0000
@@ -14,6 +14,8 @@
we have OOos patches included
- update xulrunner build-dep in MOZILLA=libxul case for current reality
- various 3.1-related updates
+ - remove option for internal writer2latex as it's now a (bundled) extension
+ upstream too and we have it packaged already. Hardoce
--without-writer2latex
* debian/rules, debian/startcenter.desktop: remove own startcenter.desktop;
OOo now has one upstream
=== modified file 'rules'
--- a/rules 2008-12-17 19:59:36 +0000
+++ b/rules 2008-12-18 01:27:25 +0000
@@ -185,8 +185,6 @@
ENABLE_REPORTDESIGN=n
ENABLE_MEDIAWIKI=n
endif
-PACKAGE_WRITER2LATEX=n
-USE_EXTERNAL_WRITER2LATEX=y
ENABLE_MINIMIZER=y
ENABLE_PRESENTER_CONSOLE=y
ENABLE_PDFIMPORT=y
@@ -468,12 +466,7 @@
endif
ifeq "$(ENABLE_JAVA)" "y"
- ifeq "$(PACKAGE_WRITER2LATEX)" "n"
- CONFIGURE_FLAGS += --without-writer2latex
- ifeq "$(USE_EXTERNAL_WRITER2LATEX)" "y"
WRITER_W2L_DEP = openoffice.org-writer2latex
- endif
- endif
endif
ifeq "$(RUN_SMOKETEST)" "y"
@@ -1874,11 +1867,6 @@
cp -a \
debian/tmp/pkg/openoffice.org-base/usr/share/java/$(OODIRNAME)/*.jar \
debian/tmp/native-jars/
-ifeq "$(PACKAGE_WRITER2LATEX)" "y"
- cp -a \
- debian/tmp/pkg/openoffice.org-writer/$(OODIR)/program/classes/*.jar
\
- debian/tmp/native-jars
-endif
: # remove problematic ones
rm -f debian/tmp/native-jars/ridl.jar
: # compile the others
@@ -2401,17 +2389,6 @@
mv
$(PKGDIR)-draw/$(OODIR)/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_impressgraphics_filters.xcu
\
$(PKGDIR)-impress/$(OODIR)/share/registry/modules/org/openoffice/TypeDetection/Filter
-ifeq "$(ENABLE_JAVA)" "y"
- ifeq "$(PACKAGE_WRITER2LATEX)" "y"
- # move writer2latex.jar into the right dir
- mkdir -p $(PKGDIR)-writer/usr/share/java/$(OODIRNAME)
- mv $(PKGDIR)-writer/$(OODIR)/program/classes/writer2latex.jar \
- $(PKGDIR)-writer/usr/share/java/$(OODIRNAME) && \
- ln -s /usr/share/java/$(OODIRNAME)/writer2latex.jar \
- $(PKGDIR)-writer/$(OODIR)/program/classes/writer2latex.jar
- endif
-endif
-
# remove empty resource directories
for i in draw base writer impress calc math; do \
rm -rf $(PKGDIR)-$$i/$(OODIR)/program/resource; \
