The following commit has been merged in the debian-experimental-3.7 branch:
commit 858553d7068a9e4ae8a0922b0cf0a806e5f84eb5
Author: Rene Engelhard <r...@debian.org>
Date: Tue Oct 16 06:07:28 2012 +0200
git update; depend on/recommend python-uno for pyfax
diff --git a/changelog b/changelog
index 4809d1f..30433c3 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.7.0~alpha0~git20121008-1) UNRELEASED; urgency=low
+libreoffice (1:3.7.0~alpha0~git20121015-1) UNRELEASED; urgency=low
* new upstream snapshot
- contains new driver for mozab (mork). Automatically enabled thus
@@ -11,7 +11,7 @@ libreoffice (1:3.7.0~alpha0~git20121008-1) UNRELEASED;
urgency=low
- use gstreamer1.0
* debian/uno-libs3.symbols: update
- -- Rene Engelhard <r...@debian.org> Mon, 08 Oct 2012 21:32:03 +0200
+ -- Rene Engelhard <r...@debian.org> Mon, 15 Oct 2012 14:43:23 +0200
libreoffice (1:3.6.3~rc1-1) experimental; urgency=low
diff --git a/control b/control
index c7178ad..d7d8215 100644
--- a/control
+++ b/control
@@ -16,7 +16,7 @@ Homepage: http://www.libreoffice.org
Package: libreoffice
Architecture: amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe
ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Section: metapackages
-Depends: libreoffice-core (= ${binary:Version}), libreoffice-writer,
libreoffice-calc, libreoffice-impress, libreoffice-draw, libreoffice-math,
libreoffice-base, libreoffice-report-builder-bin [!hppa !kfreebsd-amd64
!kfreebsd-i386], ttf-dejavu, ttf-sil-gentium-basic,
libreoffice-filter-mobiledev, ${java-common-depends}, ${misc:Depends}
+Depends: libreoffice-core (= ${binary:Version}), libreoffice-writer,
libreoffice-calc, libreoffice-impress, libreoffice-draw, libreoffice-math,
libreoffice-base, libreoffice-report-builder-bin [!hppa !kfreebsd-amd64
!kfreebsd-i386], ttf-dejavu, ttf-sil-gentium-basic,
libreoffice-filter-mobiledev, python-uno, ${java-common-depends},
${misc:Depends}
Recommends: ttf-liberation | ttf-mscorefonts-installer, libpaper-utils
Suggests: hunspell-dictionary, myspell-dictionary,
libreoffice-help-${help-l10n-virtual-version},
libreoffice-l10n-${help-l10n-virtual-version}, unixodbc, cups-bsd, libsane,
hyphen-hyphenation-patterns, mythes-thesaurus, libreoffice-grammarcheck,
libxrender1, libgl1, libreoffice-gnome | libreoffice-kde, iceweasel | firefox |
icedove | thunderbird | iceape-browser | mozilla-browser,
${java-runtime-depends}, openclipart-libreoffice, pstoedit, imagemagick |
graphicsmagick-imagemagick-compat, ${gstreamer-plugins-suggests},
${ooo-binfilter-dep}, ${ooo-officebean-dep}
Description: office productivity suite (metapackage)
@@ -107,7 +107,7 @@ Architecture: all
Pre-Depends: dpkg (>= 1.15.7.2~)
Depends: libreoffice-style-default | libreoffice-style, ${misc:Depends}, ure
Suggests: libreoffice-style-hicontrast, libreoffice-style-tango,
libreoffice-style-crystal, libreoffice-style-oxygen
-Recommends: xfonts-mathml, ${textcat-data-recommends}
+Recommends: xfonts-mathml, python-uno, ${textcat-data-recommends}
Conflicts: libtextcat-data (<< 2.2-8), broffice, openoffice.org-common (<<
1:3.3.0~)
Provides: libreoffice-l10n-en-us
Breaks: libreoffice-style-crystal (<< 1:${oover}~),
diff --git a/control.in b/control.in
index 61eaa6a..203c1a4 100644
--- a/control.in
+++ b/control.in
@@ -58,6 +58,7 @@ Depends: libreofficeVER-core (= ${binary:Version}),
ttf-dejavu,
ttf-sil-gentium-basic,
libreofficeVER-filter-mobiledev,
+ python-uno,
${java-common-depends},
${misc:Depends}
Recommends: ttf-liberation | ttf-mscorefonts-installer, libpaper-utils
@@ -203,6 +204,7 @@ Suggests: libreofficeVER-style-hicontrast,
libreofficeVER-style-crystal,
libreofficeVER-style-oxygen
Recommends: xfonts-mathml,
+ python-uno,
${textcat-data-recommends}
Conflicts: libtextcat-data (<< 2.2-8),
broffice,
diff --git a/patches/build-dont-run-checks.diff
b/patches/build-dont-run-checks.diff
index 638874b..33f97b6 100644
--- a/patches/build-dont-run-checks.diff
+++ b/patches/build-dont-run-checks.diff
@@ -15,7 +15,7 @@ diff --git a/Makefile.top b/Makefile.top
index 7362bbc..ae849fb 100644
--- a/Makefile.top
+++ b/Makefile.top
-@@ -253,7 +254,7 @@ tomcat\
+@@ -252,7 +253,7 @@ sysui\
xpdf\
zlib\
@@ -23,8 +23,8 @@ index 7362bbc..ae849fb 100644
+export gb_TAILBUILDTARGET=all
define gbuild_module_rules
- .PHONY: $(1) $(1).all $(1).clean $(1).deliver
-@@ -529,7 +530,7 @@ findunusedcode:
+ .PHONY: $(1) $(1).all $(1).build $(1).check $(1).clean $(1).subsequentcheck
$(1).deliver
+@@ -549,7 +550,7 @@ findunusedcode:
| grep -v ^WSObject \
> unusedcode.easy
diff --git a/patches/py3uno-module.diff b/patches/py3uno-module.diff
index 01d8901..878a293 100644
--- a/patches/py3uno-module.diff
+++ b/patches/py3uno-module.diff
@@ -12,7 +12,7 @@ diff --git a/Repository.mk b/Repository.mk
index 3609d09..c0b11c2 100644
--- a/Repository.mk
+++ b/Repository.mk
-@@ -445,7 +445,9 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+@@ -463,7 +463,9 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
officebean \
package2 \
pyuno \
@@ -20,9 +20,9 @@ index 3609d09..c0b11c2 100644
pyuno_wrapper \
+ py3uno_wrapper \
recentfile \
+ librsvg-2-2 \
scriptframe \
- sdbc2 \
-@@ -555,6 +557,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
+@@ -568,6 +570,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
OGLTrans \
passwordcontainer \
pythonloader \
--
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/e1to9pt-0007hy...@vasks.debian.org
