[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.3-4-16-ga8987ba
The following commit has been merged in the master branch:
commit a8987ba30307544c13cd1b1e9f9e091c4bf38275
Author: Rene Engelhard <rene@debian.org>
Date: Thu Oct 27 22:09:00 2011 +0200
update update-sdbc-postgresql.diff to apply again, bump depends to libreoffice-core (>= 1:3.4.4~)
diff --git a/control b/control
index 4f2fa51..ed703e9 100644
--- a/control
+++ b/control
@@ -3368,7 +3368,7 @@ Description: office productivity suite -- KDE integration
Package: libreoffice-sdbc-postgresql
Section: misc
Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
-Depends: ${shlibs:Depends}, libreoffice-core, ${misc:Depends}
+Depends: ${shlibs:Depends}, libreoffice-core (>= 1:3.4.4~), ${misc:Depends}
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
Suggests: postgresql (>= 8.4)
Description: LibreOffice extension for PostgreSQL SDBC driver
diff --git a/control.postgresql.in b/control.postgresql.in
index ebedd30..e32cf19 100644
--- a/control.postgresql.in
+++ b/control.postgresql.in
@@ -1,7 +1,7 @@
Package: libreofficeVER-sdbc-postgresql
Section: misc
Architecture: %OOO_BASE_ARCHS%
-Depends: ${shlibs:Depends}, libreofficeVER-core,
+Depends: ${shlibs:Depends}, libreofficeVER-core (>= 1:3.4.4~),
${misc:Depends}
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
Suggests: postgresql (>= 8.4)
diff --git a/patches/update-sdbc-postgresql.diff b/patches/update-sdbc-postgresql.diff
index ba5c424..a24c719 100644
--- a/patches/update-sdbc-postgresql.diff
+++ b/patches/update-sdbc-postgresql.diff
@@ -1659,7 +1659,7 @@ new file mode 100644
index 0000000..1a69913
--- /dev/null
+++ libreoffice-3.4.3/libreoffice-build/patches/postgresql/sdbc-postgresql-libs-core.diff
-@@ -0,0 +1,22318 @@
+@@ -0,0 +1,22290 @@
+diff -urN connectivity/prj/build.lst connectivity/prj/build.lst
+--- connectivity/prj/build.lst 2011-10-16 17:11:47.000000000 +0200
++++ connectivity/prj/build.lst 2011-10-16 17:28:41.000000000 +0200
@@ -23950,36 +23950,6 @@ index 0000000..1a69913
+
+ // Im DesignModus nur das Datenfenster disablen
+ // Sonst kann das Control nicht mehr konfiguriert werden
-+@@ -2442,6 +2441,9 @@
-+ // get the list position
-+ sal_uInt16 nPos = pGrid->GetModelColumnPos(nId);
-+
-++ if ( nPos == GRID_COLUMN_NOT_FOUND )
-++ return aElement;
-++
-+ DbGridColumn* pCol = pGrid->GetColumns().at( nPos );
-+ Reference< ::com::sun::star::awt::XControl > xControl(pCol->GetCell());
-+ aElement <<= xControl;
-+diff -urN svx/source/fmcomp/gridctrl.cxx svx/source/fmcomp/gridctrl.cxx
-+--- svx/source/fmcomp/gridctrl.cxx 2011-10-16 17:11:55.000000000 +0200
-++++ svx/source/fmcomp/gridctrl.cxx 2011-10-16 17:28:40.000000000 +0200
-+@@ -1723,11 +1723,12 @@
-+ void DbGridControl::RemoveColumn(sal_uInt16 nId)
-+ {
-+ sal_uInt16 nIndex = GetModelColumnPos(nId);
-+- if (nIndex == GRID_COLUMN_NOT_FOUND)
-+- return;
-+
-+ DbGridControl_Base::RemoveColumn(nId);
-+
-++ if (nIndex == GRID_COLUMN_NOT_FOUND)
-++ return;
-++
-+ delete m_aColumns[ nIndex ];
-+ DbGridColumns::iterator it = m_aColumns.begin();
-+ ::std::advance( it, nIndex );
---- /dev/null
-+++ libreoffice-3.4.3/libreoffice-build/patches/postgresql/sdbc-postgresql-libs-core.diff
diff --git libreoffice-3.4.3/libreoffice-build/patches/postgresql/sdbc-postgresql-oxt.diff libreoffice-3.4.3/libreoffice-build/patches/postgresql/sdbc-postgresql-oxt.diff
deleted file mode 100644
index 85c174a..0000000
--
LibreOffice packaging repository
Reply to: