[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_4.0.2_rc1-1-12-g25e8bc7
The following commit has been merged in the debian-experimental-4.0 branch:
commit 25e8bc73bda59f1730ec752bb087f09087f4bf8b
Author: Rene Engelhard <rene@debian.org>
Date: Thu Mar 21 15:50:30 2013 +0100
conditionalize -subsequentcheckbase
diff --git a/control.in b/control.in
index 197d1e5..954e114 100644
--- a/control.in
+++ b/control.in
@@ -29,7 +29,6 @@ Build-Conflicts: ant (= 1.8.0-1) [%OOO_GCJ_JDK_ARCHS%],
Standards-Version: 3.9.4
XS-Python-Version: @PYTHON2_VERSION@
XS-Python3-Version: @PYTHON_VERSION_CONTROL@
-XS-Testsuite: autopkgtest
Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git
Bugs: @BUGS@
diff --git a/rules b/rules
index 5e3f8fb..0227a2c 100755
--- a/rules
+++ b/rules
@@ -199,6 +199,7 @@ QT_MINVER= (>= 4:4.5)
endif
KDELIBS_MINVER= (>= 4:4.3.4)
BUILD_DBG_PACKAGE=y
+BUILD_TEST_PACKAGE=y
ifeq "$(BUILD_DBG_PACKAGE)" "y"
ENABLE_SYMBOLS=y
SMALL_SYMBOLS=y
@@ -1493,9 +1494,11 @@ endif
ifeq "$(ENABLE_KDEAB)" "y"
cat debian/control.kab.in >> debian/control
endif
-ifneq "$(OOO_JAVA_ARCHS)" ""
+ifeq "$(BUILD_TEST_PACKAGE)" "y"
+ ifneq "$(OOO_JAVA_ARCHS)" ""
sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
>> debian/control < debian/control.subsequentcheckbase.in
+ endif
endif
ifeq "$(PACKAGE_LIBRELOGO)" "y"
cat debian/control.librelogo.in >> debian/control
@@ -1513,11 +1516,13 @@ 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
+ifeq "$(BUILD_TEST_PACKAGE)" "y"
# 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
+endif
ifeq "$(BUILD_KDE)" "y"
perl -pi -e 's/%LO-DESKTOP-INTEGRATION%/libreoffice$(VER)-gnome | libreoffice$(VER)-kde/' debian/control
else
@@ -1548,6 +1553,10 @@ ifeq (4.4,$(SYSTEM_GCC_VERSION))
perl -pi -e 's/flex \|/flex (>= 2.5.25-7) |/' debian/control
endif
+ifeq "$(BUILD_TEST_PACKAGE)" "y"
+ perl -pi -e 's/Vcs-Git:/XS-Testsuite: autopkgtest\nVcs-Git:/' debian/control
+endif
+
python debian/scripts/joinctrl.py < debian/control > debian/control.tmp
mv debian/control.tmp debian/control
@@ -2539,12 +2548,14 @@ ifeq "$(ENABLE_JAVA)" "y"
mv $(PKGDIR)-common/$(OODIR)/share/registry/$$i.xcd \
$(PKGDIR)-filter-mobiledev/$(OODIR)/share/registry; \
done
+ifeq "$(BUILD_TEST_PACKAGE)" "y"
mkdir -p $(PKGDIR)-subsequentcheckbase/$(OODIR)/program/classes/
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
endif
+endif
# fix permissions
for i in editpic poll savepic show webcast; do \
--
LibreOffice packaging repository
Reply to: