[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0_rc1-1-25-g9df7a22
The following commit has been merged in the debian-experimental-3.5 branch:
commit 9df7a22cba408655308bef615b1a14fadaa06f8c
Author: Rene Engelhard <rene@debian.org>
Date: Fri Jan 27 09:40:04 2012 +0000
Revert "build oox on ia64 with -g0 as otherwise it gets too big"
This reverts commit 0852fb0fa7fb1cc65b66a5c759b92f0450979000.
diff --git a/changelog b/changelog
index c396d44..0962018 100644
--- a/changelog
+++ b/changelog
@@ -1,9 +1,6 @@
libreoffice (1:3.5.0~rc2-1) experimental; urgency=low
* new upstream release candidate
-
- * debian/patches/ia64-oox-no-debug.diff: build oox on ia64 with -g0
- as otherwise it gets too big to link
* debian/rules:
- fix patch rule in check
diff --git a/patches/ia64-oox-no-debug.diff b/patches/ia64-oox-no-debug.diff
deleted file mode 100644
index a993f95..0000000
--- a/patches/ia64-oox-no-debug.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/oox/Library_oox.mk-old 2012-01-25 11:44:21.000000000 +0000
-+++ b/oox/Library_oox.mk 2012-01-25 11:44:47.000000000 +0000
-@@ -44,6 +44,14 @@
- -DOOX_DLLIMPLEMENTATION \
- ))
-
-+ifeq ($(CPUNAME),IA64)
-+ ifneq ($(ENABLE_SYMBOLS),)
-+$(eval $(call gb_Library_add_cxxflags,oox,\
-+ -g0 \
-+))
-+ endif
-+endif
-+
- $(eval $(call gb_Library_add_api,oox,\
- offapi \
- udkapi \
diff --git a/patches/series b/patches/series
index 6e17fcc..9c885a6 100644
--- a/patches/series
+++ b/patches/series
@@ -27,4 +27,3 @@ revert-468fe685e3c58c84bce6d9a48b931dcc21682679.diff
propagate-gb_FULLDEPS.diff
disable-sc-unoapi-subsequentcheck-for-now.diff
fix-nsplugin-build-and-install.diff
-ia64-oox-no-debug.diff
--
LibreOffice packaging repository
Reply to: