[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[libreoffice] 01/03: git update; vigra usage is gone



This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.2
in repository libreoffice.

commit 5c0fcc5b081f8558c1a0a37e1131e1cf4296ee14
Author: Rene Engelhard <rene@debian.org>
Date:   Wed Jan 20 13:37:07 2016 +0100

    git update; vigra usage is gone
---
 changelog | 2 +-
 control   | 2 --
 rules     | 5 -----
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/changelog b/changelog
index f34d9ab..551637e 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.2.0~alpha1~git20151221-1) UNRELEASED; urgency=medium
+libreoffice (1:5.2.0~alpha1~git20160120-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
 
diff --git a/control b/control
index f96c2cf..fa1b146 100644
--- a/control
+++ b/control
@@ -114,7 +114,6 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
                libsm-dev,
                libssl-dev (>= 0.9.8),
                libsuitesparse-dev (>= 1:3.4.0),
-               libvigraimpex-dev,
                libvisio-dev (>= 0.1),
                libvlc5,
                libwpd-dev (>= 0.10),
@@ -4469,7 +4468,6 @@ Depends: ant (>= 1.7.0),
          libsm-dev,
          libssl-dev (>= 0.9.8),
          libsuitesparse-dev (>= 1:3.4.0),
-         libvigraimpex-dev,
          libvisio-dev (>= 0.1),
          libvlc5,
          libwpd-dev (>= 0.10),
diff --git a/rules b/rules
index 1f9120a..413d4d2 100755
--- a/rules
+++ b/rules
@@ -168,7 +168,6 @@ ifeq "$(BOOST_VERSION)" "default"
   endif
 endif
 SYSTEM_STUFF += mdds
-SYSTEM_STUFF += vigra
 USE_EXTERNAL_CXXLIBS=y
 SYSTEM_STUFF += mythes
 SYSTEM_STUFF += icu
@@ -1157,10 +1156,6 @@ else
 	CONFIGURE_FLAGS += --disable-orcus
 endif
 
-ifneq (,$(filter vigra, $(SYSTEM_STUFF)))
-	BUILD_DEPS += , libvigraimpex-dev
-endif
-
 ifneq (,$(filter clucene, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libclucene-dev (>= $(CLUCENE_MINVER))
 endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git


Reply to: