The following commit has been merged in the debian-experimental-3.6 branch:
commit 49277739f403a35e4db882c63035b18d62f27e38
Author: Rene Engelhard <r...@debian.org>
Date: Tue Apr 17 00:50:26 2012 +0200
update to current git; update debian-hardened-buildflags.diff to apply;
temporarily disable test fixes
diff --git a/changelog b/changelog
index 1a22875..b8837e9 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.6.0~alpha0~git20120409-1) UNRELEASED; urgency=low
+libreoffice (1:3.6.0~alpha0~git20120416-1) UNRELEASED; urgency=low
* new upstream snapshot
- fixes splashscreen location in multi-monitor setups
@@ -9,7 +9,7 @@ libreoffice (1:3.6.0~alpha0~git20120409-1) UNRELEASED;
urgency=low
- remove liblucene2-java stuff; now clucene is used
- build-depend on libxml2-utils, xmllint now needed
- -- Rene Engelhard <r...@debian.org> Mon, 09 Apr 2012 15:39:15 +0200
+ -- Rene Engelhard <r...@debian.org> Mon, 16 Apr 2012 14:09:29 +0200
libreoffice (1:3.5.2-4) UNRELEASED; urgency=low
diff --git a/patches/add-debian-multiarch-support.diff
b/patches/add-debian-multiarch-support.diff
deleted file mode 100644
index 449d9e4..0000000
--- a/patches/add-debian-multiarch-support.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/configure.in b/configure.in
-index 290b294..f3ca081 100644
---- a/configure.in
-+++ b/configure.in
-@@ -7748,6 +7748,7 @@ dnl
===================================================================
-
- KDE4_CFLAGS=""
- KDE4_LIBS=""
-+QMAKE4="qmake"
- MOC4="moc"
- KDE_GLIB_CFLAGS=""
- KDE_GLIB_LIBS=""
-@@ -9248,6 +9248,19 @@
- AC_MSG_ERROR([Qt4 headers not found. Please specify the root of your
Qt4 installation by exporting QT4DIR before running "configure".])
- fi
-
-+ dnl Check for qmake
-+ AC_PATH_PROG( QMAKEQT4, qmake-qt4, no, [`dirname
$qt_lib_dir`/bin:$QT4DIR/bin:$PATH] )
-+ QMAKE4="$QMAKEQT4"
-+ if test "$QMAKE4" = "no" ; then
-+ AC_PATH_PROG( QMAKE4, qmake, no, [`dirname
$qt_lib_dir`/bin:$QT4DIR/bin:$PATH] )
-+ if test "$QMAKE4" = "no" ; then
-+ AC_MSG_ERROR([Qmake not found. Please specify
-+the root of your Qt installation by exporting QT4DIR before running
"configure".])
-+ fi
-+ fi
-+
-+ qt_libdirs="`$QMAKE4 -query QT_INSTALL_LIBS` $qt_libdirs"
-+
- AC_MSG_CHECKING([for Qt4 libraries])
- qt_lib_dir="no"
- for lib_dir in $qt_libdirs; do
diff --git a/patches/debian-hardened-buildflags.diff
b/patches/debian-hardened-buildflags.diff
index 8865825..eb9d90e 100644
--- a/patches/debian-hardened-buildflags.diff
+++ b/patches/debian-hardened-buildflags.diff
@@ -35,8 +35,8 @@ diff --git a/solenv/gbuild/LinkTarget.mk
b/solenv/gbuild/LinkTarget.mk
index c094bb4..a0608f4 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
-@@ -46,6 +46,8 @@
- OBJCXXFLAGS ?= $(gb_COMPILEROPTFLAGS)
+@@ -53,6 +53,8 @@
+ gb_LinkTarget__get_debugcxxflags=$(if $(filter $(1),$(foreach
lib,$(ENABLE_DEBUG_ONLY),$(call
gb_Library_get_linktargetname,$(lib)))),$(gb_DEBUG_CFLAGS) $(gb_DEBUG_CXXFLAGS))
endif
+LDFLAGS += $(HARDEN_LDFLAGS)
diff --git a/patches/series b/patches/series
index 6f01600..5895926 100644
--- a/patches/series
+++ b/patches/series
@@ -18,12 +18,10 @@ mysqlcppconn-mysqlclient-SONAME.diff
make-pyuno-work-with-system-wide-module-install.diff
search-usr-share-for-images.diff
make-package-modules-not-suck.diff
-add-debian-multiarch-support.diff
-propagate-gb_FULLDEPS.diff
-disable-unoapi-subsequentcheck-for-now.diff
+#disable-unoapi-subsequentcheck-for-now.diff
mediwiki-oor-replace.diff
pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff
debian-hardened-buildflags.diff
gtk3-hack-explicit-gmodule.diff
pyuno-py3-module.diff
-tests-fix-build-with-jdk7.diff
+#tests-fix-build-with-jdk7.diff
--
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/e1sl0dl-0005zq...@vasks.debian.org
