The following commit has been merged in the debian-experimental-3.7 branch:
commit cea79960625b421fb47996fcdb076e2351316159
Author: Rene Engelhard <[email protected]>
Date: Tue Sep 11 13:45:06 2012 +0200
add conditional for liblangtag
diff --git a/changelog b/changelog
index 096946a..bd91bf4 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.7.0~git20120910-1) UNRELEASED; urgency=low
+libreoffice (1:3.7.0~git20120911-1) UNRELEASED; urgency=low
* new upstream snapshot
- waits for InternalIPC::ProcessingDone in oosplash (closes: #681185)
diff --git a/control b/control
index 6390529..b6b35d6 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: dpkg-dev (>= 1.16.1), lsb-release, bzip2, bison, flex |
flex-old, libxaw7-dev, unzip, zip, autoconf, automake, 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, libcups2-dev, libarchive-zip-perl, fastjar, xsltproc,
libxkbfile-dev, libxinerama-dev, x11proto-render-dev, libxml-parser-perl,
gperf, bc,, gcc-4.4 [mips mipsel], g++-4.4 [mips mipsel], libgl1-mesa-dev
[!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev
(>= 0.8.0), libpoppler-private-dev, libpoppler-cpp-dev, libgraphite2-dev (>=
0.9.3) [!alpha !armel !sparc], libexttextcat-dev (>= 3.1.1), libjpeg-dev,
libxml2-dev, libxml2-utils, libxslt1-dev, libexpat1-dev, unixodbc-dev (>=
2.2.11), libsane-dev, libxrender-dev, libpng12-dev, libssl-dev, librsvg2-dev,
libdb-dev, python (>= 2.6.6-3+squeeze4), python-dev (>= 2.6), python3-dev,
debhelper (>= 7
.2.3~), libcppunit-dev (>= 1.12), gdb, junit4 (>= 4.8.2-2), default-jdk,
default-jdk (>= 1:1.7-48) [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), g++-mingw-w64-i686 [i386 amd64], javahelper (>= 0.37~), libnss3-dev (>=
3.12.3), dmake (>= 1:4.11), libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>=
2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38),
libboost-date-time-dev (>= 1.38), libmdds-dev (>= 0.6.0), liborcus-dev,
libvigraimpex-dev, libclucene-dev (>= 2.3.3.4-2), libwpd-dev (>= 0.9.0),
libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0),
libvisio-dev, libcdr-dev, libcmis-dev (>= 0.2.1), liblcms2-dev, libldap2-dev,
libtelepathy-glib-dev (>= 0.18), libicu-dev (>= 4.0), libcairo2-dev,
kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4:4.8), libmysqlclient-dev,
libmysqlcppconn-dev (>= 1.
1.0~r791), libgtk2.0-dev (>= 2.10), libgtk-3-dev (>= 3.2~), libebook1.2-dev,
libpq-dev (>= 9.0~), libxrandr-dev, libhsqldb-java (>> 1.8.0.10),
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.70),
libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>=
1.0.8), libglib2.0-dev (>= 2.15.0), libgconf2-dev, liborbit2-dev, gettext, make
(>= 3.81-8.2)
+Build-Depends: dpkg-dev (>= 1.16.1), lsb-release, bzip2, bison, flex |
flex-old, libxaw7-dev, unzip, zip, autoconf, automake, 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, libcups2-dev, libarchive-zip-perl, fastjar, xsltproc,
libxkbfile-dev, libxinerama-dev, x11proto-render-dev, libxml-parser-perl,
gperf, bc,, gcc-4.4 [mips mipsel], g++-4.4 [mips mipsel], libgl1-mesa-dev
[!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev
(>= 0.8.0), libpoppler-private-dev, libpoppler-cpp-dev, libgraphite2-dev (>=
0.9.3) [!alpha !armel !sparc], libexttextcat-dev (>= 3.1.1), libjpeg-dev,
libxml2-dev, libxml2-utils, libxslt1-dev, libexpat1-dev, unixodbc-dev (>=
2.2.11), libsane-dev, libxrender-dev, libpng12-dev, libssl-dev, librsvg2-dev,
libdb-dev, python (>= 2.6.6-3+squeeze4), python-dev (>= 2.6), python3-dev,
debhelper (>= 7
.2.3~), libcppunit-dev (>= 1.12), gdb, junit4 (>= 4.8.2-2), default-jdk,
default-jdk (>= 1:1.7-48) [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), g++-mingw-w64-i686 [i386 amd64], javahelper (>= 0.37~), libnss3-dev (>=
3.12.3), dmake (>= 1:4.11), libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>=
2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38),
libboost-date-time-dev (>= 1.38), libmdds-dev (>= 0.6.0), liborcus-dev,
libvigraimpex-dev, libclucene-dev (>= 2.3.3.4-2), libwpd-dev (>= 0.9.0),
libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0),
libvisio-dev, libcdr-dev, libcmis-dev (>= 0.2.1), liblcms2-dev, libldap2-dev,
libtelepathy-glib-dev (>= 0.18), liblangtag-dev (>= 0.3), libicu-dev (>= 4.0),
libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4:4.8),
libmysqlclient-dev, l
ibmysqlcppconn-dev (>= 1.1.0~r791), libgtk2.0-dev (>= 2.10), libgtk-3-dev (>=
3.2~), libebook1.2-dev, libpq-dev (>= 9.0~), libxrandr-dev, libhsqldb-java (>>
1.8.0.10), 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.70),
libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>=
1.0.8), libglib2.0-dev (>= 2.15.0), libgconf2-dev, liborbit2-dev, gettext, make
(>= 3.81-8.2)
Build-Depends-Indep: fdupes, xml-core, imagemagick, doxygen,
libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java,
libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, libbase-java [!hppa
!kfreebsd-amd64 !kfreebsd-i386], libsac-java [!hppa !kfreebsd-amd64
!kfreebsd-i386], libxml-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386],
libflute-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386],
libpentaho-reporting-flow-engine-java (>= 0.9.4) [!hppa !kfreebsd-amd64
!kfreebsd-i386], liblayout-java (>= 0.2.10) [!hppa !kfreebsd-amd64
!kfreebsd-i386], libloader-java (>= 1.1.6) [!hppa !kfreebsd-amd64
!kfreebsd-i386], libformula-java (>= 1.1.7) [!hppa !kfreebsd-amd64
!kfreebsd-i386], librepository-java (>= 1.1.6) [!hppa !kfreebsd-amd64
!kfreebsd-i386], libfonts-java (>= 1.1.6) [!hppa !kfreebsd-amd64
!kfreebsd-i386], libserializer-java (>= 1.1.6) [!hppa !kfreebsd-amd64
!kfreebsd-i386], libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, bsh
(>= 2.0b
4), fontforge
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], libc0.1-dev (= 2.13-26)
[kfreebsd-i386 kfreebsd-amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, 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), gcc (>= 4:4.7~) [!i386 !amd64
!kfreebsd-i386 !kfreebsd-amd64], g++ (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386
!kfreebsd-amd64], g++-4.7 (<< 4.7.1-3), base-files (= 7.0), libhsqldb-java (>=
1.8.1~)
Standards-Version: 3.9.1
diff --git a/rules b/rules
index 4fe5f12..077f244 100755
--- a/rules
+++ b/rules
@@ -312,6 +312,7 @@ BUILD_UNOWINREG_DLL=y
endif
FAKEROOT_LIBDIR=/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/libfakeroot
ENABLE_TELEPATHY=y
+SYSTEM_STUFF += liblangtag
SYSTEM_STUFF += orcus
# Default flags to pass to configure
@@ -491,7 +492,7 @@ endif
# Debian Squeeze
ifeq "$(WHEEZY_BACKPORT)" "y"
BUGS=mailto:[email protected]
- SYSTEM_STUFF := $(filter-out libcmis libcdr clucene libmspub mdds orcus,
$(SYSTEM_STUFF))
+ SYSTEM_STUFF := $(filter-out libcmis libcdr clucene libmspub mdds liblangtag
orcus, $(SYSTEM_STUFF))
endif
CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i))
@@ -982,6 +983,10 @@ ifeq ($(ENABLE_TELEPATHY),y)
BUILD_DEPS += , libtelepathy-glib-dev (>= 0.18)
endif
+ifneq (,$(filter liblangtag, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , liblangtag-dev (>= 0.3)
+endif
+
ifneq (,$(filter icu, $(SYSTEM_STUFF)))
BUILD_DEPS += , libicu-dev $(ICU_MINVER)
endif
--
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]
