The following commit has been merged in the ubuntu-oneiric-3.4-l10n branch:
commit 9697fdef03d015e84bbcd685b9ec941eec9ea73a
Merge: c3efefc00c2a9f14ad6cfc82256e9faee0f3f31a
437cff46141d15ea06962993e1ff084307dc8f3e
Author: Bjoern Michaelsen <[email protected]>
Date: Fri Aug 26 10:31:18 2011 +0200
Merge branch 'ubuntu-oneiric-3.4' into ubuntu-oneiric-3.4-l10n
Conflicts:
changelog
diff --combined changelog
index 959b3fb,e57cc04..5cd7cdd
--- a/changelog
+++ b/changelog
@@@ -1,36 -1,22 +1,44 @@@
++libreoffice-l10n (1:3.4.2-2ubuntu2) oneiric; urgency=low
++
++ * merge all changes up to 1:3.4.2-2ubuntu2
++ * regenerate control
++
++ -- Bjoern Michaelsen <[email protected]> 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)
+ * regenerate control
+
+ -- Bjoern Michaelsen <[email protected]> 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 <[email protected]> Thu, 25 Aug 2011
18:14:55 +0200
+
- libreoffice (1:3.4.2-2ubuntu1) UNRELEASED; urgency=low
+ libreoffice (1:3.4.2-2ubuntu1) oneiric; urgency=low
* merge from debian 165efec47b35fa52a88e3b4bc8eaa410d2c323e0
+ - debian/patches/fdo35784.diff: add patch from fdo35784, thanks lmamane
+ - debian/patches/disable-sdbc-postgresql.diff: remove
+ - debian/rules: re-enable -sdbc-postgresql
* refresh patch queues
* fix armel ftbs because in external/gcc3_specific (LP: #832121)
* regenerate control
-- Bjoern Michaelsen <[email protected]> Thu, 25 Aug 2011
18:07:52 +0200
- libreoffice (1:3.4.2-3) UNRELEASED; urgency=low
-
- * debian/patches/fdo35784.diff: add patch from fdo35784, thanks lmamane
- * debian/patches/disable-sdbc-postgresql.diff: remove
-
- * debian/rules:
- - re-enable -sdbc-postgresql
-
- -- Rene Engelhard <[email protected]> Wed, 17 Aug 2011 09:25:08 +0000
-
+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 <[email protected]> Tue, 16 Aug 2011
10:37:02 +0200
++
libreoffice (1:3.4.1-4ubuntu1) oneiric; urgency=low
* rename default theme back to default
@@@ -240,13 -226,6 +248,13 @@@ libreoffice (1:3.4.1-1) experimental; u
-- Rene Engelhard <[email protected]> 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 <[email protected]> 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.
@@@ -388,12 -367,6 +396,12 @@@ libreoffice (1:3.3.2-1ubuntu4) natty; u
-- Bjoern Michaelsen <[email protected]> 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 <[email protected]> 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)
@@@ -405,25 -378,12 +413,25 @@@
-- Bjoern Michaelsen <[email protected]> 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 <[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
@@@ -527,19 -487,8 +535,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)
@@@ -750,20 -699,6 +758,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]
