------------------------------------------------------------
revno: 2096
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Mon 2010-12-27 13:03:30 +0100
message:
use dpkg -s instead of apt-cache show
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2010-12-01 16:37:58 +0000
+++ b/changelog 2010-12-27 12:03:30 +0000
@@ -1,3 +1,9 @@
+openoffice.org (1:3.2.1-11) UNRELEASED; urgency=medium
+
+ * use dpkg -s instead of apt-cache show (closes: #607873)
+
+ -- Rene Engelhard <[email protected]> Mon, 27 Dec 2010 12:59:29 +0100
+
openoffice.org (1:3.2.1-10) unstable; urgency=medium
* debian/patches/slideshow-clipfix.diff: add patch from ooo-build-3-2-1
=== modified file 'rules'
--- a/rules 2010-11-14 22:37:38 +0000
+++ b/rules 2010-12-27 12:03:30 +0000
@@ -722,7 +722,7 @@
endif
BUILD_DEPS += , libdb-dev
- DBG_DBG_SUGGESTS += , $(shell apt-cache show libdb-dev | grep Depends |
awk '{ print $$2 }' | sed -e s/dev/dbg/)
+ DBG_DBG_SUGGESTS += , $(shell dpkg -s libdb-dev | grep Depends | awk '{
print $$2 }' | sed -e s/dev/dbg/)
ifneq "$(BUILD_DBG_PACKAGE)" "y"
# build with small symbols anyway
@@ -925,10 +925,10 @@
BUILD_DEPS += $(MEDIAWIKI_BUILD_DEPS)
CONFIGURE_FLAGS += --with-system-apache-commons
--with-commons-codec-jar=/usr/share/java/commons-codec.jar
--with-commons-lang-jar=/usr/share/java/commons-lang.jar
--with-commons-httpclient-jar=/usr/share/java/commons-httpclient.jar
--with-commons-logging-jar=/usr/share/java/commons-logging.jar
ifeq "$(LENNY_BACKPORT)" "y"
- CONFIGURE_FLAGS += --with-system-servlet-api
--with-servlet-api-jar=$(shell dpkg -L `apt-cache show libcommons-logging-java
| grep Depends | cut -d"," -f2 | sed -e s/^\ //` | grep \.jar$$)
+ CONFIGURE_FLAGS += --with-system-servlet-api
--with-servlet-api-jar=$(shell dpkg -L `dpkg -s libcommons-logging-java | grep
Depends | cut -d"," -f2 | sed -e s/^\ //` | grep \.jar$$)
else
- CONFIGURE_FLAGS += --with-system-servlet-api
--with-servlet-api-jar=$(shell dpkg -L `apt-cache show libcommons-logging-java
| grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }'` | grep
servlet-api.*\.jar$ | head -n 1)
- BUILD_DEPS += , $(shell apt-cache show libcommons-logging-java | grep
Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }')
+ CONFIGURE_FLAGS += --with-system-servlet-api
--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)
+ BUILD_DEPS += , $(shell dpkg -s libcommons-logging-java | grep Suggests
| cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }')
endif
endif
endif
@@ -945,10 +945,10 @@
REPORT_BUILDER_JAR_DEPENDS += , libcommons-logging-java
CONFIGURE_FLAGS +=
--with-commons-logging-jar=/usr/share/java/commons-logging.jar
ifeq "$(LENNY_BACKPORT)" "y"
- CONFIGURE_FLAGS += --with-system-servlet-api
--with-servlet-api-jar=$(shell dpkg -L `apt-cache show libcommons-logging-java
| grep Depends | cut -d"," -f2 | sed -e s/^\ //` | grep \.jar$$)
+ CONFIGURE_FLAGS += --with-system-servlet-api
--with-servlet-api-jar=$(shell dpkg -L `dpkg -s libcommons-logging-java | grep
Depends | cut -d"," -f2 | sed -e s/^\ //` | grep \.jar$$)
else
- CONFIGURE_FLAGS += --with-system-servlet-api
--with-servlet-api-jar=$(shell dpkg -L `apt-cache show libcommons-logging-java
| grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }'` | grep
servlet-api.*\.jar$ | head -n 1)
- BUILD_DEPS += , $(shell apt-cache show libcommons-logging-java | grep
Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }')
+ CONFIGURE_FLAGS += --with-system-servlet-api
--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)
+ BUILD_DEPS += , $(shell dpkg -s libcommons-logging-java | grep Suggests
| cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }')
endif
endif
CONFIGURE_FLAGS += --enable-report-builder
