[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_4.0.3-2-1-g33dfff5
The following commit has been merged in the master branch:
commit 33dfff5743bc2a7c9d92790536aa2d8b74ac9fea
Author: Rene Engelhard <rene@debian.org>
Date: Sun May 12 22:43:56 2013 +0200
depend on fonts-dejavu instead of ttf-dejavu (closes: #708062)
diff --git a/changelog b/changelog
index 9cd0510..2750613 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:4.0.3-2~bpo70+2) UNRELEASED; urgency=low
+
+ * debian/rules:
+ - depend on fonts-dejavu instead of ttf-dejavu (closes: #708062)
+
+ -- Rene Engelhard <rene@debian.org> Sun, 12 May 2013 22:36:01 +0200
+
libreoffice (1:4.0.3-2) unstable; urgency=low
* debian/control.in:
diff --git a/control b/control
index 2856b12..12c4272 100644
--- a/control
+++ b/control
@@ -180,7 +180,7 @@ Depends: fonts-sil-gentium-basic,
libreoffice-math,
libreoffice-report-builder-bin [!hppa !kfreebsd-amd64 !kfreebsd-i386],
libreoffice-writer,
- ttf-dejavu,
+ ${dejavu-depends},
${java-common-depends},
${misc:Depends},
${pyuno-depends}
diff --git a/control.in b/control.in
index db6fc0d..62a68e3 100644
--- a/control.in
+++ b/control.in
@@ -46,7 +46,7 @@ Depends: libreoffice-base%OOO_NO_BASE_ARCHS%,
libreoffice-math,
libreoffice-report-builder-bin%OOO_NO_REPORTDESIGN_ARCHS%,
libreoffice-writer,
- ttf-dejavu,
+ ${dejavu-depends},
fonts-sil-gentium-basic,
${java-common-depends},
${misc:Depends},
diff --git a/rules b/rules
index d7ffe51..e526a45 100755
--- a/rules
+++ b/rules
@@ -248,7 +248,7 @@ USE_GSTREAMER=y
ifneq "$(WHEEZY_BACKPORT)" "y"
GSTREAMER_VERSION=1.0
else
- GSTREAMER_VERSION=0.10
+ GSTREAMER_VERSION=0.10
endif
SYSTEM_STUFF += neon
NEON_SECTYPE=gnutls
@@ -1260,6 +1260,12 @@ ifeq ($(ENABLE_MERGELIBS),y)
CONFIGURE_FLAGS += --enable-mergelibs
endif
+ifneq "$(WHEEZY_BACKPORT)" "y"
+ DEJAVU_DEPENDS=fonts-dejavu
+else
+ DEJAVU_DEPENDS=ttf-dejavu
+endif
+
# Use compiler cache? Include ccache in DEB_BUILD_OPTIONS for much faster rebuild times
# A complete build uses about 9G of compiler cache.
ifneq (ccache,$(findstring ccache,$(DEB_BUILD_OPTIONS)))
@@ -3155,6 +3161,7 @@ endif
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
-V'textcat-data-recommends=$(TEXTCAT_DATA_RECOMMENDS)' \
-V'pyuno-depends=$(PYUNO_DEPENDS)' \
+ -V'dejavu-depends=$(DEJAVU_DEPENDS)' \
-V'Binary-Version=$(BINARY_VERSION)' \
-V'dbg-dbg-suggests=$(DBG_DBG_SUGGESTS)' \
-v$(BINARY_VERSION)
--
LibreOffice packaging repository
Reply to: