------------------------------------------------------------
revno: 1055
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: unstable
timestamp: Wed 2008-04-09 21:34:31 +0200
message:
fix mozilla/ogltrans conditionals, the new java-gcj-compat-dev is now in sid;
adapt description
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-04-07 13:42:31 +0000
+++ b/changelog 2008-04-09 19:34:31 +0000
@@ -10,11 +10,12 @@
displaying in hebrew docs
- src: update GSIs from ftp.linux.cz: bg da et fi ga mk nb nn
* debian/rules:
- - handle new aotcompile.py location to prevent FTBFS when
- java-gcj-compat-dev gets rebuilt with a python-central >= 0.6.
- Thanks Chris Cheney for the warning.
+ - handle new aotcompile.py location in java-gcj-compat due to
+ python-central >= 0.6
- bump libstlport4.6-dev builddep to ensure building against
libstlport4.6ldbl
+ - set MOZILLA= when arch not in OOO_MOZILLA_ARCHS
+ - fix OOO_OGLTRANS_ARCHS conditional
* merge from Ubuntu:
- debian/*.mime:
+ Update and sort mime-types.
=== modified file 'rules'
--- a/rules 2008-04-06 23:04:53 +0000
+++ b/rules 2008-04-09 19:34:31 +0000
@@ -249,7 +249,7 @@
OOO_OGLTRANS_ARCHS+= ia64
endif
ifeq (,$(findstring $(ARCH),$(OOO_OGLTRANS_ARCHS)))
- ENABLE_OGLTRANS=n
+ ENABLE_OPENGL=n
endif
OOO_ARCHS= i386 powerpc sparc mips mipsel armel s390
@@ -343,6 +343,9 @@
ifeq "$(BUILD_IA64)" "y"
OOO_MOZILLA_ARCHS += ia64
endif
+ifeq (,$(findstring $(ARCH),$(OOO_MOZILLA_ARCHS)))
+ MOZILLA=
+endif
# We only build the main openoffice.org packages on those architectures where
it works
# all other architectures build libmythes-dev
