The following commit has been merged in the debian-experimental-3.5 branch:
commit ca22dd43619bb9a988a73bc1eed4af312658df9a
Merge: f17acc619cffb686e771d8fb9342e91afeeabf05
aa6c87b89917300fe5f4a49bf5e20264de72822d
Author: Rene Engelhard <r...@debian.org>
Date: Tue May 15 15:23:04 2012 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-3.5
diff --combined changelog
index d0ee040,e3f00b9..2608819
--- a/changelog
+++ b/changelog
@@@ -1,10 -1,4 +1,10 @@@
+libreoffice (1:3.5.4~rc1~git20120513-1) UNRELEASED; urgency=low
+
+ * new upstream release candidate snapshot
+
+ -- Rene Engelhard <r...@debian.org> Tue, 08 May 2012 11:37:43 +0200
+
- libreoffice (1:3.5.3-3) UNRELEASED; urgency=low
+ libreoffice (1:3.5.3-3) unstable; urgency=low
[ Rene Engelhard ]
* debian/patches/ignore-sc_cellrangesbase-fails.diff:
@@@ -14,13 -8,16 +14,16 @@@
* debian/rules:
- (temporarily) stop building -gcj even on kfreebsd-* to be able to get
into
testing (otherwise gcc-defaults is blocking...)
+ * debian/mysqlcppconn-mysqlclient-SONAME.diff: move ...
+ * debian/mysqlcppconn-libmysqlclient-SONAME.diff: ... and dynamically
determine
+ libmysqlclient_r.so.XX in internal mysqlcppconn
[ Andreas Beckmann ]
* debian/shell-lib-extension.sh: set HOME to $INSTDIR also for
unopkg list --bundled (Closes: #669271). Most probably also
closes: #619263 as $HOME isn't touched anymore.
- -- Rene Engelhard <r...@debian.org> Tue, 08 May 2012 11:37:43 +0200
+ -- Rene Engelhard <r...@debian.org> Tue, 15 May 2012 00:22:05 +0200
libreoffice (1:3.5.3-2) unstable; urgency=low
diff --combined patches/series
index 0e5eee9,473592a..b17bf06
--- a/patches/series
+++ b/patches/series
@@@ -15,7 -15,7 +15,7 @@@ sensible-lomua.dif
sensible-browser.diff
reportdesign-mention-package.diff
jdbc-driver-classpaths.diff
- mysqlcppconn-mysqlclient-SONAME.diff
+ mysqlcppconn-libmysqlclient-SONAME.diff
make-pyuno-work-with-system-wide-module-install.diff
search-usr-share-for-images.diff
make-package-modules-not-suck.diff
@@@ -35,3 -35,7 +35,3 @@@ lp-926940-visio-mime-for-draw.dif
gcc-4.4.diff
lp-904212-add-missing-mimetypes-to-impress.desktop.diff
ignore-sc_cellrangesbase-fails.diff
-mozilla-profile-absolute-paths.diff
-more-robust-nss-initialization.diff
-fix-bean.diff
-wiki-publisher-add-missing-xsls.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/e1suq52-00036t...@vasks.debian.org
