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

[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_4.0.3-3-1-g23d16bf



The following commit has been merged in the master branch:
commit 23d16bf0770493ea7e61575cedd266e2c58e880e
Author: Rene Engelhard <rene@debian.org>
Date:   Mon May 20 13:51:39 2013 +0200

    "libreoffice" is arch-dep, move dejavu-depends to correct dh_gencontrol call...

diff --git a/changelog b/changelog
index a96996b..7dc9ab2 100644
--- a/changelog
+++ b/changelog
@@ -9,7 +9,7 @@ libreoffice (1:4.0.3-3) unstable; urgency=low
   * debian/copyright:
     - mention swext/mediawiki/src/filter/odt2mediawiki.xsl copyright/license 
 
- -- Rene Engelhard <rene@debian.org>  Fri, 17 May 2013 21:50:11 +0200
+ -- Rene Engelhard <rene@debian.org>  Mon, 20 May 2013 13:50:58 +0200
 
 libreoffice (1:4.0.3-2) unstable; urgency=low
 
diff --git a/rules b/rules
index dbcb33b..ef8a446 100755
--- a/rules
+++ b/rules
@@ -3034,6 +3034,7 @@ endif
 		-V'libebook-dep=$(shell debian/scripts/get_libebook_dep.sh)' \
 		-V'idlc-cpp-depends=$(IDLC_CPP_DEPENDS)' \
 		-V'pyuno-depends=$(PYUNO_DEPENDS)' \
+		-V'dejavu-depends=$(DEJAVU_DEPENDS)' \
 		-V'dbg-dbg-suggests=$(DBG_DBG_SUGGESTS)' \
 		-v$(BINARY_VERSION)
 ifeq "$(ENABLE_JAVA)" "y"
@@ -3163,7 +3164,6 @@ 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: