The following commit has been merged in the debian-experimental-3.6 branch:
commit 59fc627f417bc09c1e9b48637de2493694a92ddb
Author: Rene Engelhard <r...@debian.org>
Date: Wed May 9 09:18:06 2012 +0200
git update; update patches
diff --git a/changelog b/changelog
index d2bb8b2..07cb323 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.6.0~alpha0~git20120503-1) UNRELEASED; urgency=low
+libreoffice (1:3.6.0~alpha0~git20120508-1) UNRELEASED; urgency=low
* new upstream snapshot
- fixes splashscreen location in multi-monitor setups
diff --git a/patches/debian-debug.diff b/patches/debian-debug.diff
index 23bcb93..6477805 100644
--- a/patches/debian-debug.diff
+++ b/patches/debian-debug.diff
@@ -2,20 +2,22 @@ diff --git a/configure.in b/configure.in
index 3257668..afd36de 100755
--- libreoffice-3.5.0/configure.in
+++ libreoffice-3.5.0/configure.in
-@@ -3518,6 +3518,13 @@
- if test "$enable_symbols" = "y" || test "$enable_symbols" = "yes"; then
- ENABLE_SYMBOLS_FOR=all
- AC_MSG_RESULT([yes])
-+ if test "$enable_symbols" = "SMALL" -o "$enable_symbols" = "small"; then
-+ ENABLE_SYMBOLS="SMALL"
-+ AC_MSG_RESULT([yes, small ones])
-+ else
-+ ENABLE_SYMBOLS="TRUE"
-+ AC_MSG_RESULT([yes])
-+ fi
- else
- ENABLE_SYMBOLS_FOR="$enable_symbols"
- AC_MSG_RESULT([for $enable_symbols])
+@@ -3582,8 +3582,13 @@
+ dnl ===================================================================
+ AC_MSG_CHECKING([whether to include symbols])
+ if test -n "$enable_symbols" -a "$enable_symbols" != "no"; then
+- ENABLE_SYMBOLS="TRUE"
+- AC_MSG_RESULT([yes])
++ if test "$enable_symbols" = "SMALL" -o "$enable_symbols" = "small"; then
++ ENABLE_SYMBOLS="SMALL"
++ AC_MSG_RESULT([yes, small ones])
++ else
++ ENABLE_SYMBOLS="TRUE"
++ AC_MSG_RESULT([yes])
++ fi
+ else
+ ENABLE_SYMBOLS=
+ AC_MSG_RESULT([no])
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index c73333f..9338110 100644
--- libreoffice-3.5.0/solenv/inc/unxgcc.mk
diff --git a/patches/debian-hardened-buildflags.diff
b/patches/debian-hardened-buildflags.diff
index cb365b1..b058740 100644
--- a/patches/debian-hardened-buildflags.diff
+++ b/patches/debian-hardened-buildflags.diff
@@ -35,9 +35,9 @@ 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
-@@ -83,6 +83,8 @@
- gb_LinkTarget__get_cflags=$(gb_COMPILEROPTFLAGS) $(call
gb_LinkTarget__get_symbolscflags,$(1)) $(CFLAGS)
- gb_LinkTarget__get_cxxflags=$(gb_COMPILEROPTFLAGS) $(call
gb_LinkTarget__get_symbolscxxflags,$(1)) $(CXXFLAGS)
+@@ -54,6 +54,8 @@
+ gb_LinkTarget__get_cxxflags=$(if $(CXXFLAGS),$(CXXFLAGS),$(call
gb_LinkTarget__get_debugcxxflags,$(1)))
+ gb_LinkTarget__get_objcxxflags=$(if $(OBJCXXFLAGS),$(OBJCXXFLAGS),$(call
gb_LinkTarget__get_debugcxxflags,$(1)))
+LDFLAGS += $(HARDEN_LDFLAGS)
+
@@ -48,16 +48,16 @@ diff --git a/solenv/gbuild/gbuild.mk
b/solenv/gbuild/gbuild.mk
index e85ed83..1665642 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
-@@ -141,6 +141,9 @@ gb__ENV_CXXFLAGS := $(ENVCFLAGSCXX)
+@@ -145,6 +145,9 @@
+ gb__ENV_CXXFLAGS := $(ENVCFLAGSCXX)
endif
- endif
-
+
+gb__ENV_CXXFLAGS += $(HARDEN_CXXFLAGS)
+gb__ENV_CFLAGS += $(HARDEN_CFLAGS)
+
include $(GBUILDDIR)/Helper.mk
include $(GBUILDDIR)/TargetLocations.mk
-
+
@@ -240,6 +243,8 @@ ifeq ($(HAVE_THREADSAFE_STATICS),TRUE)
gb_GLOBALDEFS += -DHAVE_THREADSAFE_STATICS
endif
diff --git a/patches/pyuno-py3-module.diff b/patches/pyuno-py3-module.diff
index c03604f..178eda4 100644
--- a/patches/pyuno-py3-module.diff
+++ b/patches/pyuno-py3-module.diff
@@ -1,10 +1,10 @@
--- a/Makefile-old 2012-04-06 14:26:46.828238642 +0200
+++ b/Makefile 2012-04-06 14:26:58.308239187 +0200
-@@ -215,6 +215,7 @@
+@@ -220,6 +220,7 @@
postprocess\
python\
pyuno\
+pyuno-py3\
readlicense_oo\
redland\
- registry\
+ remotebridges\
diff --git a/patches/series b/patches/series
index a121edc..5c7d11e 100644
--- a/patches/series
+++ b/patches/series
@@ -4,7 +4,7 @@ gcj-safe-jni-h-include.diff
jurt-soffice-location.diff
split-binfilters-and-evo.diff
debian-debug.diff
-rhino-build-optional.diff
+#rhino-build-optional.diff
disable-dynamic-list-cpp.diff
fix-system-lpsolve-build.diff
install-fixes.diff
@@ -16,7 +16,7 @@ reportdesign-mention-package.diff
jdbc-driver-classpaths.diff
mysqlcppconn-mysqlclient-SONAME.diff
make-pyuno-work-with-system-wide-module-install.diff
-search-usr-share-for-images.diff
+#search-usr-share-for-images.diff
make-package-modules-not-suck.diff
#disable-unoapi-subsequentcheck-for-now.diff
mediwiki-oor-replace.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/e1ss1hy-0006gb...@vasks.debian.org
