[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.4_dfsg-4-48-g9b93c38
The following commit has been merged in the debian-experimental-3.5 branch:
commit 9b93c38c7c8b71ca8f43cdda96a43440e7c771be
Author: Rene Engelhard <rene@debian.org>
Date: Mon Nov 26 15:59:31 2012 +0100
mozilla-libreoffice -> browser-plugin-libreoffice
diff --git a/changelog b/changelog
index f2c86ac..591a645 100644
--- a/changelog
+++ b/changelog
@@ -20,6 +20,8 @@ libreoffice (1:3.5.7-1) UNRELEASED; urgency=low
- remove obsolete sharutils, po-debconf and wget | curl build-deps
- recommend fonts-liberation instead of ttf-liberation
(closes: #691949)
+ * debian/control.mozilla.in, debian/rules: rename
+ mozilla-libreoffice -> browser-plugin-libreoffice
* debian/libreoffice-core.bug-control:
- report-with: fonts-opensymbol instead of transitional ttf-opensymbol
* debian/libreoffice-{core,gtk3}.bug-script.in:
diff --git a/control.mozilla.in b/control.mozilla.in
index 67fe6e3..765c71d 100644
--- a/control.mozilla.in
+++ b/control.mozilla.in
@@ -1,4 +1,4 @@
-Package: mozilla-libreofficeVER
+Package: browser-plugin-libreofficeVER
Section: net
Architecture: %OOO_NSPLUGIN_ARCHS%
Enhances: iceape-browser,
@@ -17,6 +17,9 @@ Recommends: iceweasel | firefox | iceape-browser | konqueror-nsplugins,
libreoffice-impress,
libreoffice-math,
libreoffice-base
+Conflicts: mozilla-libreoffice
+Replaces: mozilla-libreoffice
+Provides: mozilla-libreoffice
Xb-Npp-Applications: ec8030f7-c20a-464f-9b0e-13a3a9e97384, 92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a
Xb-Npp-Name: LibreOffice Plug-in
Xb-Npp-MimeType: application/vnd.stardivision.calc, application/vnd.stardivision.chart, application/vnd.stardivision.draw, application/vnd.stardivision.impress, application/vnd.stardivision.impress-packed, application/vnd.stardivision.math, application/vnd.stardivision.writer, application/vnd.stardivision.writer-global, application/vnd.staroffice.writer, application/vnd.sun.xml.calc, application/vnd.sun.xml.calc.template, application/vnd.sun.xml.draw, application/vnd.sun.xml.draw.template, application/vnd.sun.xml.impress, application/vnd.sun.xml.impress.template, application/vnd.sun.xml.math, application/vnd.sun.xml.writer, application/vnd.sun.xml.writer.global, application/vnd.sun.xml.writer.template, application/vnd.oasis.opendocument.text, application/vnd.oasis.opendocument.text-template, application/vnd.oasis.opendocument.text-master, application/vnd.oasis.opendocument.text-web, application/vnd.oasis.opendocument.spreadsheet, application/vnd.oasis.opendocument.spreadshee
t-template, application/vnd.oasis.opendocument.graphics, application/vnd.oasis.opendocument.graphics-template, application/vnd.oasis.opendocument.presentation, application/vnd.oasis.opendocument.presentation-template, application/vnd.oasis.opendocument.formula
diff --git a/rules b/rules
index 2189870..64bf7dc 100755
--- a/rules
+++ b/rules
@@ -2098,11 +2098,11 @@ ifeq "$(ENABLE_EVO2)" "y"
endif
ifeq "$(PACKAGE_NSPLUGIN)" "y"
- mkdir -p -m755 debian/mozilla-libreoffice$(VER)/$(OODIR)/program
+ mkdir -p -m755 debian/browser-plugin-libreoffice$(VER)/$(OODIR)/program
for f in libnpsoplugin.so nsplugin; do \
- mv $(PKGDIR)-core/$(OODIR)/program/$$f debian/mozilla-libreoffice$(VER)/$(OODIR)/program; \
+ mv $(PKGDIR)-core/$(OODIR)/program/$$f debian/browser-plugin-libreoffice$(VER)/$(OODIR)/program; \
done
- cd debian/mozilla-libreoffice$(VER) && \
+ cd debian/browser-plugin-libreoffice$(VER) && \
mkdir -p usr/lib/mozilla/plugins && \
ln -sf /$(OODIR)/program/libnpsoplugin.so \
usr/lib/mozilla/plugins/libnpsoplugin.so
--
LibreOffice packaging repository
Reply to: