The following commit has been merged in the ubuntu-oneiric-3.4-l10n branch:
commit 8d30a418313f0a9b035cd7f59a9944b31644f4e0
Merge: f03732c5367321f9fb9a0fa2971e04acf2fee014
ed5c4a6327a5906712f3d09bbc62ed61c38a933b
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Sun Nov 6 12:20:25 2011 -0500
Merge branch 'ubuntu-oneiric-3.4' into ubuntu-oneiric-3.4-l10n
Conflicts:
changelog
diff --combined changelog
index 4e8f538,b2c93cc..aee8e1c
--- a/changelog
+++ b/changelog
@@@ -1,10 -1,10 +1,23 @@@
++libreoffice-l10n (1:3.4.4~rc2-0ubuntu1~ppa1) oneiric; urgency=low
++
++ * patch only update to upstream 3.4.4.1
++
++ -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Sun, 06 Nov 2011
12:12:03 -0500
++
+ libreoffice (1:3.4.4~rc2-0ubuntu1~ppa1) oneiric; urgency=low
+
+ * patch only update to upstream 3.4.4.2
+ * make deps rc-capable
+
+ -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Sun, 06 Nov 2011
12:06:04 -0500
+
+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 (1:3.4.4~rc1-0ubuntu1~ppa1) oneiric; urgency=low
* patch only update to upstream 3.4.4.1
@@@ -88,13 -88,6 +101,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
@@@ -132,13 -125,6 +145,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)
@@@ -146,13 -132,6 +159,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
@@@ -165,14 -144,6 +178,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
@@@ -382,13 -353,6 +395,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.
@@@ -502,12 -466,6 +515,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)
@@@ -519,25 -477,12 +532,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
@@@ -641,19 -586,8 +654,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)
@@@ -864,20 -798,6 +877,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/e1ro7aa-0007zz...@vasks.debian.org
