./packages/libreoffice/3.3.0/experimental r2255: * debian/rules:
------------------------------------------------------------
revno: 2255
committer: Matthias Klose <doko@canonical.com>
branch nick: experimental
timestamp: Mon 2010-12-27 15:06:48 +0100
message:
* debian/rules:
- Remove leading whitespaces.
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2010-12-27 14:02:29 +0000
+++ b/changelog 2010-12-27 14:06:48 +0000
@@ -1,9 +1,14 @@
libreoffice (1:3.3.0~rc2-2) UNRELEASED; urgency=low
+ [ Rene Engelhard ]
* debian/rules:
- install modes.sxd into /usr/share/doc/python-uno directly, not a
extra doc/
+ [ Matthias Klose ]
+ * debian/rules:
+ - Remove leading whitespaces.
+
-- Rene Engelhard <rene@debian.org> Mon, 27 Dec 2010 15:01:42 +0100
libreoffice (1:3.3.0~rc2-1) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2010-12-27 14:02:29 +0000
+++ b/rules 2010-12-27 14:06:48 +0000
@@ -917,7 +917,7 @@
ifeq "$(LENNY_BACKPORT)" "y"
BUILD_DEPS += , gij [$(OOO_GCJ_ARCHS)], java-gcj-compat-dev (>= 1.0.76-7) [$(OOO_GCJ_ARCHS)], libgcj-bc [$(OOO_GCJ_ARCHS)]
else
- BUILD_DEPS += , gcj-jdk [$(OOO_GCJ_ARCHS)], libgcj-common (>= 1:4.4.1) [$(OOO_GCJ_ARCHS)]
+ BUILD_DEPS += , gcj-jdk [$(OOO_GCJ_ARCHS)], libgcj-common (>= 1:4.4.1) [$(OOO_GCJ_ARCHS)]
endif
else
ifneq "$(OOO_GCJ_JDK_ARCHS)" ""
@@ -944,7 +944,7 @@
endif
JAVA_RUNTIME_DEPENDS += | java5-runtime
# Suns Java "packages"
- JAVA_RUNTIME_DEPENDS += | jre
+ JAVA_RUNTIME_DEPENDS += | jre
GCJ_JAWT_DIR=$(shell dirname `dpkg -L $(GCJ_JAWT_DEPENDS) | grep libjawt.so | head -n 1`)
export JAVA_HOME
CONFIGURE_FLAGS += --with-jdk-home=$(JAVA_HOME)
@@ -981,7 +981,7 @@
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$$)
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 }')
+ BUILD_DEPS += , $(shell apt-cache show libcommons-logging-java | grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }')
endif
endif
endif
@@ -1001,7 +1001,7 @@
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$$)
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 }')
+ BUILD_DEPS += , $(shell apt-cache show libcommons-logging-java | grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }')
endif
endif
CONFIGURE_FLAGS += --enable-report-builder
Reply to: