[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.4_rc2-1-8-g3e7e2f6



The following commit has been merged in the debian-experimental-3.5 branch:
commit 3e7e2f667bfb44e8af5642fe36204c88df55cf3c
Merge: e8b16bb0c74ea108dad38e21975370833e035e4b f1beffb7c13b2c5a81aa514096b730fb003c0224
Author: Rene Engelhard <rene@debian.org>
Date:   Sat Jun 2 00:54:36 2012 +0200

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

diff --combined changelog
index 935f214,a6b77e5..ecf0fca
--- a/changelog
+++ b/changelog
@@@ -1,31 -1,26 +1,34 @@@
 -libreoffice (1:3.5.3-6) UNRELEASED; urgency=low
 +libreoffice (1:3.5.4-1) UNRELEASED; urgency=low
  
 -  * merge from Ubuntu:
 -    - add control tags as per 'firefox distro add-on support'-spec 
 +  * LibreOffice 3.5.4 final (identical to rc2)
  
 - -- Rene Engelhard <rene@debian.org>  Sat, 02 Jun 2012 00:52:01 +0200
 +  * debian/patches/tests-fix-build-with-jdk7.diff: backport root fix
 +    7e6a58014864ddafe534ed7a08ecca75fa4e4860 from libreoffice-3-5;
 +    remove other parts ...
 +  * debian/patches/jdk7.diff: ... and move here. Also add internal hsqldb
 +    buildfix.
  
 -libreoffice (1:3.5.3-5) unstable; urgency=low
++  * merge from Ubuntu:
++    - add control tags as per 'firefox distro add-on support'-spec 
+ 
 -  * debian/rules:
 -    - don't specify --with-system-mozilla-headers if not building
 -      the nsplugin... 
 + -- Rene Engelhard <rene@debian.org>  Thu, 31 May 2012 23:32:29 +0200
  
 - -- Rene Engelhard <rene@debian.org>  Tue, 22 May 2012 14:56:19 +0200
 +libreoffice (1:3.5.4~rc2-1) experimental; urgency=low
  
 -libreoffice (1:3.5.3-4) unstable; urgency=low
 +  * new upstream release candidate
  
    * debian/rules: 
      - really disable -gcj package completely (not just empty package) 
      - surrender and disable mozilla plugin. broken again for whatever
        non-LO reason.
  
 - -- Rene Engelhard <rene@debian.org>  Mon, 21 May 2012 18:19:22 +0200
 + -- Rene Engelhard <rene@debian.org>  Sat, 26 May 2012 10:36:27 +0200
 +
 +libreoffice (1:3.5.4~rc1-1) experimental; urgency=low
 +
 +  * new upstream release candidate
 +
 + -- Rene Engelhard <rene@debian.org>  Thu, 17 May 2012 23:24:57 +0200
  
  libreoffice (1:3.5.3-3) unstable; urgency=low
  

-- 
LibreOffice packaging repository


Reply to: