[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.1



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

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

commit ca0a61164dc39a55b6e1dce7d0e94ef68ac51007
Merge: d7bcc9a 8be3224
Author: Rene Engelhard <rene@debian.org>
Date:   Tue Dec 1 11:59:06 2015 +0100

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

 changelog             |  10 +-
 patches/poms.diff     | 322 ++++++++++++++++++++++++++++++++++++++++++++++++++
 patches/series        |   1 +
 pom.juh.xml.in        |  33 ------
 pom.jurt.xml.in       |  33 ------
 pom.officebean.xml.in |  33 ------
 pom.ridl.xml.in       |  33 ------
 pom.unoil.xml.in      |  33 ------
 pom.unoloader.xml.in  |  33 ------
 rules                 |  17 ++-
 10 files changed, 340 insertions(+), 208 deletions(-)

diff --cc changelog
index f206af9,51d13d3..9e3df70
--- a/changelog
+++ b/changelog
@@@ -9,38 -9,35 +9,40 @@@ libreoffice (1:5.1.0~beta1-1) experimen
        (but lloconv works) with merged libs
      - remove checkBookmarks disabling, should work now according to
        upstream
+   * debian/patches/poms.diff: add "official" upstream poms
  
 -  * debian/rules: add sparc64 to OOO_ARCHS
 +  * debian/rules:
 +    - fix up .desktop (closes: #804669), remove (D|d)ev and version from
 +      Icon= and Exec=
 +    - re-enable checks
 +    - add sparc64 to OOO_ARCHS
  
    * debian/scripts/get_ttf_version.pl, debian/rules: drop fontforge B-D-I;
      use pure perl for determining the version; taken from upstreams win
      installer
  
    * debian/rules:
 -    - fix tests with libetonyek 0.1.4; mv
 -      writerperfect/qa/unit/data/impress/libetonyek/fail/v6.zip to pass
 +    - re-enable avahi
  
-   * debian/pom.unoloader.xml.in, debian/ure.poms, debian/rules: also
-     install ures unoloader.jar into maven
-   * debian/pom.officebean.xml.in, debian/libreoffice-officebean.poms,
-     debian/rules: also install officebean.jar into maven
+   * debian/ure.poms, debian/rules: also install ures unoloader.jar into maven
+   * debian/libreoffice-officebean.poms, debian/rules: also install
+     officebean.jar into maven
+   * debian/*.pom.in, debian/rules: remove own poms and create final poms
+     with version from upstreams one
  
 - -- Rene Engelhard <rene@debian.org>  Tue, 01 Dec 2015 07:38:27 +0100
 + -- Rene Engelhard <rene@debian.org>  Tue, 01 Dec 2015 07:44:09 +0100
  
 -libreoffice (1:5.0.3~rc2-1) unstable; urgency=medium
 +libreoffice (1:5.1.0~alpha1-4) experimental; urgency=medium
  
 -  * New upstream release candidate
 +  * debian/rules:
 +    - work around the experimental buildds' resolver bug installing
 +      experimental packages per default where they shouldn't and add
 +      firebird-dev (>= 3.0) Build-Conflicts:
  
 -  * debian/patches/icu-56.diff: prepare for ICU 56; fix FTBFS with new
 -    charmaps; backported from master
 + -- Rene Engelhard <rene@debian.org>  Sun, 08 Nov 2015 10:04:31 +0100
 +
 +libreoffice (1:5.1.0~alpha1-3) experimental; urgency=medium
  
 -  * debian/rules:
 -    - remove l10ntools build hack again, now obsolete
    * debian/control{.sdk}.in, debian/rules, debian/libreoffice-dev-doc.links:
      - stop moving the SDK docs into libreoffice-devs /usr/share/doc (and move
        the stuff installed into /usr/share/doc/libreoffice/sdk in libreoffice-dev
diff --cc patches/series
index 504f0e1,d4d3c14..d15bf09
--- a/patches/series
+++ b/patches/series
@@@ -27,4 -28,7 +27,5 @@@ odk-no-dot.dif
  hppa-is-32bit.diff
  gcj-no-bitness-check.diff
  rsc-no-error-about-unknown-switch.diff
 -liborcus-0.9.1.diff
  debian-branding.diff
 -icu-56.diff
+ poms.diff

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


Reply to: