The following commit has been merged in the debian-experimental-3.5 branch:
commit 5303ecbd999f03081e31de0bf4615dfed3b96ad1
Author: Rene Engelhard <[email protected]>
Date: Thu Oct 13 12:06:04 2011 +0000
update for current snapshot and for new libexttextcat-data
diff --git a/changelog b/changelog
index 9677c63..7735ff3 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.5.0~git20110928-1) UNRELEASED; urgency=low
+libreoffice (1:3.5.0~git20111004-1) UNRELEASED; urgency=low
* new upstream snapshot
@@ -18,7 +18,7 @@ libreoffice (1:3.5.0~git20110928-1) UNRELEASED; urgency=low
- move from self-defined UPSTREAM_VERSION/ARCH etc. to use
/usr/share/dpkg/*.mk
- -- Rene Engelhard <[email protected]> Sun, 02 Oct 2011 21:23:16 +0000
+ -- Rene Engelhard <[email protected]> Tue, 04 Oct 2011 15:46:23 +0200
libreoffice (1:3.4.3-3) unstable; urgency=low
diff --git a/control b/control
index e09ff27..feca341 100644
--- a/control
+++ b/control
@@ -3,7 +3,7 @@ Section: editors
Priority: optional
Maintainer: Debian LibreOffice Maintainers <[email protected]>
Uploaders: Rene Engelhard <[email protected]>
-Build-Depends: lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip,
zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, libc0.1 (>=
2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev,
libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev,
libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev,
libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, libxkbfile-dev,
libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
libxml-parser-perl, gperf, po-debconf, bc, wget | curl, libgl1-mesa-dev [!armel
!mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>=
0.8.0), libgraphite2-dev (>= 0.9.3) [!armel !sparc], libtextcat-dev (>= 2.2-8),
libcurl4-gnutls-dev, libssl-dev, libdb-dev, dpkg-dev (>= 1.15.6), python (>=
2.6.6-3+squeeze4), python-dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12),
openjdk-6-jdk (>= 6b23~pre8-2) [alpha amd64 armel armhf i386 mips mipsel po
werpc powerpcspe ppc64 s390 s390x sparc], openjdk-7-jdk [ia64], gcj-jdk [hppa
kfreebsd-i386 kfreebsd-amd64], gcj-native-helper [hppa kfreebsd-amd64
kfreebsd-i386], libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386],
ant (>= 1.7.0), ant-optional (>= 1.7.0), gcc-mingw32, mingw32-runtime,
libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java,
libcommons-logging-java, libservlet2.5-java, libbase-java [!armel], libsac-java
[!armel], libxml-java (>= 1.1.6) [!armel], libflute-java (>= 1.1.6) [!armel],
libpentaho-reporting-flow-engine-java (>= 0.9.4) [!armel], liblayout-java (>=
0.2.10) [!armel], libloader-java (>= 1.1.6) [!armel], libformula-java (>=
1.1.7) [!armel], librepository-java (>= 1.1.6) [!armel], libfonts-java (>=
1.1.6) [!armel], libserializer-java (>= 1.1.6) [!armel],
libcommons-logging-java, libservlet2.5-java, javahelper (>= 0.37~),
xulrunner-dev, libnss3-dev (>= 3.12.3), dmake (>= 1:4.11), mono-devel (>=
2.4.2.3) [amd64 i386 ia64 kfreebs
d-amd64 kfreebsd-i386], libmono-dev (>= 2.4.2.3) [amd64 i386 ia64
kfreebsd-amd64 kfreebsd-i386], mono-utils (>= 2.4.2.3) [amd64 i386 ia64
kfreebsd-amd64 kfreebsd-i386], cli-common-dev (>= 0.5.7) [amd64 i386 ia64
kfreebsd-amd64 kfreebsd-i386], libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>=
2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38),
libmdds-dev (>= 0.5.0), libvigraimpex-dev, libwpd-dev (>= 0.9.0), libmythes-dev
(>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libicu-dev (>= 4.0),
libxslt1-dev, libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4.5),
libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libebook1.2-dev
[!armel], libpq-dev, libxrandr-dev, liblucene2-java (>= 2.3.2), libhsqldb-java
(>> 1.8.0.10), bsh (>= 2.0b4), liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve
(>= 5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>=
0.60), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>=
1.0.8),
libgtk2.0-dev (>= 2.10), libgnomevfs2-dev, libgconf2-dev, liborbit2-dev,
libldap2-dev
+Build-Depends: dpkg-dev (>= 1.16.1), lsb-release, bzip2, bison, flex |
flex-old, libxaw7-dev, unzip, zip, autoconf, automake, sharutils, pkg-config,
libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64],
zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev,
libxtst-dev, libice-dev, libsane-dev, libxrender-dev, libcups2-dev,
libarchive-zip-perl, libpng12-dev, libjpeg-dev, libxml2-dev, libexpat1-dev,
fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev,
unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, po-debconf, bc, wget |
curl, libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips
!mipsel], libpoppler-dev (>= 0.8.0), libpoppler-cpp-dev, libgraphite2-dev (>=
0.9.3) [!armel !sparc], libexttextcat-dev, libcurl4-gnutls-dev, libssl-dev,
librsvg2-dev, libdb-dev, python-dev (>= 2.6) python3-dev, debhelper (>=
7.2.3~), libcppunit-dev (>= 1.12), openjdk-6-jdk (>= 6b23~pre8-2) [alpha amd64
armel armhf i3
86 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc], openjdk-7-jdk
[ia64], gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64], gcj-native-helper [hppa
kfreebsd-amd64 kfreebsd-i386], libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64
kfreebsd-i386], ant (>= 1.7.0), ant-optional (>= 1.7.0), gcc-mingw32,
mingw32-runtime, libcommons-codec-java, libcommons-httpclient-java,
libcommons-lang-java, libcommons-logging-java, libservlet2.5-java, libbase-java
[!armel], libsac-java [!armel], libxml-java (>= 1.1.6) [!armel], libflute-java
(>= 1.1.6) [!armel], libpentaho-reporting-flow-engine-java (>= 0.9.4) [!armel],
liblayout-java (>= 0.2.10) [!armel], libloader-java (>= 1.1.6) [!armel],
libformula-java (>= 1.1.7) [!armel], librepository-java (>= 1.1.6) [!armel],
libfonts-java (>= 1.1.6) [!armel], libserializer-java (>= 1.1.6) [!armel],
libcommons-logging-java, libservlet2.5-java, javahelper (>= 0.37~),
xulrunner-dev, libnss3-dev (>= 3.12.3), dmake (>= 1:4.11), mono-devel (>=
2.4.2.3) [amd64
i386 ia64 kfreebsd-amd64 kfreebsd-i386], libmono-dev (>= 2.4.2.3) [amd64 i386
ia64 kfreebsd-amd64 kfreebsd-i386], mono-utils (>= 2.4.2.3) [amd64 i386 ia64
kfreebsd-amd64 kfreebsd-i386], cli-common-dev (>= 0.5.7) [amd64 i386 ia64
kfreebsd-amd64 kfreebsd-i386], libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>=
2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38),
libmdds-dev (>= 0.5.0), libvigraimpex-dev, libwpd-dev (>= 0.9.0), libmythes-dev
(>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libicu-dev (>= 4.0),
libxslt1-dev, libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4.5),
libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libgtk-3-dev,
libebook1.2-dev [!armel], libpq-dev, libxrandr-dev, liblucene2-java (>= 2.3.2),
libhsqldb-java (>> 1.8.0.10), bsh (>= 2.0b4), liblpsolve55-dev (>=
5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0),
libdbus-glib-1-dev (>= 0.60), libgstreamer-plugins-base0.10-dev, libneon27-gnutl
s-dev, librdf0-dev (>= 1.0.8), libgtk2.0-dev (>= 2.10), libgnomevfs2-dev,
libgconf2-dev, liborbit2-dev, gettext, libldap2-dev
Build-Depends-Indep: fdupes, xml-core, imagemagick, fontforge,
translate-toolkit (>= 1.9)
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (=
1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386
amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev,
nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (=
1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4),
libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1)
[amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<<
1.3.9~), qt3-dev-tools, ant (= 1.8.0-1) [hppa kfreebsd-i386 kfreebsd-amd64],
ant (= 1.8.0-2) [hppa kfreebsd-i386 kfreebsd-amd64], ant (= 1.8.0-3) [hppa
kfreebsd-i386 kfreebsd-amd64], g++-4.6 (= 4.6.1-10), g++-4.6 (= 4.6.1-11),
base-files (= 6.0), base-files (= 6.0squeeze1), libhsqldb-java (>= 1.8.1~)
Standards-Version: 3.9.1
@@ -308,6 +308,19 @@ Description: office productivity suite -- GTK+ integration
with Gtk+ and a Gtk/GNOMEish File Picker when running under GNOME. It
also contains a QuickStarter for the "notification area".
+Package: libreoffice-gtk3
+Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Depends: libreoffice-core (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
+Recommends: libreoffice-style-tango
+Section: gnome
+Enhances: libreoffice
+Description: office productivity suite -- GTK+ 3.0 integration
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the Gtk plugin for drawing LibreOffices widgets
+ with Gtk+ 3.0
+
Package: libreoffice-gnome
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: libreoffice-core (= ${binary:Version}), libreoffice-gtk, gconf2,
${shlibs:Depends}, ${misc:Depends}
@@ -346,6 +359,23 @@ Section: python
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Enhances: libreoffice
Depends: libreoffice-core (= ${binary:Version}), ${python:Depends},
${shlibs:Depends}, ${misc:Depends}
+Conflicts: python3-uno
+Description: Python-UNO bridge
+ The Python-UNO bridge allows use of the standard LibreOffice API
+ with the Python scripting language. It additionally allows
+ others to develop UNO components in Python, thus Python UNO components
+ may be run within the LibreOffice process and can be called from C++
+ or the built in StarBasic scripting language.
+Homepage: http://udk.openoffice.org/python/python-bridge.html
+
+Package: python3-uno
+Provides: ${python:Provides}, libreoffice-script-provider-python
+XB-Python-Version: ${python:Versions}
+Section: python
+Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Enhances: libreoffice
+Depends: libreoffice-core (= ${binary:Version}), ${python:Depends},
${shlibs:Depends}, ${misc:Depends}
+Conflicts: python-uno
Description: Python-UNO bridge
The Python-UNO bridge allows use of the standard LibreOffice API
with the Python scripting language. It additionally allows
diff --git a/rules b/rules
index 8a3b693..5bf4ba3 100755
--- a/rules
+++ b/rules
@@ -276,11 +276,9 @@ ENABLE_GRAPHITE=y
SYSTEM_STUFF += graphite
ALLOC=system
SYSTEM_STUFF += libexttextcat
-USE_SYSTEM_TEXTCAT_DATA=y
SYSTEM_STUFF += cppunit
ENABLE_LIBRSVG=y
SYSTEM_LIBRSVG=y
-SYSTEM_STUFF += gettext
# when we have a package we want to have to be installed on older things with
some older
# C++ ABI (like it was the case with libreoffice2), we need to set this. Don't
touch
# otherwise
@@ -540,7 +538,7 @@ endif
ifneq (,$(filter libexttextcat, $(SYSTEM_STUFF)))
BUILD_DEPS += , libexttextcat-dev
- TEXTCAT_DATA_RECOMMENDS := libtextcat-data (>= 2.2-9)
+ TEXTCAT_DATA_RECOMMENDS := libexttextcat-data
endif
ifeq "$(USE_LIBCURL4)" "y"
@@ -964,9 +962,6 @@ ifeq "$(USE_EXTERNAL_CXXLIBS)" "y"
endif
ifneq (,$(filter libcmis, $(SYSTEM_STUFF)))
BUILD_DEPS += , libcmis-dev
- else
- # workaround
- BUILD_DEPS += , libboost-program-options-dev
endif
endif
CONFIGURE_FLAGS += --with-external-thes-dir=$(THES_DIR)
@@ -1182,9 +1177,7 @@ ifeq "$(ENABLE_GCONF)" "y"
else
CONFIGURE_FLAGS += --disable-gconf
endif
-ifneq (,$(filter gettext, $(SYSTEM_STUFF)))
BUILD_DEPS += , gettext
-endif
ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
BUILD_DEPS_INDEP += , fontforge
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
