The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 0d3178ea6fd0e598559e9dc5fcc1e44861c437ce
Merge: b546aed02b670d20b0e9c24cc1d5902c9a15309c 
ba43a3b1e9e7bab95c6b6c39ba613a19d9cee41a
Author: Rene Engelhard <r...@debian.org>
Date:   Mon Jul 18 21:34:22 2011 +0200

    Merge remote branch 'origin/master' into debian-experimental-3.4.0

diff --combined changelog
index 71243f7,48d0b59..cd50c8c
--- a/changelog
+++ b/changelog
@@@ -1,63 -1,7 +1,64 @@@
 -libreoffice (1:3.3.3-5) UNRELEASED; urgency=low
 +libreoffice (1:3.4.1-2) UNRELEASED; urgency=low
  
 -  * debian/patches/update-debian-opt.diff: call dpkg-buildflags correctly
 +  [ Rene Engelhard ]
 +  * debian/libreoffice-common.postinst.in, libreoffice-core.postinst.in,
 +    debian/shell-lib-components.sh:
 +    check for /@OOBASISDIR@/program/.services.rdb before uisng it
 +    (closes: #633396) and replace manual call of the function by
 +    dpkg-trigger. Also run the trigger in -cores postinst
 +    (thanks Jonathan Nieder)
 +  * debian/control.in:
 +    - make new -common break old -evolution/-filter-binfilter
 +  * debian/rules:
 +    - also -Xlibreoffice-dbg on jh_depends... (closes: #633540)
 +    - update ENABLE_OPENGL configure flags, now --enable-opengl is default
 +      upstream
 +    - fix build with make 3.82: remove space after, in $(call
 +    - fix -javafilter.destop Exec=
++  * debian/copyright: s/Specificatin/Specification/, thanks Jakub Wilk
 +
 +  [ Nelson A. de Oliveira ]
 +  * debian/*menu.in, debian/*mime:
 +    - Fix deprecated options when calling soffice and libreoffice
 +     (closes: #634001)
 + 
 + -- Rene Engelhard <r...@debian.org>  Mon, 18 Jul 2011 18:58:14 +0000
  
 +libreoffice (1:3.4.1-1) experimental; urgency=low
 +
 +  * new upstream release
 +    - handles various table columns differing in case correct
 +      (closes: #617596)
 +    - should fix embedding of (some) fonts in PDFs (closes: #616117)
 +    - (still) use libreoffice-build for now; not tagged,
 +      use 069b0a4b4f052255c97ece23f0e37be85921fe27
 +
 +  * debian/patches/debian-debug.diff: readd option to build with small
 +    symbols (removed upstream), otherwise we get a too big -dbg (760M, 2G I-S)
 +  * debian/patches/update-debian-opt.diff: call dpkg-buildflags correctly
 + 
 +  * debian/rules:
 +    - bump build-dep on libmdds-dev to >= 0.5.0
 +    - build-depend on libgraphite2-dev instead of libgraphite-dev
 +    - update for new extension and mingw configure switches
 +    - temprarily don't install gengal, not built anymore since the switch to
 +      GNU Make...
 +    - install .component files to registered-components
 +    - build-dep on translate-toolkit, now needed for translations module
 +  * debian/control.sdk.in, debian/rules: 
 +    - stop building with STLport on i386, just create a symlink in ure.
 +      Should suffice for compat with binary-only OOo extensions
 +  * debian/control.in, debian/rules:
 +     - the script providers are now extensions. split js and bsh out into
 +       extra packages (also closes: #603595)
 +  * debian/uno-libs3.symbols: update 
 +  * debian/rules, debian/patches/packcomponents-remove-split-components.diff: 
 +    remove evoab, binfilter and kdeab deregistering into patch patching
 +    the new packcomponents
 +  * debian/shell-lib-components.sh: add new update_services_rdb() merging
 +    "default" services.rdb and the .component files from registered-components
 +  * debian/libreoffice-common.triggers.in, libreoffice-*.p*.in:
 +    new trigger running update_services_rdb, remove obsolete maintainer 
scripts
    * debian/changelog: mention VU#953183/CVE-2011-2685 in 1:3.3.3-1
    * debian/control.in:
      - fix description: s/libreoffice-hyphenation/hyphen/,
@@@ -65,11 -9,14 +66,11 @@@
    * debian/rules:
      - don't try to change libreoffice-base when we don't built it
      - build-depend on javahelper (>= 0.37) and use -s
    * debian/source.lintian-overrides:
      - override new libreoffice source: dh_pycentral-is-obsolete line 3214
        and libreoffice source: dh_python-is-obsolete line 3223
 -    - also -Xlibreoffice-dbg on jh_depends...
 -  * debian/copyright: s/Specificatin/Specification/, thanks Jakub Wilk
  
 - -- Rene Engelhard <r...@debian.org>  Mon, 18 Jul 2011 11:39:49 +0000
 + -- Rene Engelhard <r...@debian.org>  Wed, 06 Jul 2011 16:00:18 +0200
  
  libreoffice (1:3.3.3-4) unstable; urgency=low
  
@@@ -108,7 -55,7 +109,7 @@@ libreoffice (1:3.3.3-2) unstable; urgen
      - move evolocal.odb into -evolution proper
      - use OpenJDK on mips(el), seems to work. (ia64 still SIGSEGVs)
    * debian/libreoffice-filter-binfilter.links.in: actually create symlink
 -    for libbindet*so in registered-components 
 +    for libbindet*so in registered-components
    * debian/control.in:
      - move libpaper-utils from Suggests to Recommends
      - fix libreoffice Description: - -filter-binfilter is not installed
@@@ -116,7 -63,7 +117,7 @@@
    * debian/control.in, debian/rules: move libpq-dev builddep to a
      conditional
    * debian/rules, debian/control*in:
 -    - run jh_depends and add ${java:Depends} where we have Java 
 +    - run jh_depends and add ${java:Depends} where we have Java
  
   -- Rene Engelhard <r...@debian.org>  Wed, 29 Jun 2011 10:03:21 +0200
  
@@@ -131,7 -78,7 +132,7 @@@ libreoffice (1:3.3.3-1) unstable; urgen
      toolbars work in e.g. Base edit forms (closes: #617319)
  
    * debian/rules:
 -    - disable -sdbc-postgresql until fixed (closes: #620100) 
 +    - disable -sdbc-postgresql until fixed (closes: #620100)
      - stop moving vbaevents*.uno.so to -calc. Move libvbaswobj*uno.so
        to -writer
      - make -l10n-sw (if enabled) depend on locales (>= 2.13-5)

-- 
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/e1qityk-0007sk...@vasks.debian.org

Reply via email to