[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

./packages/openofficeorg/3.2/unstable r1893: the extension now has no version number and extra stuff in the oxt anymore



------------------------------------------------------------
revno: 1893
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Mon 2010-03-29 16:08:31 +0200
message:
  the extension now has no version number and extra stuff in the oxt anymore
modified:
  openoffice.org-mysql-connector.postinst.in
  rules
=== modified file 'openoffice.org-mysql-connector.postinst.in'
--- a/openoffice.org-mysql-connector.postinst.in	2009-08-25 09:21:28 +0000
+++ b/openoffice.org-mysql-connector.postinst.in	2010-03-29 14:08:31 +0000
@@ -8,7 +8,7 @@
 #INCLUDE_SHELL_LIB#
 
 if [ "$1" = "configure" -o "$1" = "upgrade" ]; then
-	add_extension /usr/lib/openoffice/share/extension/install/mysql-connector-ooo*oxt
+	add_extension /usr/lib/openoffice/share/extension/install/mysql-connector-ooo.oxt
 fi
 
 #DEBHELPER#

=== modified file 'rules'
--- a/rules	2010-03-29 12:53:07 +0000
+++ b/rules	2010-03-29 14:08:31 +0000
@@ -2835,8 +2835,8 @@
 
 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
+	install -D -m644 $(SOURCE_TREE)/mysqlc/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/bin/mysql-connector-ooo.oxt \
+		$(PKGDIR)-mysql-connector/$(OOBRANDDIR)/share/extension/install/mysql-connector-ooo.oxt
 endif
 
 ifeq "$(ENABLE_PDFIMPORT)" "y"


Reply to: