[libreoffice] 01/01: Merge remote-tracking branch 'origin/debian-experimental-4.3' into debian-experimental-4.4
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 f0e254bfbc2c44aad35f9f35b0a678099fa3e751
Merge: 1bbac04 d2ec7da
Author: Rene Engelhard <rene@debian.org>
Date: Sun Aug 10 21:23:20 2014 +0200
Merge remote-tracking branch 'origin/debian-experimental-4.3' into debian-experimental-4.4
Conflicts:
control
rules
changelog | 11 ++++++++++-
control | 12 ++++++------
control.gltf.in | 2 +-
control.ogltrans.in | 4 ++--
rules | 47 +++++++++++++++++++++++++++--------------------
5 files changed, 46 insertions(+), 30 deletions(-)
diff --cc control
index 364f2d8,e88c899..e803e69
--- a/control
+++ b/control
@@@ -11,8 -11,6 +11,7 @@@ Build-Depends: ant (>= 1.7.0)
binutils (>= 2.23) [mips mipsel],
bison,
bzip2,
+ coinor-libcoinmp-dev,
- cpp-4.7,
debhelper (>= 7.2.3~),
default-jdk,
default-jdk (>= 1:1.7-48) [ia64],
@@@ -67,8 -65,7 +66,8 @@@
libglew-dev,
libglib2.0-dev (>= 2.15.0),
libglm-dev,
+ libgltf-dev,
- libglu1-mesa-dev [!armel !mips !mipsel],
+ libglu1-mesa-dev,
libgraphite2-dev (>= 0.9.3),
libgstreamer-plugins-base1.0-dev,
libgstreamer1.0-dev,
@@@ -132,8 -128,11 +131,9 @@@
maven-repo-helper,
npapi-sdk-dev,
pkg-config,
- python (>= 2.6.6-3+squeeze4),
- python-dev (>= 2.6),
python3,
python3-dev (>= 3.3),
+ ucpp,
unixodbc-dev (>= 2.2.11),
unzip,
x11proto-render-dev,
@@@ -4408,8 -4471,6 +4408,7 @@@ Depends: ant (>= 1.7.0)
bc,
bison,
bzip2,
+ coinor-libcoinmp-dev,
- cpp-4.7,
debhelper (>= 7.2.3~),
default-jdk,
doxygen (>= 1.8.4),
@@@ -4530,8 -4589,11 +4529,9 @@@
npapi-sdk-dev,
openjdk-7-jdk,
pkg-config,
- python (>= 2.6.6-3+squeeze4),
- python-dev (>= 2.6),
python3,
python3-dev (>= 3.3),
+ ucpp,
unixodbc-dev (>= 2.2.11),
unzip,
x11proto-render-dev,
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: