[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.2-5-21-gf2cf527
The following commit has been merged in the debian-experimental-3.5 branch:
commit f2cf5278789b4d1ee7b3886a432bd730de7e9f90
Merge: eb62a2fd8d10d27ff8c5cc14645e7d083582f32c 11cfb9e8267b066f071ebd161210c69d88c6344f
Author: Rene Engelhard <rene@debian.org>
Date: Thu Apr 26 20:58:44 2012 +0200
Merge remote-tracking branch 'origin/master' into HEAD
diff --combined changelog
index 5a61875,14c30a9..e6cf008
--- a/changelog
+++ b/changelog
@@@ -1,38 -1,27 +1,45 @@@
-libreoffice (1:3.5.2-6) UNRELEASED; urgency=low
++libreoffice (1:3.5.3~rc2-2) UNRELEASED; urgency=low
+
+ [ Björn Michaelsen ]
+ * add missing mimetypes to impress.desktop (LP: #904212)
+
- -- Rene Engelhard <rene@debian.org> Thu, 26 Apr 2012 12:07:01 +0200
++ -- Rene Engelhard <rene@debian.org> Thu, 26 Apr 2012 20:57:53 +0200
+
-libreoffice (1:3.5.2-5) unstable; urgency=low
+libreoffice (1:3.5.3~rc2-1) experimental; urgency=low
+
+ * new upstream release candidate
* debian/patches/gcc-4.4.dif: fix gtk3 build with gcc 4.4
* debian/rules:
- - build-depend on new g++-mingw-w64-i686 instead of the whole thing
- - use gcc 4.4 on mips(el)
- 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
+ - use gcc 4.4 on mips a) for consistency b) as 3.5.3~rc1-1 bus errord on
+ ball, too
- readd move of libdbalo.so to -base-core (closes: #670350)
* debian/shell-lib-extension.sh: also set HOME to $INSTDIR for unopkg
(as -env=UserInstallation doesn't work (anymore) - closes: #669271
* debian/libreoffice-common.postrm.in: fix typo to actually try to rm -rf
/var/lib/libreoffice/share/prereg
- -- Rene Engelhard <rene@debian.org> Wed, 25 Apr 2012 03:35:18 +0200
+ -- Rene Engelhard <rene@debian.org> Wed, 25 Apr 2012 03:09:29 +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 ...
+ * debian/libreoffice-common.links.in: ... here again as we need to
+ subsitute @OODIR@ (closes: #669138)
+
+ [ Björn Michaelsen ]
+ * add visio mimetype to libreoffice draw desktop file
+
+ -- Rene Engelhard <rene@debian.org> Sat, 21 Apr 2012 15:54:28 +0200
libreoffice (1:3.5.2-4) unstable; urgency=medium
diff --combined control
index 2b2413b,f4a5abc..2a9e412
--- a/control
+++ b/control
@@@ -193,7 -193,7 +193,7 @@@ Description: office productivity suite
Package: libreoffice-base-core
Architecture: alpha amd64 hppa i386 ia64 mips mipsel s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: libreoffice-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
- Replaces: libreoffice-base (<< 1:3.5.3~rc2-2)
-Replaces: libreoffice-base (<< 1:3.5.2-5)
++Replaces: libreoffice-base (<< 1:3.5.3~rc2-1)
Suggests: libreoffice-base
Description: office productivity suite -- shared library
LibreOffice is a full-featured office productivity suite that provides
diff --combined control.in
index 5b00448,98ba36c..d48ebd5
--- a/control.in
+++ b/control.in
@@@ -315,7 -315,7 +315,7 @@@ Architecture: %OOO_BASE_ARCHS
Depends: libreofficeVER-core (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
- Replaces: libreofficeVER-base (<< 1:3.5.3~rc2-2)
-Replaces: libreofficeVER-base (<< 1:3.5.2-5)
++Replaces: libreofficeVER-base (<< 1:3.5.3~rc2-1)
Suggests: libreofficeVER-base
Description: office productivity suite -- shared library
LibreOffice is a full-featured office productivity suite that provides
diff --combined patches/series
index f7f631a,9601dc4..70407c2
--- a/patches/series
+++ b/patches/series
@@@ -20,16 -20,22 +20,17 @@@ 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
tests-fix-build-with-jdk7.diff
lp-926940-visio-mime-for-draw.diff
gcc-4.4.diff
+ lp-904212-add-missing-mimetypes-to-impress.desktop.diff
--
LibreOffice packaging repository
Reply to: