The following commit has been merged in the master branch:
commit 6f5b5eb16e87480efd616398ef396b0da93ca9af
Author: Rene Engelhard <r...@debian.org>
Date: Fri Apr 13 20:27:29 2012 +0200
(re-)close #666523 and #668193
diff --git a/changelog b/changelog
index b997c15..966c8ca 100644
--- a/changelog
+++ b/changelog
@@ -24,10 +24,11 @@ libreoffice (1:3.5.2-4) UNRELEASED; urgency=low
* debian/control.in:
- readd libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
conflicts again (lost when moved to -script-provider-python) to help
- upgrades
+ upgrades (closes: #666523)
- make libreoffice-core Pre-Depend on ure
* debian/debian/shell-lib-extensions.sh: run unopkg list before trying
to sync; hopefully catches cases where unopkg doesn't (yet) work
+ (closes: #668193)
-- Rene Engelhard <r...@debian.org> Thu, 12 Apr 2012 21:55:44 +0200
diff --git a/patches/comphelper-complex-test-fix-jdk7.diff
b/patches/tests-fix-build-with-jdk7.diff
similarity index 100%
rename from patches/comphelper-complex-test-fix-jdk7.diff
rename to patches/tests-fix-build-with-jdk7.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/e1sj7pa-0001ki...@vasks.debian.org
