The following commit has been merged in the debian-wheezy-3.5 branch:
commit b6aea9947085fbcb3e06b5f25fd8e2a76a2ea1ef
Merge: 725bbf979850da0897dc810ab55f0e845bf8f63c
d0a79990bc89822f74b94e82626cbcd02a3ab2b9
Author: Rene Engelhard <[email protected]>
Date: Sun Apr 7 15:35:13 2013 +0200
Merge branch 'master' into debian-wheezy-3.5
Conflicts:
changelog
diff --combined changelog
index a966c68,11d07ee..989eeb2
--- a/changelog
+++ b/changelog
@@@ -1,4 -1,11 +1,4 @@@
-libreoffice (1:3.5.4+dfsg2-2) UNRELEASED; urgency=low
-
- * debian/patches/oosplash-wait-for-ProcessingDone.diff: backport from 3.6;
- make oosplash wait for InternalIPC::ProcessingDone (closes: #681185)
-
- -- Rene Engelhard <[email protected]> Sun, 07 Apr 2013 15:33:36 +0200
-
-libreoffice (1:3.5.4+dfsg2-1) unstable; urgency=low
+libreoffice (1:3.5.4+dfsg2-0+deb7u1) UNRELEASED; urgency=low
* src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip: remove
lib/servlet.jar..
@@@ -8,12 -15,12 +8,14 @@@
* debian/patches/odk-link-to-jdk-1.5-docs.diff: link to
http://java.sun.com/j2se/1.5/docs/api instead of /1.4.1/ as the former
doesn't exist anymore
++ * debian/patches/oosplash-wait-for-ProcessingDone.diff: backport from 3.6;
++ make oosplash wait for InternalIPC::ProcessingDone (closes: #681185)
* debian/control.in:
- remove bogus | python3-uno dependency alternatives. Will properly be
back
with LO 4.0 which supports python3
-- -- Rene Engelhard <[email protected]> Mon, 18 Mar 2013 22:39:11 +0100
++ -- Rene Engelhard <[email protected]> Sun, 07 Apr 2013 15:33:36 +0200
libreoffice (1:3.5.4+dfsg-4) unstable; urgency=medium
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
