[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.4-1-137-g1e23764
The following commit has been merged in the debian-experimental-3.5 branch:
commit bbbc84b83d7030bb3ab5bdf211eb58d4cc106118
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Dec 15 16:24:06 2011 +0100
tcsh is long gone
diff --git a/rules b/rules
index b1b40db..6da8b18 100755
--- a/rules
+++ b/rules
@@ -66,9 +66,6 @@ export DH_ALWAYS_EXCLUDE=CVS:.svn:.bzr:.git
export QUILT_PATCHES=debian/patches
export QUILT_OPTIONS="-p1 -F0"
-# work around tcsh bugs.debian.org/339034: tcsh: Unknown colorls variable `su'
-unexport LS_COLORS
-
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
# NOT in proper libreoffice-3-5 branch
# use ./g checkout -b tag-libreoffice-3.4.99.1 libreoffice-3.4.99.1
@@ -652,7 +649,6 @@ ifneq (,$(filter cppunit, $(SYSTEM_STUFF)))
BUILD_DEPS += , libcppunit-dev (>= 1.12)
endif
ifeq "$(RUN_MAKE_CHECK)" "y"
- BUILD_DEPS += , tcsh
ifeq "$(ENABLE_JUNIT4)" "y"
BUILD_DEPS += , junit4 $(JUNIT_MIN_VER)
else
--
LibreOffice packaging repository
Reply to: