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

[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.1_rc1-2-37-g996658b



The following commit has been merged in the debian-experimental-4.1 branch:
commit 996658ba88080ffad3721d80e3c02ed0aa0ddfc1
Author: Rene Engelhard <rene@debian.org>
Date:   Sat Mar 9 14:59:55 2013 +0100

    MySQL -> MariaDB/MySQL

diff --git a/control b/control
index 5aa2300..a95ef66 100644
--- a/control
+++ b/control
@@ -1219,12 +1219,12 @@ Conflicts: libreoffice-common (<< 1:3.5~),
            libreoffice-core (<< 1:3.5~),
            ure (<< 1.5.1+OOo3.1.1-15)
 Homepage: http://extensions.services.openoffice.org/en/project/mysql_connector
-Description: MySQL Connector extension for LibreOffice
+Description: MariaDB/MySQL Connector extension for LibreOffice
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- The MySQL Connector extension allows one to use the MySQL database from
- LibreOffice without any wrapper layer such as ODBC or JDBC.
+ The MariaDB/MySQL Connector extension allows one to use the MariaDB or MySQL
+ database from LibreOffice without any wrapper layer such as ODBC or JDBC.
 
 Package: libreoffice-evolution
 Architecture: amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc
diff --git a/control.mysql.in b/control.mysql.in
index 07ce5ca..3e6f64f 100644
--- a/control.mysql.in
+++ b/control.mysql.in
@@ -7,10 +7,10 @@ Conflicts: libreoffice-common (<< 1:3.5~),
            libreoffice-core (<< 1:3.5~),
            ure (<< 1.5.1+OOo3.1.1-15)
 Homepage: http://extensions.services.openoffice.org/en/project/mysql_connector
-Description: MySQL Connector extension for LibreOffice
+Description: MariaDB/MySQL Connector extension for LibreOffice
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
- The MySQL Connector extension allows one to use the MySQL database from
- LibreOffice without any wrapper layer such as ODBC or JDBC.
+ The MariaDB/MySQL Connector extension allows one to use the MariaDB or MySQL
+ database from LibreOffice without any wrapper layer such as ODBC or JDBC.
 

-- 
LibreOffice packaging repository


Reply to: