------------------------------------------------------------
revno: 1949
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Mon 2010-04-19 13:31:35 +0200
message:
* merge from Ubuntu:
- add ENABLE_SDBC_POSTGRESQL variable and disable the build of the
arch-dep extensions when we don't package them anyways
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2010-04-18 18:30:47 +0000
+++ b/changelog 2010-04-19 11:31:35 +0000
@@ -13,8 +13,11 @@
- enable kfreebsd-{i386,amd64}
* debian/scripts/vars.kfreebsd-*: add PLATFORMID (same as Linux)
* debian/shlibs.override.libc: force libc0.1 dependency to (>= 2.10.2-7)
+ * merge from Ubuntu:
+ - add ENABLE_SDBC_POSTGRESQL variable and disable the build of the
+ arch-dep extensions when we don't package them anyways
- -- Rene Engelhard <r...@debian.org> Sun, 18 Apr 2010 03:13:27 +0200
+ -- Rene Engelhard <r...@debian.org> Mon, 19 Apr 2010 13:30:07 +0200
openoffice.org (1:3.2.0-8) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2010-04-18 04:39:41 +0000
+++ b/rules 2010-04-19 11:31:35 +0000
@@ -228,6 +228,7 @@
ENABLE_REPORTDESIGN=n
ENABLE_MEDIAWIKI=n
endif
+ENABLE_SDBC_POSTGRESQL=y
ENABLE_MINIMIZER=y
ENABLE_PRESENTER_CONSOLE=y
ENABLE_PDFIMPORT=y
@@ -482,6 +483,14 @@
OOO_ARCH_DEP_EXTENSIONS_ARCHS := $(filter-out armel,$(OOO_ARCHS))
+ifeq (,$(findstring $(ARCH),$(OOO_ARCH_DEP_EXTENSIONS_ARCHS)))
+ ENABLE_MINIMIZER=n
+ ENABLE_PDFIMPORT=n
+ ENABLE_PRESENTER_CONSOLE=n
+ ENABLE_SDBC_POSTGRESQL=n
+ ENABLE_MYSQLNATIVE=n
+endif
+
ifeq (,$(findstring $(ARCH),$(OOO_JAVA_ARCHS)))
ENABLE_JAVA=n
ENABLE_REPORTDESIGN=n
@@ -2874,9 +2883,11 @@
$(PKGDIR)-presenter-console/$(OOBRANDDIR)/share/extension/install/presenter-screen.oxt
endif
+ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y"
rm -rf $(PKGDIR)-sdbc-postgresql
install -D -m644 $(SOURCE_TREE)/connectivity/$(shell .
$(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/lib/postgresql-sdbc-$(shell grep
^PQ_SDBC_M $(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk |
cut -d"=" -f2 | xargs | sed -e s/\ /\./g).zip \
$(PKGDIR)-sdbc-postgresql/$(OOBRANDDIR)/share/extension/install/postgresql-sdbc-$(shell
grep ^PQ_SDBC_M
$(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk | cut -d"="
-f2 | xargs | sed -e s/\ /\./g).zip
+endif
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
rm -rf $(PKGDIR)-mysql-connector
@@ -3529,12 +3540,14 @@
endif
# this is in an extension (.zip), so dh_shlibdeps doesn't get it. We
need to do
# it manually.
+ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y"
LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program"
\
dpkg-shlibdeps -O \
-Sdebian/uno-libs3/$(OOUREDIR)/lib \
-Sdebian/ure/$(OOUREDIR)/lib \
$(SOURCE_TREE)/connectivity/$(shell .
$(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/lib/postgresql-sdbc*.so \
> debian/openoffice.org$(VER)-sdbc-postgresql.substvars
+endif
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program"
\
dpkg-shlibdeps -O \
@@ -3631,8 +3644,10 @@
dh_gencontrol -popenoffice.org$(VER)-presenter-console -- \
-v$(shell grep "<version"
$(SOURCE_TREE)/sdext/source/presenter/description.xml | perl -pi -e 's,<version
value=\"(.*)\" />,\1,; s/^\s+//')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
endif
+ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y"
dh_gencontrol -popenoffice.org$(VER)-sdbc-postgresql -- \
-v`echo $(BINARY_VERSION) | cut -d: -f1`:$(shell grep
^PQ_SDBC_M $(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk |
cut -d"=" -f2 | xargs | sed -e s/\ /\./g | sed -e s/a$$//)+OOo`echo
$(BINARY_VERSION) | cut -d: -f2`
+endif
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
dh_gencontrol -popenoffice.org$(VER)-mysql-connector -- \
-v$(shell grep "<version" $(SOURCE_TREE)/mysqlc/$(shell .
$(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/misc/description.xml | perl -pi -e
's,<version value=\"(.*)\" />,\1,; s/^\s+//; s/\s+$$//')+OOo`echo
$(BINARY_VERSION) | cut -d: -f2`
