------------------------------------------------------------
revno: 1942
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Thu 2010-04-15 09:34:23 +0200
message:
mysqlc also is a arch-dep extension - was missed. don't try to
dpkg-gencontrol on the not-built packages as that will fail
modified:
control
control.mysql.in
rules
=== modified file 'control'
--- a/control 2010-04-14 20:19:44 +0000
+++ b/control 2010-04-15 07:34:23 +0000
@@ -3698,7 +3698,7 @@
Package: openoffice.org-mysql-connector
Section: misc
-Architecture: i386 m68k mips mipsel powerpc s390 alpha amd64 armel hppa ia64
ppc64 s390x sparc
+Architecture: i386 m68k mips mipsel powerpc s390 alpha amd64 hppa ia64 ppc64
s390x sparc
Pre-Depends: openoffice.org-common, debconf (>= 0.5) | debconf-2.0, procps
Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:3.2~), ${misc:Depends}
Suggests: mysql-server (>= 5.1)
=== modified file 'control.mysql.in'
--- a/control.mysql.in 2010-03-09 21:47:00 +0000
+++ b/control.mysql.in 2010-04-15 07:34:23 +0000
@@ -1,6 +1,6 @@
Package: openoffice.orgVER-mysql-connector
Section: misc
-Architecture: %OOO_ARCHS%
+Architecture: %OOO_ARCH_DEP_EXTENSIONS_ARCHS%
Pre-Depends: openoffice.orgVER-common, debconf (>= 0.5) | debconf-2.0, procps
Depends: ${shlibs:Depends}, openoffice.orgVER-core (>> 1:3.2~),
${misc:Depends}
=== modified file 'rules'
--- a/rules 2010-04-14 20:19:44 +0000
+++ b/rules 2010-04-15 07:34:23 +0000
@@ -3583,6 +3583,7 @@
perl -pi -e "s/java-gcj-compat/java-gcj-compat (>= 1.0.77-4)/" \
debian/openoffice.org$(VER)-officebean/DEBIAN/control
endif
+ifneq (,$(findstring $(ARCH),$(OOO_ARCH_DEP_EXTENSIONS_ARCHS)))
ifeq "$(ENABLE_PDFIMPORT)" "y"
dh_gencontrol -popenoffice.org$(VER)-pdfimport -- \
-v$(shell grep "<version"
$(SOURCE_TREE)/sdext/source/pdfimport/config/description.xml | perl -pi -e
's,<version.*value=\"(.*)\" />,\1,; s/^\s+//')+OOo`echo $(BINARY_VERSION) | cut
-d: -f2`
@@ -3601,6 +3602,7 @@
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`
endif
+endif
dh_gencontrol -pure -pure-dbg -puno-libs3 -puno-libs3-dbg -- \
-V"ure:Version=$(shell grep UREPACKAGEVERSION
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2
}')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`" \
-v$(shell grep UREPACKAGEVERSION
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2
}')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
