The following commit has been merged in the ubuntu-natty-3.3.1-l10n branch:
commit 7de4b2f9535df49fb11a59244a570c92aceb14a5
Merge: 57b2a590832dd96d13bce2ef4bdd7994a13b925c
cb7a5f1d8afd5586cecd3509b0cade565dbce912
Author: Bjoern Michaelsen <[email protected]>
Date: Thu Mar 24 18:16:26 2011 +0100
Merge branch 'ubuntu-natty-3.3.1' into ubuntu-natty-3.3.1-l10n
Conflicts:
changelog
patches/fix-jpeg.diff
diff --combined changelog
index 8537e69,2900a1b..6e9dabd
--- a/changelog
+++ b/changelog
@@@ -1,10 -1,9 +1,22 @@@
++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 <[email protected]> Thu, 24 Mar 2011
18:01:29 +0100
++
+ libreoffice (1:3.3.2-1ubuntu2) natty; urgency=low
+
+ * fix jpeg lib location
+
+ -- Bjoern Michaelsen <[email protected]> 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 <[email protected]> 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
@@@ -63,19 -62,8 +75,19 @@@ libreoffice (1:3.3.2~rc2-1) unstable; u
-- Rene Engelhard <[email protected]> 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 <[email protected]> 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)
@@@ -286,20 -274,6 +298,20 @@@ libreoffice (1:3.3.0-1) experimental; u
-- Rene Engelhard <[email protected]> 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 <[email protected]> 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 [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
