The following commit has been merged in the debian-experimental-3.4.0 branch:
commit c5009e144158a4a24ffb8263d08c8e64c8ee7881
Author: Rene Engelhard <r...@debian.org>
Date: Mon Jul 18 13:41:49 2011 +0000
fix bad merge in changelog
diff --git a/changelog b/changelog
index ac96f35..42b0dc7 100644
--- a/changelog
+++ b/changelog
@@ -13,6 +13,7 @@ libreoffice (1:3.4.1-2) UNRELEASED; urgency=low
- also -Xlibreoffice-dbg on jh_depends... (closes: #633540)
- update ENABLE_OPENGL configure flags, now --enable-opengl is default
upstream
+ - fix build with make 3.82: remove space after, in $(call
[ Nelson A. de Oliveira ]
* debian/*menu.in, debian/*mime:
@@ -63,11 +64,9 @@ libreoffice (1:3.4.1-1) experimental; urgency=low
* debian/rules:
- don't try to change libreoffice-base when we don't built it
- build-depend on javahelper (>= 0.37) and use -s
- - fix build with make 3.82: remove space after, in $(call
* debian/source.lintian-overrides:
- override new libreoffice source: dh_pycentral-is-obsolete line 3214
and libreoffice source: dh_python-is-obsolete line 3223
- - also -Xlibreoffice-dbg on jh_depends...
-- Rene Engelhard <r...@debian.org> Wed, 06 Jul 2011 16:00:18 +0200
--
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/e1qio3l-0003lk...@vasks.debian.org
