The following commit has been merged in the debian-experimental-3.7 branch:
commit 34b881e86331dc2b7a9218b0a5445efe2587d98e
Author: Rene Engelhard <[email protected]>
Date: Tue Sep 25 19:10:06 2012 +0200
use gstreamer1.0; we need to explicitely --disable-gstreamer-0-10
diff --git a/changelog b/changelog
index 77f71c9..e146915 100644
--- a/changelog
+++ b/changelog
@@ -8,8 +8,9 @@ libreoffice (1:3.7.0~alpha0~git20120919-1) UNRELEASED;
urgency=low
- make -impress suggest bluez (for impress remote control)
* debian/rules:
- enable sdrmeote on all linux archs; b-d on libbluetooth-dev on those
+ - use gstreamer1.0
* debian/uno-libs3.symbols: update
-
+
-- Rene Engelhard <[email protected]> Fri, 20 Jul 2012 11:16:51 +0200
libreoffice (1:3.6.2~rc1-2) UNRELEASED; urgency=low
diff --git a/control b/control
index a6596f9..a71ca40 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, libmspub-dev, libcmis-dev (>= 0.3.0), 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), libmysq
lclient-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),
libbluetooth-dev [!kfreebsd-amd64 !kfreebsd-i386],
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, libmspub-dev, libcmis-dev (>= 0.3.0), 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), libmysq
lclient-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),
libbluetooth-dev [!kfreebsd-amd64 !kfreebsd-i386], libgstreamer1.0-dev,
libgstreamer-plugins-base1.0-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 b1f3f9b..3c7109a 100755
--- a/rules
+++ b/rules
@@ -204,7 +204,7 @@ ifeq "$(USE_DBUS)" "y"
endif
endif
USE_GSTREAMER=y
-GSTREAMER_VERSION=0.10
+GSTREAMER_VERSION=1.0
SYSTEM_STUFF += neon
NEON_SECTYPE=gnutls
NEONSONR=27
@@ -1145,7 +1145,7 @@ endif
ifeq "$(USE_GSTREAMER)" "y"
ifeq "$(GSTREAMER_VERSION)" "1.0"
BUILD_DEPS += , libgstreamer$(GSTREAMER_VERSION)-dev
- CONFIGURE_FLAGS += --enable-gstreamer
+ CONFIGURE_FLAGS += --enable-gstreamer --disable-gstreamer-0-10
endif
BUILD_DEPS += , libgstreamer-plugins-base$(GSTREAMER_VERSION)-dev
GSTREAMER_PLUGINS_SUGGESTS += ,
gstreamer$(GSTREAMER_VERSION)-plugins-base,
gstreamer$(GSTREAMER_VERSION)-plugins-good,
gstreamer$(GSTREAMER_VERSION)-plugins-ugly,
gstreamer$(GSTREAMER_VERSION)-plugins-bad, gstreamer$(GSTREAMER_VERSION)-ffmpeg
--
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]
