[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_4.0.3-3-33-g25d37d0
The following commit has been merged in the master branch:
commit dd9b16980b17004c9351da1d48d863891475ec26
Author: Rene Engelhard <rene@rene-engelhard.de>
Date: Tue Jun 18 19:10:34 2013 +0200
enable binutils (>= 2.23) build-dep on mips(el) now thatit's in unstable
diff --git a/changelog b/changelog
index 59e6997..a604205 100644
--- a/changelog
+++ b/changelog
@@ -10,6 +10,8 @@ libreoffice (1:4.0.4-1) UNRELEASED; urgency=low
- enable graphite2 on all archs now that it's fixed on armel/sparc
- use OpenJDK 7 on everything - except on mips* (stay with 6) and
kfreebsd-* (stay with gcj)
+ - enable binutils (>= 2.23) build-dep on mips(el) now that it's in
+ unstable
* debian/control:
- regenerate; uses libservlet3.0-java instead of libservlet2.5-java now
- fix -dbg suggests: s/python/$(PYTHON)/. to suggest python3.3-dbg
diff --git a/control b/control
index cf4654f..8bfecef 100644
--- a/control
+++ b/control
@@ -8,6 +8,7 @@ Build-Depends: ant (>= 1.7.0),
autoconf,
automake,
bc,
+ binutils (>= 2.23) [mips mipsel],
bison,
bzip2,
cpp-4.7,
@@ -4448,6 +4449,7 @@ Depends: ant (>= 1.7.0),
autoconf,
automake,
bc,
+ binutils,
bison,
bsh (>= 2.0b4),
bzip2,
diff --git a/patches/series b/patches/series
index 91920a9..dbb000c 100644
--- a/patches/series
+++ b/patches/series
@@ -29,6 +29,5 @@ dont-touch-urd.diff
system-psql-no-krb5-gssapi-check.diff
wheezy-backports-python.diff
fix-internal-hsqldb-build.diff
-uno-executables-link-to-xmlreader.diff
fix-kk-in-lo-xlate-lang.diff
fdo-65882-fix-sw-unoapi-on-exit.diff
diff --git a/patches/uno-executables-link-to-xmlreader.diff b/patches/uno-executables-link-to-xmlreader.diff
deleted file mode 100644
index 078504b..0000000
--- a/patches/uno-executables-link-to-xmlreader.diff
+++ /dev/null
@@ -1,69 +0,0 @@
-17:51 < aurel32> _rene_: for libreoffice on mips, either you need an old
- gcc-4.7 (e.g. the one from wheezy), or a binutils matching the
- changes from gcc-4.7 (e.g the one from experimental)
-17:51 < aurel32> well s/gcc-4.7/gcc-4.6/
-17:53 < _rene_> well, I have a workaround now (which is building), so...
-17:53 < _rene_> but thanks for the info
-17:53 < _rene_> aurel32: I do exactly as gcc says and link with that lib. seems
- to work
-17:53 < _rene_> aurel32: (that's what the LO build on gabrielli currently does)
-17:54 < aurel32> at some point we'll need a binutils upload to fix that properly
-[...]
-18:00 < _rene_> aurel32: ok, to summarize: both gcc-4.6 and -4.7 sid don't
- "work". only with experimentals binfilter?
-18:01 < _rene_> aurel32: /me could then remove the patch and add a appropriate
- build-dep when the new binutils is in sid..
-18:03 * _rene_ can try with that build-dep with LO 4.1 beta1 (to be released
- and maybe uploaded next week) in experimental :)
-18:08 -!- zwenna [~user@p4FC60FB4.dip0.t-ipconnect.de] has joined
- #debian-release
-18:08 < aurel32> _rene_: as far as i know yes, gcc-4.6 and -4.7 from sid (and
- soon from testing) need the experimental binutils
-18:09 < aurel32> _rene_:
- http://www.sourceware.org/ml/binutils/2012-08/msg00064.html
-18:10 < _rene_> ok. /me will add a comment to the patch and adapt the changelog
- then.
-
-diff -urN cpputools.old/Executable_regcomp.mk cpputools/Executable_regcomp.mk
---- a/cpputools.old/Executable_regcomp.mk 2013-04-30 14:54:23.000000000 +0200
-+++ b/cpputools/Executable_regcomp.mk 2013-05-17 21:41:13.665548985 +0200
-@@ -34,6 +34,7 @@
- cppu \
- cppuhelper \
- sal \
-+ xmlreader \
- $(gb_UWINAPI) \
- ))
-
-diff -urN cpputools.old/Executable_regsingleton.mk cpputools/Executable_regsingleton.mk
---- a/cpputools.old/Executable_regsingleton.mk 2013-04-30 14:54:23.000000000 +0200
-+++ b/cpputools/Executable_regsingleton.mk 2013-05-17 21:41:22.977549255 +0200
-@@ -34,6 +34,7 @@
- cppu \
- cppuhelper \
- sal \
-+ xmlreader \
- $(gb_UWINAPI) \
- ))
-
-diff -urN cpputools.old/Executable_sp2bv.mk cpputools/Executable_sp2bv.mk
---- a/cpputools.old/Executable_sp2bv.mk 2013-04-30 14:54:23.000000000 +0200
-+++ b/cpputools/Executable_sp2bv.mk 2013-05-17 21:41:33.373549555 +0200
-@@ -34,6 +34,7 @@
- cppu \
- cppuhelper \
- sal \
-+ xmlreader \
- ))
-
- $(eval $(call gb_Executable_add_exception_objects,sp2bv,\
---- a/unodevtools.old/Executable_skeletonmaker.mk 2013-05-18 11:31:49.705153823 +0200
-+++ b/unodevtools/Executable_skeletonmaker.mk 2013-05-18 11:33:07.993156082 +0200
-@@ -41,6 +41,7 @@
- salhelper \
- cppu \
- cppuhelper \
-+ xmlreader \
- ))
-
- $(eval $(call gb_Executable_use_static_libraries,uno-skeletonmaker,\
diff --git a/rules b/rules
index 55c807e..90de4d6 100755
--- a/rules
+++ b/rules
@@ -518,13 +518,11 @@ OOO_NSPLUGIN_ARCHS=
endif
$(eval $(call gen_no_archs,OOO_NSPLUGIN_ARCHS))
-# see uno-executables-link-to-xmlreader.diff. That workaround is not needed
-# with said binutils. Thanks Aurelien Jarno for the hint.
-#ifneq "$(WHEEZY_BACKPORT)" "y"
-# ifneq (,$(findstring mips, $(OOO_ARCHS)))
-#BUILD_DEPS += , binutils (>= 2.23) [mips mipsel]
-# endif
-#endif
+ifneq "$(WHEEZY_BACKPORT)" "y"
+ ifneq (,$(findstring mips, $(OOO_ARCHS)))
+BUILD_DEPS += , binutils (>= 2.23) [mips mipsel]
+ endif
+endif
#############
# Distro-specific overrides
--
LibreOffice packaging repository
Reply to: