The following commit has been merged in the ubuntu-oneiric-3.4-l10n branch:
commit c6344f729e504d95f34f57ceab17ba5973e40b93
Merge: bd8960bcba0f184e3c0cfe7aed81e38aef79a2f8
06ab6090c70db583d302d0db82b9fdd59cc4a607
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Tue Nov 15 13:27:35 2011 +0100
Merge branch 'ubuntu-oneiric-3.4' into ubuntu-oneiric-3.4-l10n
Conflicts:
changelog
diff --combined changelog
index 3a02ae7,2839ace..e8e9799
--- a/changelog
+++ b/changelog
@@@ -1,9 -1,9 +1,21 @@@
++libreoffice-l10n (1:3.4.4-0ubuntu2) oneiric; urgency=low
++
++ * merge from 3.4.4-0ubuntu2
++
++ -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Tue, 15 Nov 2011
13:26:04 +0100
++
+ libreoffice (1:3.4.4-0ubuntu2) oneiric; urgency=low
+
+ * release to oneiric
+
+ -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Tue, 15 Nov 2011
13:22:32 +0100
+
+libreoffice-l10n (1:3.4.4-0ubuntu1) oneiric-proposed; urgency=low
+
+ * merge from 3.4.4-0ubuntu1
+
+ -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Fri, 11 Nov 2011
15:24:29 +0100
+
libreoffice (1:3.4.4-0ubuntu1) oneiric-proposed; urgency=low
[ Bjoern Michaelsen ]
@@@ -45,12 -45,6 +57,12 @@@
-- Bjoern Michaelsen <bjoern.michael...@canonical.com> Fri, 11 Nov 2011
15:13:24 +0100
+libreoffice-l10n (1:3.4.4-0ubuntu1~ppa1) oneiric; urgency=low
+
+ * patch only update to upstream 3.4.4.2
+
+ -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Wed, 09 Nov 2011
13:43:28 +0100
+
libreoffice (1:3.4.3-3ubuntu2) oneiric; urgency=low
* hard hack to make upload happy: Pre-Depends on xz-capable dpkg
@@@ -128,13 -122,6 +140,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
@@@ -172,13 -159,6 +184,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)
@@@ -186,13 -166,6 +198,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
@@@ -205,14 -178,6 +217,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
@@@ -422,13 -387,6 +434,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.
@@@ -542,12 -500,6 +554,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)
@@@ -559,25 -511,12 +571,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
@@@ -681,19 -620,8 +693,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)
@@@ -904,20 -832,6 +916,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/e1rteji-0001a5...@vasks.debian.org
