[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.3_rc1-1-3-gc38c2ba
The following commit has been merged in the debian-experimental-3.5 branch:
commit c38c2bafc85f55e31c7293f3f44aaf8762d3ec9a
Merge: 4b53540e6e62143be7cb65e3d37769ef3fc3488c 68da1e3b954daba9974076e090b378ea82eda098
Author: Rene Engelhard <rene@debian.org>
Date: Mon Apr 23 21:43:44 2012 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-3.5
diff --combined changelog
index 30dc859,87305c3..5f3d5ac
--- a/changelog
+++ b/changelog
@@@ -1,17 -1,9 +1,19 @@@
-libreoffice (1:3.5.2-5) UNRELEASED; urgency=low
+libreoffice (1:3.5.3~rc1-2) UNRELEASED; urgency=low
- [ Rene Engelhard ]
+ * debian/patches/gcc-4.4.dif: fix gtk3 build with gcc 4.4
+
* debian/rules:
+ - only ship (and build) unowinreg.dll for i386/amd64. Probably not used
+ on other archs and it saves us the g++-mingw-w64-i686 build-dep there
+
+ -- Rene Engelhard <rene@debian.org> Mon, 23 Apr 2012 00:21:22 +0200
+
+libreoffice (1:3.5.3~rc1-1) experimental; urgency=low
+
+ * new upstream release candidate
+
+ [ Rene Engelhard ]
+ * debian/rules:
- build-depend on new g++-mingw-w64-i686 instead of the whole thing
- use gcc 4.4 on mipsel
* debian/libreoffice-common.links: move ...
@@@ -21,7 -13,7 +23,7 @@@
[ Björn Michaelsen ]
* add visio mimetype to libreoffice draw desktop file
- -- Rene Engelhard <rene@debian.org> Sun, 22 Apr 2012 18:22:33 +0200
+ -- Rene Engelhard <rene@debian.org> Sat, 21 Apr 2012 15:54:28 +0200
libreoffice (1:3.5.2-4) unstable; urgency=medium
diff --combined patches/series
index 5a43c8d,6c29963..f7f631a
--- a/patches/series
+++ b/patches/series
@@@ -20,15 -20,21 +20,16 @@@ make-pyuno-work-with-system-wide-module
search-usr-share-for-images.diff
make-package-modules-not-suck.diff
fix-ARM-detection-in-set-soenv.diff
propagate-gb_FULLDEPS.diff
disable-unoapi-subsequentcheck-for-now.diff
mediwiki-oor-replace.diff
-armhf-bridges.diff
-armhf-bridges-fix-armv4t-armel.diff
move-binfilter-mimetypes-in-extra-desktop-file.diff
pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff
-armhf-bridges-doubles.diff
debian-hardened-buildflags.diff
gtk3-hack-explicit-gmodule.diff
gcc-4.7.diff
gcc-4.7-i386.diff
gcc-4.7-amd64.diff
-icu-4.9.diff
tests-fix-build-with-jdk7.diff
lp-926940-visio-mime-for-draw.diff
+ gcc-4.4.diff
--
LibreOffice packaging repository
Reply to: