[SCM] LibreOffice packaging repository branch, debian-experimental-4.2, updated. libreoffice_4.1.0-2-45-g19d5a57
The following commit has been merged in the debian-experimental-4.2 branch:
commit 7b24378200ac63bf4d0d8aacf3a6a49451ffe9cb
Author: Rene Engelhard <rene@debian.org>
Date: Mon Jul 29 18:14:07 2013 +0200
(blind) split of avmediagst and avmediavlc into repsective packages
diff --git a/changelog b/changelog
index 93dcea1..8f288f4 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.2.0~alpha0~git20130726-1) UNRELEASED; urgency=low
+libreoffice (1:4.2.0~alpha0~git20130729-1) UNRELEASED; urgency=low
* new upstream snapshot
@@ -10,6 +10,10 @@ libreoffice (1:4.2.0~alpha0~git20130726-1) UNRELEASED; urgency=low
sc_macros_tests VBA tests need Arial etc.-similar fonts
- add conditionals for new libs used: opencl, firebird, avahi-client,
vlc
+ * debian/control.in:
+ - split avmediagst.so into new -avmedia-backend-gstreamer and put new vlc
+ backend into a new -avmedia-backend-vcl. Recommend
+ -gstreamer | -avmedia and make metapackage depend on that, too
-- Rene Engelhard <rene@debian.org> Sun, 02 Jun 2013 20:49:18 +0200
diff --git a/control b/control
index b728ba7..7641375 100644
--- a/control
+++ b/control
@@ -175,7 +175,7 @@ XS-Python3-Version: 3.3
XS-Testsuite: autopkgtest
Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git
-Bugs:
+Bugs: mailto:debian-openoffice@lists.debian.org
Homepage: http://www.libreoffice.org
Package: libreoffice
@@ -190,6 +190,7 @@ Depends: fonts-sil-gentium-basic,
libreoffice-math,
libreoffice-report-builder-bin [!hppa !kfreebsd-amd64 !kfreebsd-i386],
libreoffice-writer,
+ ${avmedia-be-depends},
${dejavu-depends},
${java-common-depends},
${misc:Depends},
@@ -503,6 +504,7 @@ Depends: libreoffice-core (= ${binary:Version}),
libreoffice-draw (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
+Recommends: ${avmedia-be-depends}
Suggests: bluez
Description: office productivity suite -- presentation
LibreOffice is a full-featured office productivity suite that provides
@@ -857,6 +859,33 @@ Description: PDF Import component for LibreOffice
This package contains a component enabling LibreOffice to import PDF
Documents.
+Package: libreoffice-avmedia-backend-gstreamer
+Section: misc
+Priority: optional
+Architecture: amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc
+Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
+Replaces: libreoffice-core (<< 1:4.2~)
+Provides: libreoffice-avmedia-backend
+Description: GStreamer backend for LibreOffice
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains a GStreamer backend for LibreOffices avmedia component
+ to play audio/video.
+
+Package: libreoffice-avmedia-backend-vlc
+Section: misc
+Priority: optional
+Architecture: amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc
+Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
+Provides: libreoffice-avmedia-backend
+Description: VLC backend for LibreOffice
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains a VLC backend for LibreOffices avmedia component
+ to play audio/video.
+
Package: libreoffice-l10n-af
Section: localization
Architecture: all
diff --git a/control.in b/control.in
index 93de837..1306a31 100644
--- a/control.in
+++ b/control.in
@@ -46,6 +46,7 @@ Depends: fonts-sil-gentium-basic,
libreoffice-math,
libreoffice-report-builder-bin%OOO_NO_REPORTDESIGN_ARCHS%,
libreoffice-writer,
+ ${avmedia-be-depends},
${dejavu-depends},
${java-common-depends},
${misc:Depends},
@@ -358,6 +359,7 @@ Depends: libreoffice-core (= ${binary:Version}),
libreoffice-draw (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
+Recommends: ${avmedia-be-depends}
Description: office productivity suite -- presentation
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -711,3 +713,30 @@ Description: PDF Import component for LibreOffice
This package contains a component enabling LibreOffice to import PDF
Documents.
+Package: libreoffice-avmedia-backend-gstreamer
+Section: misc
+Priority: optional
+Architecture: %OOO_ARCHS%
+Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
+Replaces: libreoffice-core (<< 1:4.2~)
+Provides: libreoffice-avmedia-backend
+Description: GStreamer backend for LibreOffice
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains a GStreamer backend for LibreOffices avmedia component
+ to play audio/video.
+
+Package: libreoffice-avmedia-backend-vlc
+Section: misc
+Priority: optional
+Architecture: %OOO_ARCHS%
+Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
+Provides: libreoffice-avmedia-backend
+Description: VLC backend for LibreOffice
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains a VLC backend for LibreOffices avmedia component
+ to play audio/video.
+
diff --git a/rules b/rules
index 50511ca..67f3ec9 100755
--- a/rules
+++ b/rules
@@ -1270,13 +1270,22 @@ ifeq "$(USE_GSTREAMER)" "y"
BUILD_DEPS += , libgstreamer-plugins-base$(GSTREAMER_VERSION)-dev
GSTREAMER_PLUGINS_SUGGESTS += , gstreamer$(GSTREAMER_VERSION)-plugins-base, gstreamer$(GSTREAMER_VERSION)-plugins-good, gstreamer$(GSTREAMER_VERSION)-plugins-ugly, gstreamer$(GSTREAMER_VERSION)-plugins-bad, gstreamer$(GSTREAMER_VERSION)-ffmpeg
DBG_DBG_SUGGESTS+= , libgstreamer$(GSTREAMER_VERSION)-0-dbg
+ AVMEDIA_BE_DEPENDS += , libreoffice-avmedia-backend-gstreamer
else
CONFIGURE_FLAGS += --disable-gstreamer-0-10
+ DEBHELPER_OPTIONS += -Nlibreoffice-avmedia-backend-gstreamer
endif
ifeq "$(USE_VLC)" "y"
BUILD_DEPS += , libvlc-dev
CONFIGURE_FLAGS += --enable-vlc
+ ifeq "$(AVMEDIA_BE_DEPENDS)" ""
+ AVMEDIA_BE_DEPENDS += , libreoffice-avmedia-backend-vlc
+ else
+ AVMEDIA_BE_DEPENDS += | libreoffice-avmedia-backend-vlc
+ endif
+else
+ DEBHELPER_OPTIONS += -Nlibreoffice-avmedia-backend-vlc
endif
ifneq (,$(filter neon, $(SYSTEM_STUFF)))
@@ -2580,6 +2589,17 @@ ifeq (,$(filter lpsolve, $(SYSTEM_STUFF)))
$(PKGDIR)-core/$(OODIR)/program
endif
+ifeq "$(USE_GSTREAMER)" "y"
+ mkdir -p $(PKGDIR)-avmedia-backend-gstreamer/$(OODIR)/program
+ mv $(PKGDIR)-core/$(OODIR)/program/libavmediagst.so \
+ $(PKGDIR)-avmedia-backend-gstreamer/$(OODIR)/program
+endif
+ifeq "$(USE_VLC)" "y"
+ mkdir -p $(PKGDIR)-avmedia-backend-vlc/$(OODIR)/program
+ mv $(PKGDIR)-core/$(OODIR)/program/libavmediavlc.so \
+ $(PKGDIR)-avmedia-backend-vlc/$(OODIR)/program
+endif
+
for i in $(ARCH_DEP_PACKAGES); do \
if [ -e debian/$$i.bug-script.in ]; then \
cat debian/$$i.bug-script.in \
@@ -2619,7 +2639,7 @@ $(STAMP_DIR)/install-indep: $(STAMP_DIR)/build-indep $(STAMP_DIR)/install-common
dh_testdir
dh_testroot
-ifneq "$(USE_GSTREAMER)" "y"
+ifeq "$(shell echo $(USE_GSTREAMER)$(USE_VLC) | grep -q y && echo 0)" "0"
# sound doesn't work anyway, remove the .wav files to save space
rm -rf $(PKGDIR)-common/$(OODIR)/share/gallery/sounds
rm -f $(PKGDIR)-common/$(OODIR)/share/gallery/sg9.*
@@ -3112,6 +3132,7 @@ endif
-V'libebook-dep=$(shell debian/scripts/get_libebook_dep.sh)' \
-V'idlc-cpp-depends=$(IDLC_CPP_DEPENDS)' \
-V'pyuno-depends=$(PYUNO_DEPENDS)' \
+ -V'avmedia-be-depends=$(AVMEDIA_BE_DEPENDS)' \
-V'dejavu-depends=$(DEJAVU_DEPENDS)' \
-V'dbg-dbg-suggests=$(DBG_DBG_SUGGESTS)' \
-v$(BINARY_VERSION)
--
LibreOffice packaging repository
Reply to: