The following commit has been merged in the debian-experimental-3.5 branch:
commit f17acc619cffb686e771d8fb9342e91afeeabf05
Merge: 1bd75db4beb44a227d3aa6faf7967de9c195da1c 
8ee0d6e1af0816d6043751bb88fc9f9ead148944
Author: Rene Engelhard <[email protected]>
Date:   Mon May 14 22:10:54 2012 +0200

    Merge remote-tracking branch 'origin/master' into debian-experimental-3.5

diff --combined changelog
index a8f61e0,1bc3eeb..d0ee040
--- a/changelog
+++ b/changelog
@@@ -1,9 -1,3 +1,9 @@@
 +libreoffice (1:3.5.4~rc1~git20120513-1) UNRELEASED; urgency=low
 +
 +  * new upstream release candidate snapshot
 +
 + -- Rene Engelhard <[email protected]>  Tue, 08 May 2012 11:37:43 +0200
 +
  libreoffice (1:3.5.3-3) UNRELEASED; urgency=low
  
    [ Rene Engelhard ]
@@@ -11,6 -5,9 +11,9 @@@
      make .IGNORE actually work
    * debian/patches/wiki-publisher-add-missing-xsls.diff:
      add missing .xsls for -wiki-publisher 
+   * debian/rules:
+     - (temporarily) stop building -gcj even on kfreebsd-* to be able to get 
into
+       testing (otherwise gcc-defaults is blocking...)
  
    [ Andreas Beckmann ]
    * debian/shell-lib-extension.sh: set HOME to $INSTDIR also for

-- 
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]

Reply via email to