[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_4.0.1_rc1-2-261-g2d4ef2a
The following commit has been merged in the ubuntu-raring-4.0 branch:
commit 2d4ef2abf0b03f8be3c3c863e0265354307e3265
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Wed Mar 20 12:57:24 2013 +0100
add ConnectivityTools to -subsequentcheckbase to be able to run dbaccess complex tests too, fix LO_DESKTOP merge error
diff --git a/changelog b/changelog
index 087d600..af6a37b 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,10 @@
libreoffice (1:4.0.2~rc1-0ubuntu1~raring1~ppa2) raring; urgency=low
* move build dependencies from ./debian/tests/control to -subsequentcheckbase
+ * add ConnectivityTools to -subsequentcheckbase to be able to run
+ dbaccess complex tests too
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 20 Mar 2013 12:40:22 +0100
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 20 Mar 2013 12:55:19 +0100
libreoffice (1:4.0.2~rc1-0ubuntu1~raring1~ppa1) raring; urgency=low
diff --git a/control.subsequentcheckbase.in b/control.subsequentcheckbase.in
index 7151f3b..dfb5b35 100644
--- a/control.subsequentcheckbase.in
+++ b/control.subsequentcheckbase.in
@@ -2,7 +2,7 @@ Package: libreofficeVER-subsequentcheckbase
Section: libs
Priority: extra
Architecture: all
-Depends: libreofficeVER, %BUILD_DEPS%, ${misc:Depends}, ${shlibs:Depends}
+Depends: libreofficeVER, %BUILD_DEPS_ARCH_ALL%, ${misc:Depends}
Description: LibreOffice java test libraries
LibreOffice subsequentchecks integration test suite
diff --git a/rules b/rules
index 13ef6ad..c50391e 100755
--- a/rules
+++ b/rules
@@ -1509,9 +1509,6 @@ ifeq "$(PACKAGE_SDK)" "y"
endif
ifeq "$(BUILD_KDE)" "y"
cat debian/control.kde.in >> debian/control
- perl -pi -e 's/%LO-DESKTOP-INTEGRATION%/libreoffice$(VER)-gnome | libreoffice$(VER)-kde/' debian/control
-else
- perl -pi -e 's/%LO-DESKTOP-INTEGRATION%/libreoffice$(VER)-gnome/' debian/control
endif
ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y"
cat debian/control.postgresql.in >> debian/control
@@ -1545,8 +1542,15 @@ endif
perl -pi -e "s,%OOO_REPORTDESIGN_ARCHS%,$(OOO_REPORTDESIGN_ARCHS),g" debian/control
perl -pi -e "s,%OOO_NO_REPORTDESIGN_ARCHS%,$(OOO_NO_REPORTDESIGN_ARCHS),g" debian/control
perl -pi -e "s#%BUILD_DEPS%#$(strip $(BUILD_DEPS))#g" debian/control
+ # we want the build deps as dep on subsequentcheckbase, but strip the arch
+ # specifics as we are arch-all
+ # for now we filter out the arch-specific libc0.1 and ia64, which is ugly,
+ # but better than manual bookkeeping
+ perl -pi -e "s#%BUILD_DEPS_ARCH_ALL%#$(strip $(shell echo '$(BUILD_DEPS), $(BUILD_DEPS_INDEP)'|sed -e 's/,/,\n /g'|grep -v libc0.1| grep -v ia64|sed -e 's/\[[^]]*\]//g'))#g" debian/control
ifeq "$(BUILD_KDE)" "y"
- perl -pi -e 's/ libreoffice-gnome,/ libreoffice-gnome | libreoffice-kde,/' debian/control
+ perl -pi -e 's/%LO-DESKTOP-INTEGRATION%/libreoffice$(VER)-gnome | libreoffice$(VER)-kde/' debian/control
+else
+ perl -pi -e 's/%LO-DESKTOP-INTEGRATION%/libreoffice$(VER)-gnome/' debian/control
endif
ifeq (sk,$(findstring sk,$(HELPISOS)))
@@ -2582,7 +2586,7 @@ ifeq "$(ENABLE_JAVA)" "y"
$(PKGDIR)-filter-mobiledev/$(OODIR)/share/registry; \
done
mkdir -p $(PKGDIR)-subsequentcheckbase/$(OODIR)/program/classes/
- for jar in OOoRunner.jar OOoRunnerLight.jar test.jar test-tools.jar; \
+ for jar in OOoRunner.jar OOoRunnerLight.jar test.jar test-tools.jar ConnectivityTools.jar; \
do \
mv `find solver -name $$jar` $(PKGDIR)-subsequentcheckbase/$(OODIR)/program/classes/; \
done
diff --git a/tests/patches/java-subsequentcheck-standalone.diff b/tests/patches/java-subsequentcheck-standalone.diff
index 383e379..ebffaf1 100644
--- a/tests/patches/java-subsequentcheck-standalone.diff
+++ b/tests/patches/java-subsequentcheck-standalone.diff
@@ -1,12 +1,11 @@
From 4224d61427370149e9a9f5bd20cd9549e535398f Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
-Date: Tue, 30 Oct 2012 15:37:35 +0100
+Date: Wed Mar 20 12:50:17 CET 2013
Subject: [PATCH] run subsequentcheck standalone against installed version as
integration test
Forwarded: partially, where there is generic use for it
---
- dbaccess/Module_dbaccess.mk | 1 -
jurt/Module_jurt.mk | 2 +-
ridljar/JunitTest_util.mk | 2 +-
solenv/gbuild/JavaClassSet.mk | 2 +-
@@ -14,21 +13,9 @@ Forwarded: partially, where there is generic use for it
solenv/gbuild/Module.mk | 3 +++
solenv/gbuild/extensions/post_SkipBuild.mk | 17 +++++++++++++++++
solenv/gbuild/platform/unxgcc.mk | 2 +-
- 8 files changed, 25 insertions(+), 6 deletions(-)
+ 7 files changed, 25 insertions(+), 5 deletions(-)
create mode 100644 solenv/gbuild/extensions/post_SkipBuild.mk
-diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
-index f087ba8..1ee0bd6 100644
---- a/dbaccess/Module_dbaccess.mk
-+++ b/dbaccess/Module_dbaccess.mk
-@@ -54,7 +54,6 @@ $(eval $(call gb_Module_add_check_targets,dbaccess,\
-
-
- $(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\
-- JunitTest_dbaccess_complex \
- JunitTest_dbaccess_unoapi \
- ))
-
diff --git a/jurt/Module_jurt.mk b/jurt/Module_jurt.mk
index e367b6f..2b73ce3 100644
--- a/jurt/Module_jurt.mk
--
LibreOffice packaging repository
Reply to: