The following commit has been merged in the ubuntu-oneiric-3.4-l10n branch: commit b889f3699495c98ed117a1d0dca3f6948477b2f8 Merge: da8e7ded85e59c8aa2cd6d4c4609642de1398448 35381e7f8d4ae8153dc2498bf5ece7b8fb06e972 Author: Bjoern Michaelsen <bjoern.michael...@canonical.com> Date: Fri Nov 11 15:25:39 2011 +0100
Merge branch 'ubuntu-oneiric-3.4' into ubuntu-oneiric-3.4-l10n Conflicts: changelog diff --combined changelog index 8046bed,e3a9f43..3a02ae7 --- a/changelog +++ b/changelog @@@ -1,28 -1,44 +1,56 @@@ - libreoffice-l10n (1:3.4.4-0ubuntu1~ppa1) oneiric; urgency=low ++libreoffice-l10n (1:3.4.4-0ubuntu1) oneiric-proposed; urgency=low + - * patch only update to upstream 3.4.4.2 ++ * merge from 3.4.4-0ubuntu1 + - -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Wed, 09 Nov 2011 13:43:28 +0100 ++ -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Fri, 11 Nov 2011 15:24:29 +0100 + - libreoffice (1:3.4.4-0ubuntu1~ppa1) oneiric; urgency=low + libreoffice (1:3.4.4-0ubuntu1) oneiric-proposed; urgency=low + [ Bjoern Michaelsen ] * patch only update to upstream 3.4.4.2 + - Perhaps it could be simplified {{fdo|38286}} [Julien Nabet] + - fix building of the 64-bit Windows Explorer extension {{fdo|36950}} [Tor Lillqvist] + - fix recalculate matrix formula dimension correctly {{fdo|39485}} [Eike Rathke] + - mark all formula cells dirty when appending a new sheet {{fdo|35965}} [Kohei Yoshida] + - speed up range name lookup by index. {{bnc|715104}} [Kohei Yoshida] + - get testtool working {{fdo|37164}} [Noel Power] + - move init that depends on parent to post-parent avail {{fdo|36678}} [Caolán McNamara] + - toggling grammar checkbox deletes sentence {{fdo|39348}} [Caolán McNamara] + - fix handling of SAFEARRAY(s) returned as variant in olebridge {{fdo|38441}} [Noel Power] + - libreoffice doesn't build with poppler-0.17.3 {{rhbz|735182}} [Caolán McNamara] + - fix : Auto fit text VIEWING too small in PPT {{fdo|41245}} [Arnaud Versini] + - don't crash while dropping texture {{fdo|38391}} [Ivan Timofeev] + - fix hang in slideshow. {{fdo|32861}} [Thorsten Behrens] + - backport collection of operator= fixes {{fdo|37403}} [Caolán McNamara] + - createProcessServiceFactory can't happen before sync {{fdo|37195}} [Caolán McNamara] + - dbGridControl::RemoveColumn even if no corresponding Model column {{fdo|40701}} [Lionel Elie Mamane] + - fix fallout - recognize .svg in odf container {{fdo|41995}} [Thorsten Behrens] + - fmXGridPeer::getByIndex: Error checking of pGrid->GetModelColumnPos(nId) call {{fdo|40701}} [Lionel Elie Mamane] + - get testtool working {{fdo|37164}} [Noel Power] + - load Dialog library before trying to get embedded images {{fdo|40079}} [Lionel Elie Mamane] + - fix the drawing of dotted and dashed borders in Calc {{fdo|37129}} [Tomofumi Yagi] + - reenable "use typedefs and endianess from sal" patch hunk {{fdo|39355}} [Lionel Elie Mamane] + - activation order crashes address database {{fdo|41022}} [julien2412] + - let Qt call XInitThreads(), so that it knows it's been called {{fdo|40298}} [Luboš Luňák] + - fix the drawing of dotted and dashed borders in Calc {{fdo|37129}} [Tomofumi Yagi] + - comment added {{fdo|39510}} [Bjoern Michaelsen] + - crash on closing document with footnotes {{fdo|39510}}, {{lp|854626}} [Bjoern Michaelsen] + - fix for avoid crash while processing incorrect range of pages {{fdo|35513}} [Ivan Timofeev] + - fix leak in pdf export. {{i|116448}} [Andor Ertsey] + - hide 'math baseline alignment' unless available {{fdo|40341}} [Takeshi Abe] + - fix fallout - recognize .svg in odt container {{fdo|41995}} [Thorsten Behrens] + + [ Lubos Lunak ] + * fix for "Libreoffice-kde breaks with kde oxygen theme on scrollbars" (LP: #856210) + + -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Fri, 11 Nov 2011 15:13:24 +0100 - -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Wed, 09 Nov 2011 13:40:33 +0100 - - libreoffice-l10n (1:3.4.4~rc1-0ubuntu1~ppa1) oneiric; urgency=low - - * merge all changes up to libreoffice-3.4.4-0ubuntu1 - * rebuild should fix mixed l10n issues (LP: #873702) - - -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Thu, 27 Oct 2011 13:39:46 +0200 ++libreoffice-l10n (1:3.4.4-0ubuntu1~ppa1) oneiric; urgency=low + - libreoffice (1:3.4.4~rc1-0ubuntu1~ppa1) oneiric; urgency=low ++ * patch only update to upstream 3.4.4.2 + - * patch only update to upstream 3.4.4.1 ++ -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Wed, 09 Nov 2011 13:43:28 +0100 + - -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Thu, 27 Oct 2011 13:35:51 +0200 - libreoffice (1:3.4.3-3ubuntu2) oneiric; urgency=low * hard hack to make upload happy: Pre-Depends on xz-capable dpkg @@@ -100,13 -116,6 +128,13 @@@ libreoffice (1:3.4.3-1ubuntu2) oneiric -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Tue, 13 Sep 2011 11:52:25 +0200 +libreoffice-l10n (1:3.4.3-1ubuntu1) oneiric; urgency=low + + * merge all changes up to libreoffice-3.4.3-1ubuntu1 + * regen control + + -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Fri, 09 Sep 2011 11:47:57 +0200 + libreoffice (1:3.4.3-1ubuntu1) oneiric; urgency=low * merged from libreoffice-3.4.3-1 @@@ -144,13 -153,6 +172,13 @@@ libreoffice (1:3.4.2-2ubuntu3) oneiric -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Wed, 31 Aug 2011 16:47:16 +0200 +libreoffice-l10n (1:3.4.2-2ubuntu2) oneiric; urgency=low + + * merge all changes up to 1:3.4.2-2ubuntu2 + * regenerate control + + -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Fri, 26 Aug 2011 10:30:10 +0200 + libreoffice (1:3.4.2-2ubuntu2) oneiric; urgency=low * still keep sdbc_postgresql disabled for now (LP: #834178) @@@ -158,13 -160,6 +186,13 @@@ -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Fri, 26 Aug 2011 10:21:03 +0200 +libreoffice-l10n (1:3.4.2-2ubuntu1) oneiric; urgency=low + + * merge all changes up to 1:3.4.2-2ubuntu1 + * regenerate control + + -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Thu, 25 Aug 2011 18:14:55 +0200 + libreoffice (1:3.4.2-2ubuntu1) oneiric; urgency=low * merge from debian 165efec47b35fa52a88e3b4bc8eaa410d2c323e0 @@@ -177,14 -172,6 +205,14 @@@ -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Thu, 25 Aug 2011 18:07:52 +0200 +libreoffice-l10n (1:3.4.1-4ubuntu1) oneiric; urgency=low + + * merge all changes up to 1:3.4.1-4ubuntu1 + * depend on translate-toolkit >= 1.9.0 + * regenerate control + + -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Tue, 16 Aug 2011 10:37:02 +0200 + libreoffice (1:3.4.1-4ubuntu1) oneiric; urgency=low * rename default theme back to default @@@ -394,13 -381,6 +422,13 @@@ libreoffice (1:3.4.1-1) experimental; u -- Rene Engelhard <r...@debian.org> Wed, 06 Jul 2011 16:00:18 +0200 +libreoffice-l10n (1:3.3.3-1ubuntu1) natty; urgency=low + + * merged all changes up to 3.3.3-1ubuntu1 + * regenerate control + + -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Tue, 05 Jul 2011 11:26:41 +0200 + libreoffice (1:3.3.3-4) unstable; urgency=low * The "Don't trust, test-install even libreoffice-officebean" release. @@@ -514,12 -494,6 +542,12 @@@ libreoffice (1:3.3.2-1ubuntu4) natty; u -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Tue, 19 Apr 2011 17:51:11 +0200 +libreoffice-l10n (1:3.3.2-1ubuntu3) natty; urgency=low + + * merged all changes from ubuntu-natty-3.3.1 up to 3.3.2-1ubuntu3 + + -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Mon, 18 Apr 2011 11:55:37 +0200 + libreoffice (1:3.3.2-1ubuntu3) natty; urgency=low * make build dep on xulrunner-dev alternatively depend on firefox-dep (LP: #740815) @@@ -531,25 -505,12 +559,25 @@@ -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Fri, 15 Apr 2011 10:01:19 +0200 +libreoffice-l10n (1:3.3.2-1ubuntu2) natty; urgency=low + + * merged all changes from ubuntu-natty-3.3.1 up to 3.3.2-1ubuntu2 + + -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Thu, 24 Mar 2011 18:01:29 +0100 + libreoffice (1:3.3.2-1ubuntu2) natty; urgency=low * fix jpeg lib location -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Thu, 24 Mar 2011 17:59:05 +0100 +libreoffice-l10n (1:3.3.2-1ubuntu1) natty; urgency=low + + * merged all changes from ubuntu-natty-3.3.1 up to 3.3.2-1ubuntu1 + * regenerated control file + + -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Thu, 24 Mar 2011 14:22:36 +0100 + libreoffice (1:3.3.2-1ubuntu1) natty; urgency=low * merged all changes from debian up to dd32885a133cf3c9c0a1336f938169c6188a0469 @@@ -653,19 -614,8 +681,19 @@@ libreoffice (1:3.3.2~rc2-1) unstable; u -- Rene Engelhard <r...@debian.org> Thu, 17 Mar 2011 07:59:52 +0000 +libreoffice-l10n (1:3.3.1-1ubuntu5) natty; urgency=low + + * merged all changes from libreoffice package up to 1:3.3.1-1ubuntu5 + * regenerate control file + + -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Tue, 08 Mar 2011 11:52:26 +0100 + libreoffice (1:3.3.1-1ubuntu5) natty; urgency=low + [ Matthias Klose ] + * added ppc fixes (LP: #727118) + + [ Bjoern Michaelsen ] * completely disable the arm patch for natty (LP: #726529) * make libreoffice-gtk recommend either tango or human (LP: #726921) * added ppc fixes (LP: #727118) @@@ -876,20 -826,6 +904,20 @@@ libreoffice (1:3.3.0-1) experimental; u -- Rene Engelhard <r...@debian.org> Tue, 25 Jan 2011 12:42:33 +0100 +libreoffice-l10n (1:3.3.0~rc4-1ubuntu2) natty; urgency=low + + * Merge 3.3.0~rc4 changes. + * Merged Debian packaging up to r2336. + * libreoffice-writer: Make the java stuff a suggestion instead of a + recommendation. + * Fix libreoffice-base upgrade, overwriting doc file. LP: #705343. + * Add initial desktop menu translations. LP: #696549. Still needs + rosetta integration. Use the file lo-desktop.pot. + * Relax dependencies of libreoffice-l10n-xx on libreoffice-common. + * Move the icons zip files back into the libreoffice-style-* packages. + + -- Matthias Klose <d...@ubuntu.com> Fri, 21 Jan 2011 01:37:08 +0100 + libreoffice (1:3.3.0~rc4-1ubuntu1) natty; urgency=low * Merge 3.3.0~rc4 changes. -- LibreOffice packaging repository -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1ros3b-0006gk...@vasks.debian.org