./packages/openofficeorg/3.1/unstable r1648: * debian/control.mysql.in, debian/rules,

To: debian-openoffice@lists.debian.org
Subject: ./packages/openofficeorg/3.1/unstable r1648: * debian/control.mysql.in, debian/rules,
From: Rene Engelhard <rene@debian.org>
Date: Tue, 25 Aug 2009 11:21:28 +0200
Message-id: <[🔎] E1N1mwU-00060x-2y@alioth.debian.org>

------------------------------------------------------------
revno: 1648
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Tue 2009-08-25 11:21:28 +0200
message:
    * debian/control.mysql.in, debian/rules,
      debian/openoffice.org-mysql-connector.*: add support for "mysqlnative"
      driver 1.0.0 alongside the already packages sdbc_postgresql one. Use
      internal libmysqlcppconn on i386 for now... Don't enable it yet.
added:
  openoffice.org-mysql-connector.postinst.in
  openoffice.org-mysql-connector.preinst.in
  openoffice.org-mysql-connector.prerm.in
modified:
  changelog
  control
  control.ure.in
  rules

=== modified file 'changelog'
--- a/changelog	2009-08-24 19:34:06 +0000
+++ b/changelog	2009-08-25 09:21:28 +0000
@@ -13,6 +13,11 @@
   * debian/rules:
     - use upstreams tarballs
 
+  * debian/control.mysql.in, debian/rules,
+    debian/openoffice.org-mysql-connector.*: add support for "mysqlnative"
+    driver 1.0.0 alongside the already packages sdbc_postgresql one. Use
+    internal libmysqlcppconn on i386 for now... Don't enable it yet.
+
  -- Rene Engelhard <rene@debian.org>  Mon, 17 Aug 2009 02:50:51 +0200
 
 openoffice.org (1:3.1.1~rc2-1) experimental; urgency=low

=== modified file 'control'
--- a/control	2009-08-21 00:59:21 +0000
+++ b/control	2009-08-25 09:21:28 +0000
@@ -3098,7 +3098,7 @@
 Section: libs
 Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: ure
+Replaces: ure (<< 1:3.0.0~beta2-1)
 Description: OpenOffice.org UNO runtime environment -- public shared libraries
  The Uno Runtime Environment (URE) is the well-known UNO component model
  of OpenOffice.org, packaged up as an individual product.
@@ -3121,7 +3121,7 @@
 Priority: extra
 Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
 Depends: uno-libs3 (= ${ure:Version}), ${misc:Depends}
-Replaces: ure-dbg
+Replaces: ure-dbg (<< 1:3.0.0~beta2-1)
 Description: OpenOffice.org UNO runtime environment -- public shared library debug symbols
  The Uno Runtime Environment (URE) is the well-known UNO component model
  of OpenOffice.org, packaged up as an individual product.

=== modified file 'control.ure.in'
--- a/control.ure.in	2009-04-27 13:34:49 +0000
+++ b/control.ure.in	2009-08-25 09:21:28 +0000
@@ -3,7 +3,7 @@
 Architecture: %OOO_ARCHS%
 Depends: ${shlibs:Depends},
  ${misc:Depends}
-Replaces: ure
+Replaces: ure (<< 1:3.0.0~beta2-1)
 Description: OpenOffice.org UNO runtime environment -- public shared libraries
  The Uno Runtime Environment (URE) is the well-known UNO component model
  of OpenOffice.org, packaged up as an individual product.
@@ -27,7 +27,7 @@
 Architecture: %OOO_ARCHS%
 Depends: uno-libs3 (= ${ure:Version}),
  ${misc:Depends}
-Replaces: ure-dbg
+Replaces: ure-dbg (<< 1:3.0.0~beta2-1)
 Description: OpenOffice.org UNO runtime environment -- public shared library debug symbols
  The Uno Runtime Environment (URE) is the well-known UNO component model
  of OpenOffice.org, packaged up as an individual product.

=== added file 'openoffice.org-mysql-connector.postinst.in'
--- a/openoffice.org-mysql-connector.postinst.in	1970-01-01 00:00:00 +0000
+++ b/openoffice.org-mysql-connector.postinst.in	2009-08-25 09:21:28 +0000
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+THIS_PACKAGE=openoffice.org-mysql-connector
+THIS_SCRIPT=postinst
+
+#INCLUDE_SHELL_LIB#
+
+if [ "$1" = "configure" -o "$1" = "upgrade" ]; then
+	add_extension /usr/lib/openoffice/share/extension/install/mysql-connector-ooo*oxt
+fi
+
+#DEBHELPER#
+
+exit 0

=== added file 'openoffice.org-mysql-connector.preinst.in'
--- a/openoffice.org-mysql-connector.preinst.in	1970-01-01 00:00:00 +0000
+++ b/openoffice.org-mysql-connector.preinst.in	2009-08-25 09:21:28 +0000
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e
+
+# preinst script for openoffice.org-mysql-connector
+
+THIS_PACKAGE=openoffice.org-mysql-connector
+THIS_SCRIPT=preinst
+
+#INCLUDE_SHELL_LIB#
+
+case "$1" in
+	upgrade)
+		remove_extension com.sun.star.mysql-connector-ooo-$PLATFORMID
+	;;
+esac
+
+#DEBHELPER#
+
+exit 0

=== added file 'openoffice.org-mysql-connector.prerm.in'
--- a/openoffice.org-mysql-connector.prerm.in	1970-01-01 00:00:00 +0000
+++ b/openoffice.org-mysql-connector.prerm.in	2009-08-25 09:21:28 +0000
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e
+
+# preinst script for openoffice.org-mysql-connector
+
+THIS_PACKAGE=openoffice.org-mysql-connector
+THIS_SCRIPT=prerm
+
+#INCLUDE_SHELL_LIB#
+
+case "$1" in
+	remove)
+                remove_extension com.sun.star.mysql-connector-ooo-$PLATFORMID
+	;;
+esac
+
+#DEBHELPER#
+
+exit 0

=== modified file 'rules'
--- a/rules	2009-08-24 15:29:00 +0000
+++ b/rules	2009-08-25 09:21:28 +0000
@@ -65,8 +65,8 @@
 MWS=OOO310
 #MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f2 | sed -e s/$(shell echo $(MWS) | tr A-Z a-z)//)
 MILESTONE=m19
-#TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
-TAG=$(MWS)_$(MILESTONE)
+TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
+#TAG=$(MWS)_$(MILESTONE)
 OOO_BUILD_BRANCH=ooo-build-3-1-1
 SOURCE_TREE=ooo-build/build/$(TAG)
 STAMP_DIR=debian/stampdir
@@ -237,6 +237,11 @@
 INTERNAL_STDLIBS=n
 DEFAULT_IMAGE=galaxy
 IMAGES:=$(DEFAULT_IMAGE) industrial crystal hicontrast tango oxygen classic
+ENABLE_MYSQLNATIVE=n
+USE_SYSTEM_MYSQLCLIENT=y
+ifneq "$(USE_STLPORT)" "y"
+  USE_SYSTEM_MYSQLCPPCONN=y
+endif
 
 # Default flags to pass to configure of ooo-build
 CONFIGURE_FLAGS= --disable-post-install-scripts \
@@ -914,6 +919,18 @@
   endif
 endif
 
+ifeq "$(ENABLE_MYSQLNATIVE)" "y"
+	CONFIGURE_FLAGS += --enable-mysql-connector
+  ifeq "$(USE_SYSTEM_MYSQLCLIENT)" "y"
+	CONFIGURE_FLAGS += --with-system-mysql
+	BUILD_DEPS += , libmysqlclient-dev
+  endif
+  ifeq "$(USE_SYSTEM_MSQLCPPCONN)" "y"
+	CONFIGURE_FLAGS += --with-system-mysql-cppconn
+	BUILD_DEPS += , libmysqlcppconn-dev (>= 1.0.6~) [$(filter-out $(OOO_STLPORT_ARCHS),$(OOO_ARCHS)))]
+  endif
+endif
+
 ifeq "$(BUILD_GTK)" "n"
 	CONFIGURE_FLAGS+= --disable-gtk
 	DEBHELPER_OPTIONS+= -Nopenoffice.org$(VER)-gtk -Nopenoffice.org$(VER)-gnome
@@ -1449,6 +1466,10 @@
 endif
 	sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
 		>> debian/control < debian/control.postgresql.in
+ifeq "$(ENABLE_MYSQLNATIVE)" "y"
+	sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
+		>> debian/control < debian/control.mysql.in
+endif
 
 	perl -pi -e "s,%OOO_ARCHS%,$(OOO_ARCHS),g" debian/control
 	perl -pi -e "s,%OOO_JAVA_ARCHS%,$(OOO_JAVA_ARCHS),g" debian/control
@@ -2523,6 +2544,12 @@
 	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
 
+ifeq "$(ENABLE_MYSQLNATIVE)" "y"
+	rm -rf $(PKGDIR)-mysql-connector
+	install -D -m644 $(SOURCE_TREE)/mysqlc/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/bin/mysql-connector-ooo-$(shell . $(SOURCE_TREE)/mysqlc/version.mk 2>/dev/null; echo $${MYSQLC_VERSION_MAJOR}.$${MYSQLC_VERSION_MINOR}.$${MYSQLC_VERSION_MICRO}-$(shell echo $(PLATFORMID) | sed -e s/_/-/)).oxt \
+		$(PKGDIR)-mysql-connector/$(OOBRANDDIR)/share/extension/install/mysql-connector-ooo-$(shell . $(SOURCE_TREE)/mysqlc/version.mk; echo $${MYSQLC_VERSION_MAJOR}.$${MYSQLC_VERSION_MINOR}.$${MYSQLC_VERSION_MICRO}-$(shell echo $(PLATFORMID) | sed -e s/_/-/)).oxt
+endif
+
 ifeq "$(ENABLE_OPENGL)" "y"
 	rm -rf $(PKGDIR)-ogltrans
 	mkdir -p $(PKGDIR)-ogltrans/$(OODIR)/program
@@ -3127,6 +3154,15 @@
 			-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
+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 \
+			-Sdebian/uno-libs3/$(OOUREDIR)/lib \
+			-Sdebian/ure/$(OOUREDIR)/lib \
+			$(SOURCE_TREE)/mysqlc/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/lib/mysqlc.uno.so \
+			$(SOURCE_TREE)/mysqlcppconn/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/lib/libmysqlcppconn.so \
+			> debian/openoffice.org$(VER)-mysql-connector.substvars
+endif
 ifeq "$(ENABLE_MINIMIZER)" "y"
 	 LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program" \
 	 	dpkg-shlibdeps -O \
@@ -3163,7 +3199,8 @@
 		-Nopenoffice.org$(VER)-presentation-minimizer \
 		-Nopenoffice.org$(VER)-presenter-console \
 		-Nopenoffice.org$(VER)-pdfimport \
-		-Nopenoffice.org$(VER)-sdbc-postgresql -- \
+		-Nopenoffice.org$(VER)-sdbc-postgresql \
+		-Nopenoffice.org$(VER)-mysql-connector -- \
 		-V"ure:Version=$(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`" \
 		-V'base-version=$(BASE_VERSION)' \
 		-V'help-l10n-virtual-version=$(HELP_L10N_VIRTUAL_VERSION)' \
@@ -3201,6 +3238,10 @@
 endif
 	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)+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
+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`
+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`

Reply to:

Prev by Date: ./packages/openofficeorg/3.1/unstable r1649: oops
Next by Date: ./packages/openofficeorg/3.1/unstable r1652: update ooo-build to 3.1.1.1 release; release 3.1.1-1
Previous by thread: ./packages/openofficeorg/3.1/unstable r1649: oops
Next by thread: ./packages/openofficeorg/3.1/unstable r1652: update ooo-build to 3.1.1.1 release; release 3.1.1-1
Index(es):
- Date
- Thread