[SCM] LibreOffice packaging repository branch, debian-experimental-3.7, updated. libreoffice_3.6.2_rc1-1-54-g7797aed
The following commit has been merged in the debian-experimental-3.7 branch:
commit 7797aedcfbf10ed98d7d4a629ce12745ecbd3e5d
Author: Rene Engelhard <rene@debian.org>
Date: Thu Sep 27 21:54:46 2012 +0200
unfuzzy patches...
diff --git a/patches/build-dont-run-checks.diff b/patches/build-dont-run-checks.diff
index 5805387..638874b 100644
--- a/patches/build-dont-run-checks.diff
+++ b/patches/build-dont-run-checks.diff
@@ -15,8 +15,8 @@ diff --git a/Makefile.top b/Makefile.top
index 7362bbc..ae849fb 100644
--- a/Makefile.top
+++ b/Makefile.top
-@@ -251,7 +252,7 @@ xpdf\
- xsltml\
+@@ -253,7 +254,7 @@ tomcat\
+ xpdf\
zlib\
-export gb_TAILBUILDTARGET=all slowcheck
@@ -24,8 +24,8 @@ index 7362bbc..ae849fb 100644
define gbuild_module_rules
.PHONY: $(1) $(1).all $(1).clean $(1).deliver
-@@ -526,7 +527,7 @@ findunusedcode:
- | grep -v WPX \
+@@ -529,7 +530,7 @@ findunusedcode:
+ | grep -v ^WSObject \
> unusedcode.easy
-check: dev-install subsequentcheck
diff --git a/patches/debian-hardened-buildflags.diff b/patches/debian-hardened-buildflags.diff
index 590c8ca..e2a031d 100644
--- a/patches/debian-hardened-buildflags.diff
+++ b/patches/debian-hardened-buildflags.diff
@@ -67,18 +67,3 @@ index e85ed83..1665642 100644
gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
include $(GBUILDDIR)/Deliver.mk
-diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
-index a3231a6..b97f354 100644
---- a/solenv/inc/unxgcc.mk
-+++ b/solenv/inc/unxgcc.mk
-@@ -204,6 +204,10 @@ LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBA
- LINKFLAGS += -Wl,-Bsymbolic-functions
- .ENDIF
-
-+LINKFLAGS += $(HARDEN_LDFLAGS)
-+CDEFS += $(HARDEN_CPPFLAGS)
-+CFLAGS += $(HARDEN_CFLAGS)
-+
- # linker flags for linking applications
- LINKFLAGSAPPGUI= -Wl,-export-dynamic \
- -Wl,-rpath-link,$(LB):$(SOLARLIBDIR):$(SYSBASE)/lib:$(SYSBASE)/usr/lib
diff --git a/patches/py3uno-module.diff b/patches/py3uno-module.diff
index 4f9100e..cfda6d7 100644
--- a/patches/py3uno-module.diff
+++ b/patches/py3uno-module.diff
@@ -1,13 +1,13 @@
--- a/Makefile.top-old 2012-04-06 14:26:46.828238642 +0200
+++ b/Makefile.top 2012-04-06 14:26:58.308239187 +0200
-@@ -111,6 +111,7 @@ packimages\
+@@ -118,6 +118,7 @@ packimages\
padmin\
psprint_config\
pyuno\
+py3uno\
qadevOOo\
+ readlicense_oo\
regexp\
- registry\
diff --git a/Repository.mk b/Repository.mk
index 3609d09..c0b11c2 100644
--- a/Repository.mk
--
LibreOffice packaging repository
Reply to: