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

[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.3-4-27-gce33180



The following commit has been merged in the debian-experimental-3.5 branch:
commit ce33180984c27c35e3fb5cb09909e316f3291748
Author: Rene Engelhard <rene@debian.org>
Date:   Sat Oct 15 14:41:15 2011 +0200

    fix merge error; temprarily disable -pdfimport for squeeze until we can fix it there

diff --git a/rules b/rules
index 9482987..018226a 100755
--- a/rules
+++ b/rules
@@ -449,9 +449,10 @@ endif
 # Debian Squeeze
 ifeq "$(SQUEEZE_BACKPORT)" "y"
   BUGS=mailto:debian-backports@lists.debian.org
-  SYSTEM_STUFF := $(filter-out libwpd libwpg libwps mythes mdds libexttextcat graphite jfreereport libvisio, $(SYSTEM_STUFF))
+  SYSTEM_STUFF := $(filter-out libwpd libwpg libwps mythes mdds libexttextcat graphite jfreereport libvisio poppler, $(SYSTEM_STUFF))
   JUNIT_MIN_VER=
   PARALLEL_BUILD=n
+  ENABLE_PDFIMPORT=n
 endif
 
 CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i))
@@ -1768,10 +1769,6 @@ endif
 	touch $(OOO_BUILD_TREE)/distro-configs/Win32.conf.in
 	touch $(OOO_BUILD_TREE)/distro-configs/Solaris.conf.in
 
-ifeq "$(SQUEEZE_BACKPORT)" "y"
-	quilt pop `tail -n 3 debian/patches/series | head -n 1`
-endif
-
 	cd $(OOO_BUILD_TREE) ; \
 		PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ../$(OOO_BUILD_TREE)/configure $(CONFIGURE_FLAGS)
 

-- 
LibreOffice packaging repository


Reply to: