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

[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.6.5-1-32-gd438d96



The following commit has been merged in the debian-experimental-3.6 branch:
commit d438d962ffdd9bcdfd82a7bab68511149c39788b
Merge: 65c318d3faa03b346288a5af1c1c2924f132443d 8978fb72223a9cc42b439d7e0851561015c3911c
Author: Rene Engelhard <rene@debian.org>
Date:   Tue Mar 19 10:54:08 2013 +0100

    Merge remote-tracking branch 'origin/debian-experimental-3.5' into debian-experimental-3.6
    
    Conflicts:
    	changelog

diff --combined changelog
index 7188c22,17b855e..5b07cb7
--- a/changelog
+++ b/changelog
@@@ -1,114 -1,70 +1,114 @@@
 -libreoffice (1:3.5.7-1) UNRELEASED; urgency=low
 +libreoffice (1:3.6.6~rc1-1) UNRELEASED; urgency=low
  
 -  * new upstream release
 -    - caches fontconfig font substitutions (closes: #681308) 
 +  * new upstream release candidate
    
    * src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip: remove
      lib/servlet.jar..
  
 -  * debian/patches/poppler_0_2*.diff: fix build of sdext with poppler
 -    0.21.x and fix the test with 0.20.x, thanks Pino Toscano
    * 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/rules: 
 -    - use generic python3.pc in default case instead of pythonX.Y.pc.
 -      Use pythonX.Y.pc otherwise and actually make version-switching work. 
 -    - hack around broken "*" directory in debian/tmp/pkg on kfreebsd-*
 -      extremely slowing down the install target...
 -    - document truth and remove alpha from supported architectures
 -    - fix typo in finding gcj dir detection, thanks Rico Tzschichholz
 -    - don't add version from librsvg*.shlibs (as for libebook) as we
 -      dlopen() it anyway.
 -    - don't rely on dictionaries submodule. unused.
 +  * debian/*.mime:
 +    - don't use obsolete -no-oosplash anymore, thanks Matthijs Kooijman
 +      for the patch (closes: #698845)
 +    - revert make -help-en-us break "the others" to work around 682838
 +      as it breaks the installer (reopens: #682838) 
 +  * debian/copyright: update 
 +  * debian/control.mozilla.in: OOo -> "old OOo and OpenDocument"
 +    (closes: #699708)
    * debian/control.in:
 -    - remove obsolete sharutils, po-debconf and wget | curl build-deps
 -    - recommend fonts-liberation instead of ttf-liberation
 -      (closes: #691949)
      - remove bogus | python3-uno dependency alternatives. Will properly be back
--      with LO 4.0 which supportts python3
 -  * debian/control.mozilla.in, debian/rules: rename
 -    mozilla-libreoffice -> browser-plugin-libreoffice
 -  * debian/libreoffice-{core,gtk3}.bug-script.in: 
 -    - find out whether we have Experimental features enabled
++      with LO 4.0 which supports python3
 +  * debian/control.help.in:
 +    - remove obsolete ${java-common-depends} Recommends
  
 - -- Rene Engelhard <rene@debian.org>  Sat, 24 Nov 2012 18:31:33 +0100
 + -- Rene Engelhard <rene@debian.org>  Mon, 18 Mar 2013 23:50:23 +0100
  
 -libreoffice (1:3.5.4+dfsg2-1) UNRELEASED; urgency=low
 +libreoffice (1:3.6.5-1) experimental; urgency=low
  
 -  * debian/patches/fix-view-option.diff: backport fix to fix --view 
 -    from libreoffice-3-6 (closes: #697723)
 -  * 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
 +  * LibreOffice 3.6.5 release (idential to rc2)
  
 -  * debian/copyright: fix: ext-sources -> src
 -  * debian/control.in:
 -    - remove bogus | python3-uno dependency alternatives. Will properly be back
 -      with LO 4.0 which supports python3
 +  * debian/rules:
 +    - stop using lsb_release -cs, parse dpkg-parsechangelog instead.
 +      avoids the base-files issue.
 +  * debian/libreoffice-common.triggers.in, debian/rules:
 +    - fix trigger to actually be in effect
 +    - enable tr,vi help, fully translated according to
 +      https://gerrit.libreoffice.org/1895
 +
 + -- Rene Engelhard <rene@debian.org>  Mon, 28 Jan 2013 21:29:19 +0100
 +
 +libreoffice (1:3.6.5~rc2-1) experimental; urgency=low
 +
 +  * new upstream release candidate
 +     - fixes --view (closes: #697723)
 +
 +  * debian/rules:
 +    - make -help-en-us break "the others" to work around 682838
 +      (closes: #682838) 
 +    - temporarily remove wheezy backport conditionals as base-files would make
 +      us think we should build for wheezy right now
 +    - fix gdb helper installation; use upstreams install-gdb-printers
 +  * debian/rules, debian/*.triggers.in, debian/libreoffice-common.postinst.in:
 +    - re-introduce @OODIR@/share/extensions trigger as we still need to tell
 +      LO to sync if a subdir inside share/extension *changes*, but "touch" is
 +      enough now
 +
 + -- Rene Engelhard <rene@debian.org>  Wed, 16 Jan 2013 14:25:29 +0100
 +
 +libreoffice (1:3.6.4-1) experimental; urgency=low
 +
 +  * LibreOffice 3.6.4 release (identical to rc3) 
 +
 + -- Rene Engelhard <rene@debian.org>  Tue, 04 Dec 2012 23:23:10 +0100
 +
 +libreoffice (1:3.6.4~rc3-1) experimental; urgency=low
  
 - -- Rene Engelhard <rene@debian.org>  Mon, 18 Mar 2013 22:39:11 +0100
 +  * new upstream release candidate
  
 -libreoffice (1:3.5.4+dfsg-4) unstable; urgency=medium
 +  * debian/patches/poppler_0_21_x.diff: moove from poppler_0_21_0.diff; fix
 +    build with 0.21.1 again
 +  * debian/patches/bigendian-utext-mixup.diff: backport from libreoffice-3-6
 +    branch to fix ooxml regression test failure
  
 +  * debian/rules:
 +    - don't rely on dictionaries submodule. unused.
    * debian/control.in:
      - remove obsolete Pre-Depends on ure  (>= 1.5.1+OOo3.1.1-15)
        (by the way closes: #693626)
 +  * debian/control.mozilla.in, debian/rules: rename
 +    mozilla-libreoffice -> browser-plugin-libreoffice
 +
 + -- Rene Engelhard <rene@debian.org>  Wed, 28 Nov 2012 18:40:27 +0100
 +
 +libreoffice (1:3.6.4~rc1-1) experimental; urgency=low
 +
 +  * new upstream release candidate
 +
 +  * debian/patches/poppler_0_21_0.diff: fix build of sdext with poppler
 +    0.21.0
 +
 +  * merge from Ubuntu:
 +    - fix quoting of PYTHON_{CFLAGS,LIBS} (Matthias Klose) 
 +  * debian/rules:
 +    - mention CVE-2012-4233 in 1:3.6.1~rc2-1's changelog
 +    - re-enable mozilla plugin
 +    - actually make python version-switching work
 +  * debian/control.in:
 +    - recommend fonts-liberation instead of ttf-liberation
 +      (closes: #691949)
    * debian/libreoffice-core.bug-control:
      - report-with: fonts-opensymbol instead of transitional ttf-opensymbol
 +  * debian/libreoffice-{core,gtk3}.bug-script.in: 
 +    - find out whether we have Experimental features enabled
 +
 + -- Rene Engelhard <rene@debian.org>  Fri, 16 Nov 2012 22:20:37 +0100
  
 - -- Rene Engelhard <rene@debian.org>  Mon, 19 Nov 2012 00:36:51 +0100
 +libreoffice (1:3.6.3~rc2-1) experimental; urgency=low
  
 -libreoffice (1:3.5.4+dfsg-3) unstable; urgency=high
 +  * new upstream release candidate
  
 -  * debian/patches/ca-XV-update.diff: update ca-XV translations, thanks
 -    Jordi Mallach
 -  * debian/patches/CVE-2012-4233.diff: fix CVE-2012-4233.diff/HTB23106 
    * debian/patches/soffice-bashisms.diff: fix bashism in soffice for
      valgrinding (closes: #690717)
    * debian/patches/he-lucida-sans-unicode.diff: Update default Hebrew font
@@@ -117,140 -73,30 +117,140 @@@
      search paths (closes: #677601)
  
    * debian/rules:
 +    - fix upstream README(_en-US) install for binary-indep packages
 +    - fix typo in finding gcj dir detection, thanks Rico Tzschichholz
 +    - don't add version from librsvg*.shlibs (as for libebook) as we
 +      dlopen() it anyway.
 +
 + -- Rene Engelhard <rene@debian.org>  Fri, 26 Oct 2012 15:47:02 +0200
 +
 +libreoffice (1:3.6.3~rc1-1) experimental; urgency=low
 +
 +  * new upstream release candidate
 +
 +  [ Rene Engelhard ]
 +  * debian/patches/sensible-lomua.diff: add patch from Dave Steele to
 +    make senddoc.sh default to standard mailto handler (closes: #687228)
 +
 +  * debian/rules:
 +    - try again with gcc 4.6 for mips* since apparently testtools/smoketest
 +      now work..
 +    - document truth and remove alpha from supported architectures
      - exclude .desktop from dh_link call to get absolute symlinks
        (closes: #690336)
  
 - -- Rene Engelhard <rene@debian.org>  Mon, 22 Oct 2012 19:20:07 +0200
 +  [ Bjoern Michaelsen ]
 +  * make metapackage explicit in short description 
  
 -libreoffice (1:3.5.4+dfsg-2) unstable; urgency=low
 + -- Rene Engelhard <rene@debian.org>  Sun, 14 Oct 2012 17:07:23 +0200
 +
 +libreoffice (1:3.6.2~rc1-1) experimental; urgency=low
 +
 +  * new upstream release candidate
 +    - waits for InternalIPC::ProcessingDone in oosplash (closes: #681185)
 +
 +  * debian/patches/disable-flaky-unoapi-tests.diff: disable flaky
 +    toolkit and sc.ScAccessible* unoapi tests
 +  * debian/patches/gcj-safe-jni-h-include.diff: add missing -I...
 +  * debian/control.in:
 +    - make -core break libreoffice-common (<< 1:3.6.1~rc1) as "unopkg sync"
 +      ran in the triggers is gone (closes: #686666)
 +  * debian/rules:
 +    - fix native-jars dependeny to depend on install-common ... 
 +    - ... but as this doesn't build then disable it for now...
 +    - hack around broken "*" directory in debian/tmp/pkg on kfreebsd-*
 +      extremely slowing down the install target...
 +    - use xz compression for all binary packages (closes: #687041) 
 +
 + -- Rene Engelhard <rene@debian.org>  Fri, 14 Sep 2012 11:01:04 +0200
 +
 +libreoffice (1:3.6.1-1) experimental; urgency=low
 +
 +  * LibreOffice 3.6.1 final release (identical to rc2)
 +
 +  * debian/rules:
 +    - work around possible failure install-common target with missing
 +      ca-XV .dirs/.install...
 +
 + -- Rene Engelhard <rene@debian.org>  Mon, 27 Aug 2012 18:47:58 +0200
 +
 +libreoffice (1:3.6.1~rc2-1) experimental; urgency=low
 +
 +  * new upstream release candidate
 +    - fixes CVE-2012-4233 / HTB23106
 +
 +  * debian/patches/debian-debug.diff: patch new gb_SYMBOLS in unxgcc.mk to
 +    make ENABLE_SYMBOLS=SMALL (-g1) working again..
 +  * debian/patches/debian/patches/kfrebsd-add-missing-P_SEP.diff: fix Java build
 +    on kfreebsd (non-broken CLASSPATH)
 +
 +  * src/2ab442d169156f34c379c968f3f482dd-zlib-1.2.7.tar.bz2: remove
 +    zlib-1.2.7/doc/rfc195{0,1,2}.txt (closes: #685133)
 +
 +  * debian/rules:
 +    - save some space/build time: build only with en-US in build-arch first
 +      and build sdext/mysqlc (localized help/descriptions) manually with all
 +      languages after make check; remove buildd special-casing for
 +      languages
 +  * debian/control.fonts.in: remove ttf-opensymbol transitional package 
 +  * debian/control.in:
 +    - remove obsolete sharutils, po-debconf and wget | curl build-deps
 +
 + -- Rene Engelhard <rene@debian.org>  Thu, 23 Aug 2012 22:34:27 +0200
 +
 +libreoffice (1:3.6.1~rc1-2) experimental; urgency=low
 +
 +  * debian/rules:
 +    - revert "build-depend against libpng-dev instead of libpng12-dev"
 +      as it breaks on the buildds which install the libpng from experimental
 +      (fails GTK3 pkg-config test) (reopens: #662411)
 +    - fix build and install targets to prevent build-arch be called under
 +      fakeroot, thanks rleigh for the hints
  
 -  * use xz compression for all binary packages (closes: #687041) 
 + -- Rene Engelhard <rene@debian.org>  Sat, 18 Aug 2012 11:09:34 +0200
  
 - -- Rene Engelhard <rene@debian.org>  Sun, 09 Sep 2012 14:45:20 +0200
 +libreoffice (1:3.6.1~rc1-1) experimental; urgency=low
  
 -libreoffice (1:3.5.4+dfsg-1) unstable; urgency=low
 +  * new upstream release candidate
 +    - fixes splashscreen location in multi-monitor setups
 +      (closes: #657444, #431473)
 +    - caches fontconfig font substitutions (closes: #631308)
 +    - fixes dot handling in KDE File Picker (closes: #645946)
  
 -  * src/c735eab2d659a96e5a594c9e8541ad63-zlib-1.2.5.tar.gz: remove
 -    zlib-1.2.5/doc/rfc195{0,1,2}.txt (closes: #685133)
 +  * debian/patches/build-dont-run-checks.diff: as name says
  
    * debian/rules:
 -    - fix python3-dev builddep to >= 3.2; 3.1 had a different naming of
 -      the .pc (without "mu")
 +    - new conditionals for: doxygen, libcdr, liblcms2
 +    - remove liblucene2-java stuff; now clucene is used
 +    - build-depend on libxml2-utils, xmllint now needed
 +    - build-depend on liboost-date-time-date, we now link to boost...
 +    - build-depend against libpng-dev instead of libpng12-dev
 +      (closes: #662411)
 +    - remove squeeze-backports stuff, add wheezy-backports
 +    - install upstreams README(_en-US) (closes: #676340)
 +    - clean up some warnings:
 +      + readd /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/libfakeroot
 +        to LD_LIBRARY_PATH for dh_shlibdeps
 +      + don't run jh_depends -i/-a, use -p for each package, otherwise it
 +        gets confused by help.jar/s*.jar which is just zips, no "real" jar
 +    - switch to default-jdk, b-d on default-jdk (>= 1:1.7-48) on ia64 and
 +      check for "OpenJDK" in tests yes/no clause for JDK=default
 +    - add ENABLE_HELP conditional now that we have --without-help; also
 +      add the new --disable-extensions and --disable-database-connectivity to
 +      their respective places
 +    - split build into build-{arch,indep}
 +    - use generic python3.pc instead of pythonX.Y(mu).pc
 +  * debian/uno-libs3.symbols: update 
    * debian/libreoffice-common.links.in:
      - s/libreofficeoasis/libreoffice-oasis/, thanks Jakub Wilk
        (closes: #683784) 
 +  * debian/shell-lib-extensions.sh, debian/rules,
 +    debian/libreoffice-common.lintian.overrides.in: unopkg sync not
 +    necessary anymore; remove. javasettingsunopkginstall.xml also gone
 +  * debian/*.p*.in, debian/*.triggers.in: remove obsolete triggers and
 +    sync_extensions calls (closes: #677146)
  
 - -- Rene Engelhard <rene@debian.org>  Fri, 17 Aug 2012 14:45:26 +0200
 + -- Rene Engelhard <rene@debian.org>  Wed, 15 Aug 2012 13:52:20 +0200
  
  libreoffice (1:3.5.4-7) unstable; urgency=high
  

-- 
LibreOffice packaging repository


Reply to: