./packages/openofficeorg/3.0/experimental r1121: update for m19; reenable mozilla plugin
------------------------------------------------------------
revno: 1121
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2008-06-17 16:42:21 +0200
message:
update for m19; reenable mozilla plugin
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-06-15 18:41:02 +0000
+++ b/changelog 2008-06-17 14:42:21 +0000
@@ -1,13 +1,13 @@
-openoffice.org (1:3.0.0~dev300m14-0.1pre) experimental; urgency=low
+openoffice.org (1:3.0.0~dev300m19-0.1pre) experimental; urgency=low
- * OpenOffice 3.0.0 development milestone 14 (DEV300_m14)
+ * OpenOffice 3.0.0 development milestone 19 (DEV300_m19)
- Base now doesn't quit anymore on "recently used files" in the wizard
when those got deleted/moved (closes: #452810)
- now properly complains about missing permissions when trying to write
to a read-only location (closes: #238906)
- fixes printing of handouts in grayscale mode (closes: #416309)
* ooo-build:
- - update (r12887)
+ - update (r12914)
* 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.
@@ -25,8 +25,7 @@
- support default-jdk-builddep, begin support of openjdk-6-jdk for
building, still default to java-gcj-compat-dev
- move ure Java stuff to /usr/share/java (as before in -java-common)
- - temporarily disable SDK package (until jsc21) and mozilla plugin
- (until sb87)
+ - temporarily disable SDK package (until jsc21)
- update get-orig-source target for fixed hyph_en_US.dic
- add --enable-gio conditional
- start of KDE4 support
@@ -62,7 +61,7 @@
- s/cupsys/cups/
- remove xutils build-dep, nas was using xmkmf and it's long gone here
- -- Rene Engelhard <rene@debian.org> Fri, 13 Jun 2008 20:37:17 +0200
+ -- Rene Engelhard <rene@debian.org> Tue, 17 Jun 2008 16:39:10 +0200
openoffice.org (1:2.4.1-3) unstable; urgency=medium
=== modified file 'rules'
--- a/rules 2008-06-15 18:41:02 +0000
+++ b/rules 2008-06-17 14:42:21 +0000
@@ -91,7 +91,6 @@
USE_PYCENTRAL=y
PACKAGE_QA_TOOLS=y
PACKAGE_TTF_OPENSYMBOL=y
-PACKAGE_NPSOPLUGIN=n
PACKAGE_PCVSLIB=n
BUILD_JARS_NATIVE=y
BUILD_BINFILTERS=y
@@ -173,6 +172,9 @@
BUILD_GTK=n
ENABLE_GIO=y
ENABLE_RANDR=n
+ifeq "$(BUILD_GTK)" "y"
+ PACKAGE_NPSOPLUGIN=y
+endif
# 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
@@ -1925,14 +1927,18 @@
mv $(PKGDIR)-core/$(OODIR)/program/libevoab2.so $(PKGDIR)-evolution/$(OODIR)/program
ifeq "$(PACKAGE_NPSOPLUGIN)" "y"
+ # libnpsoplugins.so two times with different sizes? Oh my.
+ # Upstream has it this way, too, but..
mkdir -p -m755 debian/mozilla-openoffice.org/$(OODIR)/program
+ mkdir -p -m755 debian/mozilla-openoffice.org/$(OOBRANDDIR)/program
for f in libnpsoplugin.so nsplugin; do \
mv $(PKGDIR)-core/$(OODIR)/program/$$f debian/mozilla-openoffice.org/$(OODIR)/program; \
done
+ mv $(PKGDIR)-core/$(OODBRANDDIR)/program/libnpsoplugin.so f debian/mozilla-openoffice.org/$(OOBRANDDIR)/program
cd debian/mozilla-openoffice.org && \
for b in iceape iceweasel mozilla mozilla-firefox firefox; do \
mkdir -p usr/lib/$$b/plugins && \
- ln -sf /$(OODIR)/program/libnpsoplugin.so \
+ ln -sf /$(OOBRANDDIR)/program/libnpsoplugin.so \
usr/lib/$$b/plugins/libnpsoplugin.so; \
done
else
@@ -2675,6 +2681,11 @@
cat $(PKGDIR)-common/etc/$(OODIRNAME)/sofficerc \
| perl -p -e 's/(.*)=(.*)/$$1=\$${\$$FHS_CONFIG_FILE:Bootstrap:$$1}/' \
>> $(PKGDIR)-common/$(OOBRANDDIR)/program/sofficerc
+ # except for URE_BOOTSTRAP...
+ TMP=`mktemp -q`; \
+ grep -v URE_BOOTSTRAP $(PKGDIR)-common/$(OOBRANDDIR)/program/sofficerc > $$TMP && mv $$TMP $(PKGDIR)-common/$(OOBRANDDIR)/program/sofficerc && \
+ grep URE_BOOTSTRAP $(PKGDIR)-common/etc/$(OODIRNAME)/sofficerc >> $(PKGDIR)-common/$(OOBRANDDIR)/program/sofficerc && \
+ grep -v URE_BOOTSTRAP $(PKGDIR)-common/etc/$(OODIRNAME)/sofficerc > $$TMP && mv $$TMP $(PKGDIR)-common/etc/$(OODIRNAME)/sofficerc
install -m 644 debian/soffice.sh \
$(PKGDIR)-common/etc/$(OODIRNAME)/soffice.sh
@@ -2972,7 +2983,7 @@
ifeq "$(ENABLE_REPORTDESIGN)" "y"
dh_gencontrol -popenoffice.org$(VER)-report-builder -- \
-V'report-builder-jar-depends=$(REPORT_BUILDER_JAR_DEPENDS)' \
- -v`echo $(BINARY_VERSION) | cut -d: -f1`:$(shell grep "<version" $(SOURCE_TREE)/reportdesign/util/post.xml | perl -pi -e 's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
+ -v`echo $(BINARY_VERSION) | cut -d: -f1`:$(shell grep "<version" $(SOURCE_TREE)/reportdesign/util/description.xml | perl -pi -e 's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
endif
ifeq "$(ENABLE_PDFIMPORT)" "y"
dh_gencontrol -popenoffice.org$(VER)-pdfimport -- \
Reply to: