The following commit has been merged in the ubuntu-oneiric-3.4 branch:
commit 5d1a4ad5db98c799c98654d6342698385f606067
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Wed Jul 27 13:20:56 2011 +0200
fix changelog merge breakage, make this 3.4.1-3ubuntu1
diff --git a/changelog b/changelog
index d534a32..8eff952 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.4.1-3ubuntu1~ppa1) UNRELEASED; urgency=low
+libreoffice (1:3.4.1-3ubuntu1) oneiric; urgency=low
* merge from Debian
- remove libebook patch, has been picked up by debian
@@ -30,7 +30,7 @@ libreoffice (1:3.3.3-1ubuntu1) natty; urgency=medium
-- Bjoern Michaelsen <bjoern.michael...@canonical.com> Fri, 24 Jun 2011
15:48:15 +0200
-libreoffice (1:3.4.1-3) UNRELEASED; urgency=low
+libreoffice (1:3.4.1-3) experimental; urgency=low
* debian/patches/fix-bridges-cpp-uno-depends.diff: fix mising depends in
bridges' build.lst which can cause FTBFS on s390(x), arm, ia64, hppa, alpha
--
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/e1qm2bf-0003fg...@vasks.debian.org
