The following commit has been merged in the ubuntu-lucid-3.3.1 branch:
commit 5247b174659b56d55dcea24e0cd7260dc05a8a14
Merge: 2906d335ebc322b47cfa166f889445a82ab3c946
b8943507ab7a3c96c21d3c9ae0292b9cf7fa7152
Author: Bjoern Michaelsen <[email protected]>
Date: Tue Mar 1 00:35:49 2011 +0100
merging changes from maverick up to b8943507ab7a3c96c21d3c9ae0292b9cf7fa7152
diff --combined changelog
index 1ac72ef,175c74e..b786834
--- a/changelog
+++ b/changelog
@@@ -1,9 -1,31 +1,43 @@@
++libreoffice (1:3.3.1-1ubuntu5~lucid1) UNRELEASED; urgency=low
++
++ * merging changes from maverick up to
b8943507ab7a3c96c21d3c9ae0292b9cf7fa7152
++
++ -- Bjoern Michaelsen <[email protected]> Tue, 01 Mar 2011
00:32:23 +0100
++
+ libreoffice (1:3.3.1-1ubuntu5~maverick1) UNRELEASED; urgency=low
+
+ * merging changes up to natty up to 47a49ddab9633c45c33a949fe109a8087ef5b141
+ * add arm asm optimizations for gcc < 4.6 on maverick
+
+ -- Bjoern Michaelsen <[email protected]> Mon, 28 Feb 2011
22:17:26 +0100
+
+ libreoffice (1:3.3.1-1ubuntu5) UNRELEASED; urgency=low
+
+ * completely disable the arm patch for natty (LP: #726529)
+
+ -- Bjoern Michaelsen <[email protected]> Mon, 28 Feb 2011
18:56:50 +0100
+
+ libreoffice (1:3.3.1-1ubuntu4) natty; urgency=low
+
+ * reenable verbose build on ubuntu buildd (LP: #726333)
+ * remove duplicate code in control file generation
+ * selcting right arm target (LP: #725763)
+
+ -- Bjoern Michaelsen <[email protected]> Mon, 28 Feb 2011
09:57:28 +0100
+
+libreoffice (1:3.3.1-1ubuntu3~lucid1) lucid; urgency=low
+
+ * regenerate control file with DISTREL=lucid for updated deps
+
+ -- Bjoern Michaelsen <[email protected]> Sun, 27 Feb 2011
15:11:51 +0100
+
+ libreoffice (1:3.3.1-1ubuntu3~maverick1) maverick; urgency=low
+
+ * backporting to maverick
+ * regenerate control file
+
+ -- Bjoern Michaelsen <[email protected]> Fri, 25 Feb 2011
15:37:25 +0100
+
libreoffice (1:3.3.1-1ubuntu3) natty; urgency=low
* disabled smoketest completely on natty to get rid of dep on epm
--
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]
