[libreoffice] 05/06: keep -ogltrans package...
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-4.4
in repository libreoffice.
commit bc0f5554b47642090b502fe813ebd0cb0b584f35
Author: Rene Engelhard <rene@debian.org>
Date: Thu Nov 20 20:12:43 2014 +0100
keep -ogltrans package...
---
changelog | 3 ++-
control | 2 +-
control.ogltrans.in | 2 +-
rules | 3 ---
4 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/changelog b/changelog
index 486875d..a8eb4b3 100644
--- a/changelog
+++ b/changelog
@@ -4,7 +4,8 @@ libreoffice (1:4.4.0~beta1-1) experimental; urgency=medium
- fixes postgresql-sdbc-impl install (closes: #769156)
* debian/rules:
- - remove --disable-opengl as it's gone upstream....
+ - remove --disable-opengl as it's gone upstream; keep OGLTrans.so in
+ -ogltrans
-- Rene Engelhard <rene@debian.org> Thu, 20 Nov 2014 19:39:55 +0100
diff --git a/control b/control
index 204ccb2..06183fa 100644
--- a/control
+++ b/control
@@ -4088,7 +4088,7 @@ Description: LibreOffice UNO runtime environment
Package: libreoffice-ogltrans
Section: graphics
Priority: extra
-Architecture: alpha amd64 arm64 armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
+Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
Depends: libreoffice-common,
libreoffice-core,
libreoffice-impress,
diff --git a/control.ogltrans.in b/control.ogltrans.in
index a9396d1..6036cd3 100644
--- a/control.ogltrans.in
+++ b/control.ogltrans.in
@@ -1,7 +1,7 @@
Package: libreoffice-ogltrans
Section: graphics
Priority: extra
-Architecture: %OOO_OGLTRANS_ARCHS%
+Architecture: %OOO_ARCHS%
Depends: libreoffice-common,
libreoffice-core,
libreoffice-impress,
diff --git a/rules b/rules
index 27da729..b9d5e77 100755
--- a/rules
+++ b/rules
@@ -1650,9 +1650,7 @@ ifeq "$(ENABLE_JAVA)" "y"
endif
endif
endif
-ifneq "$(OOO_OGLTRANS_ARCHS)" ""
cat debian/control.ogltrans.in >> debian/control
-endif
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(ENABLE_MEDIAWIKI)" "y"
cat debian/control.mediawiki.in >> debian/control
@@ -1701,7 +1699,6 @@ endif
perl -pi -e "s,%OOO_NO_BASE_ARCHS%,$(OOO_NO_BASE_ARCHS),"g debian/control
perl -pi -e "s,%OOO_JAVA_ARCHS%,$(OOO_JAVA_ARCHS),g" debian/control
perl -pi -e "s,%OOO_GCJ_ARCHS%,$(OOO_GCJ_ARCHS),g" debian/control
- perl -pi -e "s,%OOO_OGLTRANS_ARCHS%,$(OOO_OGLTRANS_ARCHS),g" debian/control
perl -pi -e "s,%OOO_GCJ_JDK_ARCHS%,$(OOO_GCJ_JDK_ARCHS),g" debian/control
perl -pi -e "s,%OOO_ARCH_DEP_EXTENSIONS_ARCHS%,$(OOO_ARCH_DEP_EXTENSIONS_ARCHS),g" debian/control
perl -pi -e "s,%OOO_REPORTDESIGN_ARCHS%,$(OOO_REPORTDESIGN_ARCHS),g" debian/control
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: