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

[libreoffice] 01/01: Merge remote-tracking branch 'origin/master' into debian-experimental-5.2



This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.2
in repository libreoffice.

commit c1bba56706cfd7bcd9a50a252e964f9ef12251a8
Merge: 11d46ed d1c0865
Author: Rene Engelhard <rene@debian.org>
Date:   Wed May 4 23:20:30 2016 +0200

    Merge remote-tracking branch 'origin/master' into debian-experimental-5.2
    
    Conflicts:
    	patches/series

 changelog                  |  5 -----
 control                    | 16 ++++++++--------
 patches/series             |  1 -
 patches/zh-l10n-names.diff | 15 ---------------
 4 files changed, 8 insertions(+), 29 deletions(-)

diff --cc changelog
index d2af3cd,4ef1312..fe30610
--- a/changelog
+++ b/changelog
@@@ -1,10 -1,5 +1,5 @@@
 -libreoffice (1:5.1.3~rc1-2) UNRELEASED; urgency=medium
 +libreoffice (1:5.2.0~alpha1-2) UNRELEASED; urgency=medium
  
-   * debian/patches/zh-l10n-names.diff: update zh-* in lo-xlate-lang
-     zh-CN:chinese_simplified -> zh-CN:chinese_china
-     zh-TW:chinese_traditional -> zh-TW:chinese_taiwan
-     (closes: #823429)
- 
    * debian/rules:
      - print error in control without gcj-jdk installed
      - don't try to run set GCJ_JAWT_DEPENDS if GCJ_VERSION is unset
diff --cc patches/series
index feb47ec,dbaa342..d75739c
--- a/patches/series
+++ b/patches/series
@@@ -28,5 -29,9 +28,4 @@@ hppa-is-32bit.dif
  gcj-no-bitness-check.diff
  rsc-no-error-about-unknown-switch.diff
  debian-branding.diff
 -disable-npapi-plugin-support.diff
 -gcc-6.diff
 -bash-completion-dir.diff
 -OPENCL_DLL_NAME.diff
  no-packagekit-per-default.diff
- zh-l10n-names.diff
 -liborcus-0.11.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git


Reply to: