[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_4.0.1_rc1-1-1-g98bacae
The following commit has been merged in the debian-experimental-4.0 branch:
commit 98bacae4be9decc6ccefbbeffc7080418fbade9a
Author: Rene Engelhard <rene@debian.org>
Date: Sun Feb 24 09:23:54 2013 +0100
add correct build-dep on cpp-4.7...
diff --git a/changelog b/changelog
index 9cfd7fb..096ec8e 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:4.0.1~rc1-2) experimental; urgency=low
+
+ * debian/rules:
+ - add correct build-dep on cpp-4.7...
+
+ -- Rene Engelhard <rene@debian.org> Sun, 24 Feb 2013 09:04:59 +0100
+
libreoffice (1:4.0.1~rc1-1) experimental; urgency=low
* new upstream release candidate
diff --git a/control b/control
index 00df3cd..e3ec5d7 100644
--- a/control
+++ b/control
@@ -10,6 +10,7 @@ Build-Depends: ant (>= 1.7.0),
bc,
bison,
bzip2,
+ cpp-4.7,
debhelper (>= 7.2.3~),
default-jdk,
default-jdk (>= 1:1.7-48) [ia64],
diff --git a/rules b/rules
index 6ec63fb..c569713 100755
--- a/rules
+++ b/rules
@@ -882,7 +882,7 @@ else
# -P, but then idlc produces empty urd files"
IDLC_CPP_DEPENDS := cpp-4.7
CONFIGURE_FLAGS += --with-idlc-cpp=cpp-4.7
- BUILD_DEPENDS += , cpp-4.7
+ BUILD_DEPS += , cpp-4.7
endif
ifneq (,$(filter hunspell, $(SYSTEM_STUFF)))
--
LibreOffice packaging repository
Reply to: