This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit a63a150c4a33092183fb189e9ec762d95bf25855
Author: Rene Engelhard <r...@debian.org>
Date: Sun Jun 15 11:21:53 2014 +0200
remove liborbit2-dev build-dep, not needed since some time
Conflicts:
changelog
control
---
changelog | 5 +++--
control | 2 --
rules | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/changelog b/changelog
index 70ef303..43f2a8c 100644
--- a/changelog
+++ b/changelog
@@ -4,8 +4,9 @@ libreoffice (1:4.2.5-2) UNRELEASED; urgency=low
* debian/*.bug-script.in: remove
libreoffice-{pdfimport,presentation-minimizer,presenter-console}.bug-script.in
as they are not extensions since long
- * debian/rules: stop adding vars.$(DEB_HOST_ARCH) content into the
maintscripts;
- unused
+ * debian/rules:
+ - stop adding vars.$(DEB_HOST_ARCH) content into the maintscripts; unused
+ - remove liborbit2-dev build-dep, not needed since some time
-- Rene Engelhard <r...@debian.org> Sun, 22 Jun 2014 11:31:48 +0200
diff --git a/control b/control
index da6903f..3d95a7b 100644
--- a/control
+++ b/control
@@ -88,7 +88,6 @@ Build-Depends: ant (>= 1.7.0),
libneon27-gnutls-dev,
libnss3-dev (>= 3.12.3),
libodfgen-dev (>= 0.0.3),
- liborbit2-dev,
liborcus-dev (>= 0.5.0),
libpng12-dev,
libpoppler-cpp-dev,
@@ -4536,7 +4535,6 @@ Depends: ant (>= 1.7.0),
libneon27-gnutls-dev,
libnss3-dev (>= 3.12.3),
libodfgen-dev (>= 0.0.3),
- liborbit2-dev,
liborcus-dev (>= 0.5.0),
libpng12-dev,
libpoppler-cpp-dev,
diff --git a/rules b/rules
index 9ad1d06..dac0163 100755
--- a/rules
+++ b/rules
@@ -1413,7 +1413,7 @@ ifeq "$(ENABLE_GVFS)" "y"
endif
ifeq "$(ENABLE_GCONF)" "y"
- BUILD_DEPS += , libgconf2-dev, liborbit2-dev
+ BUILD_DEPS += , libgconf2-dev
else
CONFIGURE_FLAGS += --disable-gconf
endif
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wyl6p-0000lm...@moszumanska.debian.org
