The following commit has been merged in the debian-experimental-3.5 branch:
commit bf430ffd440b3cdcc3fd2af254fb5fef8c2db540
Merge: ecbf22a284ead927e78a2fab1987fb200fb4530c
ab58622fd11ae94fa9bf8be497000746be27451d
Author: Rene Engelhard <r...@debian.org>
Date: Wed Jun 20 15:09:14 2012 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-3.5
diff --combined changelog
index 3919c58,698924e..109f1a1
--- a/changelog
+++ b/changelog
@@@ -1,9 -1,14 +1,20 @@@
+libreoffice (1:3.5.5~rc1-1) UNRELEASED; urgency=low
+
+ * new upstream release candidate
+
+ -- Rene Engelhard <r...@debian.org> Wed, 13 Jun 2012 19:25:17 +0200
+
+ libreoffice (1:3.5.4-5) unstable; urgency=low
+
+ * debian/patches/evolution-3.4.diff: as name says,
+ add libebook-1.2.so.13
+
+ * debian/python{,3}-uno.NEWS: add missing )
+ * debian/*.bug-script: add -draw to libreoffice report-with:;
+ report libreoffice-script-provider-python with python(3)-uno
+
+ -- Rene Engelhard <r...@debian.org> Wed, 20 Jun 2012 00:43:59 +0200
+
libreoffice (1:3.5.4-4) unstable; urgency=high
* debian/patches/make-shortcuts-in-menus-localized-again.diff:
diff --combined patches/series
index 89cfeb9,bf04e42..ee2ab37
--- a/patches/series
+++ b/patches/series
@@@ -27,8 -27,17 +27,9 @@@ move-binfilter-mimetypes-in-extra-deskt
pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff
debian-hardened-buildflags.diff
gtk3-hack-explicit-gmodule.diff
-gcc-4.7.diff
-gcc-4.7-i386.diff
-gcc-4.7-amd64.diff
-jdk7.diff
lp-926940-visio-mime-for-draw.diff
gcc-4.4.diff
lp-904212-add-missing-mimetypes-to-impress.desktop.diff
ignore-sc_cellrangesbase-fails.diff
fix-Test-BigPtrArray-on-64bit-bigendian.diff
-yyinput-fix-for-unsigned-char.diff
-fix-signed-char-mess.diff
-make-shortcuts-in-menus-localized-again.diff
-fix-legacy-report-opening.diff
+ evolution-3.4.diff
--
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/e1shkf9-00062e...@vasks.debian.org
