------------------------------------------------------------
revno: 2257 [merge]
committer: Rene Engelhard <[email protected]>
branch nick: experimental
timestamp: Mon 2010-12-27 15:40:59 +0100
message:
merge fix for #607873 from OOo 3.2.1 branch
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2010-12-27 14:06:48 +0000
+++ b/changelog 2010-12-27 14:40:59 +0000
@@ -2,6 +2,7 @@
[ Rene Engelhard ]
* debian/rules:
+ - use dpkg -s instead of apt-cache show (closes: #607873)
- install modes.sxd into /usr/share/doc/python-uno directly, not a
extra doc/
=== modified file 'rules'
--- a/rules 2010-12-27 14:28:39 +0000
+++ b/rules 2010-12-27 14:40:59 +0000
@@ -757,7 +757,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
@@ -978,9 +978,9 @@
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)
+ 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 apt-cache show libcommons-logging-java | grep
Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }')
endif
endif
@@ -998,9 +998,9 @@
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)
+ CONFIGURE_FLAGS += --with-system-servlet-api
--with-servlet-api-jar=$(shell dpkg -L `dpkg -s 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 }')
endif
endif
