[libreoffice] 01/01: don't add libreoffice-avmedia-backend-opengl to control when not built (--disable-gltf)
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit aa74e563bba918ca29f596d1a68fc3b388a8b368
Author: Rene Engelhard <rene@debian.org>
Date: Fri Aug 8 07:43:26 2014 +0200
don't add libreoffice-avmedia-backend-opengl to control when not built (--disable-gltf)
---
changelog | 8 ++++++++
control | 12 ------------
control.gltf.in | 11 +++++++++++
control.in | 12 ------------
rules | 3 +++
5 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/changelog b/changelog
index 3d5d2ca..84f09fb 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+libreoffice (1:4.3.0-3) unstable; urgency=low
+
+ * debian/control.in: remove libreoffice-avmedia-backend-opengl here ...
+ * debian/control.gltf.in: ... add here ...
+ * debian/rules: ... and add it only to control when we ENABLE_GLTF=y
+
+ -- Rene Engelhard <rene@debian.org> Fri, 08 Aug 2014 03:05:32 +0200
+
libreoffice (1:4.3.0-2) unstable; urgency=low
* upload to unstable
diff --git a/control b/control
index b40c2bb..eff0688 100644
--- a/control
+++ b/control
@@ -903,18 +903,6 @@ Description: VLC backend for LibreOffice
This package contains a VLC backend for LibreOffices avmedia component
to play audio/video.
-Package: libreoffice-avmedia-backend-opengl
-Section: misc
-Priority: optional
-Architecture: alpha amd64 armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc powerpcspe ppc64 s390 s390x sparc
-Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
-Replaces: libreoffice-core (<< 1:4.2~)
-Description: OpenGL support for avmedia
- LibreOffice is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains some OpenGL support for avmedia. FIXME: more precise.
-
Package: libreoffice-sdbc-firebird
Depends: libreoffice-core, ${shlibs:Depends}
Architecture: alpha amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mipsel
diff --git a/control.gltf.in b/control.gltf.in
new file mode 100644
index 0000000..8e32cb2
--- /dev/null
+++ b/control.gltf.in
@@ -0,0 +1,11 @@
+Package: libreoffice-avmedia-backend-opengl
+Section: misc
+Priority: optional
+Architecture: %OOO_OGLTRANS_ARCHS%
+Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
+Replaces: libreoffice-core (<< 1:4.2~)
+Description: OpenGL support for avmedia
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains some OpenGL support for avmedia. FIXME: more precise.
diff --git a/control.in b/control.in
index 23f1f1a..c420b0c 100644
--- a/control.in
+++ b/control.in
@@ -738,18 +738,6 @@ Description: VLC backend for LibreOffice
This package contains a VLC backend for LibreOffices avmedia component
to play audio/video.
-Package: libreoffice-avmedia-backend-opengl
-Section: misc
-Priority: optional
-Architecture: %OOO_OGLTRANS_ARCHS%
-Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
-Replaces: libreoffice-core (<< 1:4.2~)
-Description: OpenGL support for avmedia
- LibreOffice is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains some OpenGL support for avmedia. FIXME: more precise.
-
Package: libreoffice-sdbc-firebird
Depends: libreoffice-core, ${shlibs:Depends}
Architecture: %OOO_LE_ARCHS%
diff --git a/rules b/rules
index b7b94f5..9231db4 100755
--- a/rules
+++ b/rules
@@ -1826,6 +1826,9 @@ endif
ifeq "$(PACKAGE_LIBRELOGO)" "y"
cat debian/control.librelogo.in >> debian/control
endif
+ifeq "$(ENABLE_GLTF)" "y"
+ cat debian/control.gltf.in >> debian/control
+endif
perl -pi -e "s,%OOO_ARCHS%,$(OOO_ARCHS),g" debian/control
perl -pi -e "s,%OOO_BE_ARCHS%,$(OOO_BE_ARCHS),g" debian/control
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: