The following commit has been merged in the master branch:
commit 0f88b9ad0943cb0919814256b7c12c9ae2bb51ae
Author: Rene Engelhard <[email protected]>
Date: Mon Jan 16 21:20:24 2012 +0100
fix awk call to be in-sync with the build-dep...
diff --git a/rules b/rules
index f5f42c4..bf24ff2 100755
--- a/rules
+++ b/rules
@@ -829,7 +829,7 @@ export MINGWSTRIP = i686-w64-mingw32-strip
CONFIGURE_FLAGS += --with-servlet-api-jar=$(shell dpkg -L `dpkg -s
libcommons-logging-java | grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk
'{ print $$2 }'` | grep servlet-api.*\.jar$ | head -n 1)
else
BUILD_DEPS += , $(shell dpkg -s libcommons-logging-java | grep Suggests
| cut -d"," -f5 | sed -e s/^\ // | awk '{ print $$1 }') (>= 1.1.1-9)
- CONFIGURE_FLAGS += --with-servlet-api-jar=$(shell dpkg -L `dpkg -s
libcommons-logging-java | grep Suggests | cut -d"," -f5 | sed -e s/^\ // | awk
'{ print $$2 }'` | grep servlet-api.*\.jar$ | head -n 1)
+ CONFIGURE_FLAGS += --with-servlet-api-jar=$(shell dpkg -L `dpkg -s
libcommons-logging-java | grep Suggests | cut -d"," -f5 | sed -e s/^\ // | awk
'{ print $$1 }'` | grep servlet-api.*\.jar$ | head -n 1)
endif
endif
endif
@@ -850,7 +850,7 @@ export MINGWSTRIP = i686-w64-mingw32-strip
CONFIGURE_FLAGS += --with-servlet-api-jar=$(shell dpkg -L `dpkg -s
libcommons-logging-java | grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk
'{ print $$2 }'` | grep servlet-api.*\.jar$ | head -n 1)
else
BUILD_DEPS += , $(shell dpkg -s libcommons-logging-java | grep Suggests
| cut -d"," -f5 | sed -e s/^\ // | awk '{ print $$1 }') (>= 1.1.1-9)
- CONFIGURE_FLAGS += --with-servlet-api-jar=$(shell dpkg -L `dpkg -s
libcommons-logging-java | grep Suggests | cut -d"," -f5 | sed -e s/^\ // | awk
'{ print $$2 }'` | grep servlet-api.*\.jar$ | head -n 1)
+ CONFIGURE_FLAGS += --with-servlet-api-jar=$(shell dpkg -L `dpkg -s
libcommons-logging-java | grep Suggests | cut -d"," -f5 | sed -e s/^\ // | awk
'{ print $$1 }'` | grep servlet-api.*\.jar$ | head -n 1)
endif
endif
CONFIGURE_FLAGS += --enable-ext-report-builder
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
