./packages/openofficeorg/3.0.1/experimental r1436: * debian/rules, debian/control.qa.in:

To: debian-openoffice@lists.debian.org
Subject: ./packages/openofficeorg/3.0.1/experimental r1436: * debian/rules, debian/control.qa.in:
From: Rene Engelhard <rene@debian.org>
Date: Sun, 22 Mar 2009 17:23:08 +0100
Message-id: <E1Lpmfm-0006of-SI@alioth.debian.org>

------------------------------------------------------------
revno: 1436
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Sun 2009-03-22 17:23:08 +0100
message:
    * debian/rules, debian/control.qa.in:
      - remove -qa-*, broken and unused anyway
removed:
  control.qa.in
modified:
  changelog
  rules

=== modified file 'changelog'
--- a/changelog	2009-03-21 20:22:27 +0000
+++ b/changelog	2009-03-22 16:23:08 +0000
@@ -6,6 +6,8 @@
   * debian/rules:
     - fix saxon conditional. use internal saxon because system-saxon
       breaks various filters....
+  * debian/rules, debian/control.qa.in:
+    - remove -qa-*, broken and unused anyway
 
   [ Ben Finney ]
   * debian/control*.in:

=== removed file 'control.qa.in'
--- a/control.qa.in	2009-03-20 19:33:13 +0000
+++ b/control.qa.in	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-Package: openoffice.orgVER-qa-tools
-Section: devel
-Priority: extra
-Depends: ${shlibs:Depends},
- openoffice.orgVER (>> ${base-version}),
- ${ooo-binfilter-dep},
- ${java-common-depends},
- ${misc:Depends}
-Recommends: openoffice.orgVER-qa-api-tests,
- openoffice.orgVER-qa-ui-tests,
-Suggests: ${java-runtime-depends}
-Conflicts: openoffice.org-core (<< 1:2.3.0~oog680m2)
-Replaces: openoffice.org-common (<< 2.0.4~ood680m2)
-Architecture: %OOO_QA_ARCHS%
-Description: OpenOffice.org Automatic Test Programs
- OpenOffice.org is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains the test tools to automatically test the
- OpenOffice.org programs.
- .
- Install the openoffice.orgVER-qa-ui-tests and
- openoffice.orgVER-qa-api-tests packages to get the official
- testscripts, or write your own scripts.
-
-Package: openoffice.orgVER-qa-api-tests
-Section: devel
-Priority: extra
-Depends: openoffice.orgVER-qa-tools, ${java-runtime-depends}
-Architecture: all
-Description: OpenOffice.org API Test Data
- OpenOffice.org is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains the test data for the OpenOffice.org Java and
- Basic APIs.
-

=== modified file 'rules'
--- a/rules	2009-03-21 20:22:27 +0000
+++ b/rules	2009-03-22 16:23:08 +0000
@@ -89,16 +89,6 @@
 BUILD_DEPS=
 BUILD_PYUNO=y
 USE_PYCENTRAL=y
-# causes out-of-memory
-ifeq "$(JDK)" "openjdk-cacao" 
-  PACKAGE_QA_TOOLS=n
-else
-  ifneq "$(ARCH)" "ia64"
-    PACKAGE_QA_TOOLS=y
-  else
-    PACKAGE_QA_TOOLS=n
-  endif
-endif
 PACKAGE_TTF_OPENSYMBOL=y
 PACKAGE_PCVSLIB=n
 ifneq "$(ARCH)" "powerpc"
@@ -372,8 +362,6 @@
 endif
 OOO_BINFILTER_ARCHS=$(filter-out arm,$(filter-out armel,$(OOO_ARCHS)))
 
-OOO_QA_ARCHS=$(filter-out ia64,$(OOO_ARCHS))
-
 ifeq "$(ARCH)-linux-gnu" "sparc-linux-gnu"
 	# use 32-bit compiler
 	CC_PREFIX=sparc-linux-gnu-
@@ -495,10 +483,7 @@
   endif
 endif
 
-ifneq "$(PACKAGE_QA_TOOLS)" "y"
-	DEBHELPER_OPTIONS+= -Nopenoffice.org$(VER)-qa-tools -Nopenoffice.org$(VER)-qa-api-tests
 	CONFIGURE_FLAGS += --disable-qadevooo
-endif
 
 ifeq "$(ENABLE_JAVA)" "y"
   ifeq "$(PACKAGE_WRITER2LATEX)" "n"
@@ -1307,10 +1292,6 @@
 	sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
 		>> debian/control < debian/control.mono.in
 endif
-ifeq "$(PACKAGE_QA_TOOLS)" "y"
-	sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
-		>> debian/control < debian/control.qa.in
-endif
 ifeq "$(PACKAGE_PCVSLIB)" "y"
 	cat debian/control.pcvslib.in \
 		>> debian/control
@@ -1367,7 +1348,6 @@
 	perl -pi -e "s,%OOO_NPSOPLUGIN_ARCHS%,$(OOO_NPSOPLUGIN_ARCHS),g" debian/control
 	perl -pi -e "s,%OOO_OGLTRANS_ARCHS%,$(OOO_OGLTRANS_ARCHS),g" debian/control
 	perl -pi -e "s,%OOO_BINFILTER_ARCHS%,$(OOO_BINFILTER_ARCHS),g" debian/control
-	perl -pi -e "s,%OOO_QA_ARCHS%,$(OOO_QA_ARCHS),g" debian/control
 	perl -pi -e "s,%OOO_BUILD_SVN%,$(OOO_BUILD_SVN)," debian/control
 
 ifeq (he,$(findstring he,$(LANGPACKISOS)))
@@ -1731,14 +1711,8 @@
 	done
 endif
 
-ifeq "$(PACKAGE_QA_TOOLS)" "y"
-	cd debian/tmp/pkg; \
-	mv openoffice.org-common/$(OODIR)/program/testtoolrc \
-		openoffice.org-core/$(OODIR)/program
-else
 	cd debian/tmp/pkg; \
 	rm -f openoffice.org-common/$(OODIR)/program/testtoolrc
-endif
 	# remove eventually sneaked in .testtoolrc
 	cd debian/tmp/pkg; \
 	rm -f openoffice.org-common/$(OODIR)/program/.testtoolrc
@@ -2148,46 +2122,10 @@
 	mkdir -p -m755 $(PKGDIR)-base/usr/share/applications \
 	               $(PKGDIR)-core/usr/share/applications
 
-ifeq "$(PACKAGE_QA_TOOLS)" "y"
-	rm -rf $(PKGDIR)-qa-tools
-	mkdir -p -m755 $(PKGDIR)-qa-tools/usr/bin
-	install -m755 $(SOURCE_TREE)/ootestapi$(VER) $(PKGDIR)-qa-tools/usr/bin
-	install -m755 $(SOURCE_TREE)/ootesttool$(VER) $(PKGDIR)-qa-tools/usr/bin
-	install -m755 $(SOURCE_TREE)/oosmoketest$(VER) $(PKGDIR)-qa-tools/usr/bin
-
-	mkdir -p -m755 $(PKGDIR)-qa-tools/$(OODIR)/program
-	for f in testtool.bin libcommuni* libsimplecm*; do \
-		mv $(PKGDIR)-core/$(OODIR)/program/$$f $(PKGDIR)-qa-tools/$(OODIR)/program; \
-	done
-	install -D -m644 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/*.sh; echo $$UPD)/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/lib/libsalalloc_malloc.so.3 $(PKGDIR)-qa-tools/$(OOUREDIR)/lib/libsalalloc_malloc.so.3
-
-  ifeq "$(ENABLE_JAVA)" "y"
-	mkdir -p -m755 $(PKGDIR)-qa-tools/$(OODIR)/program/classes
-	mkdir -p -m755 $(PKGDIR)-qa-tools/usr/share/java/$(OODIRNAME)
-	cp $(SOURCE_TREE)/qadevOOo/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/class/OOoRunnerLight.jar \
-		$(PKGDIR)-qa-tools/usr/share/java/$(OODIRNAME)
-	ln -sf /usr/share/java/$(OODIRNAME)/OOoRunnerLight.jar \
-		$(PKGDIR)-qa-tools/$(OODIR)/program/classes/OOoRunnerLight.jar
-  endif
-
-	mkdir -p -m755 $(PKGDIR)-qa-tools/$(OODIR)/smoketest
-	install -m755 $(SOURCE_TREE)/smoketestoo_native/smoketest.pl \
-		$(SOURCE_TREE)/smoketestoo_native/testlog.pl \
-		$(PKGDIR)-qa-tools/$(OODIR)/smoketest
-
-	mkdir -p -m755 $(PKGDIR)-qa-tools/$(OODIR)/presets/basic/Standard
-	install -m644 $(SOURCE_TREE)/smoketestoo_native/data/scripts/*.x* \
-		$(PKGDIR)-qa-tools/$(OODIR)/presets/basic/Standard
-
-	mv $(PKGDIR)-core/$(OODIR)/program/testtoolrc \
-		$(PKGDIR)-qa-tools/$(OODIR)/program && \
-	chmod 644 $(PKGDIR)-qa-tools/$(OODIR)/program/testtoolrc
-else
 	rm -f $(PKGDIR)-core/$(OODIR)/program/testtool.bin
 	rm -f $(PKGDIR)-core/$(OODIR)/program/libcommuni*
 	rm -f $(PKGDIR)-core/$(OODIR)/program/libsimplecm*
 	rm -f $(PKGDIR)-common/$(OODIR)/program/testtoolrc
-endif
 
 ifeq "$(USE_OOO_BUILD_DESKTOPS)" "n"
 	# menu files from sysui
@@ -2912,56 +2850,6 @@
 		$(PKGDIR)-dtd-officedocument1.0/$(OODIR)/share/dtd
 	cp debian/catalog.xml $(PKGDIR)-dtd-officedocument1.0/$(OODIR)/share/dtd/officedocument/1_0
 
-ifeq "$(PACKAGE_QA_TOOLS)" "y"
-  ifeq "$(ENABLE_JAVA)" "y"
-	mkdir -p -m755 $(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/tests/java
-	for d in objdsc testdocs; do \
-		cp -r $(SOURCE_TREE)/qadevOOo/$$d $(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/$$d; \
-	done
-  endif
-
-	mkdir -p -m755 $(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/tests
-	cp -r $(SOURCE_TREE)/qadevOOo/tests/basic $(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/tests
-  ifeq "$(ENABLE_JAVA)" "y"
-	for d in mod ifc; do \
-		cp -r $(SOURCE_TREE)/qadevOOo/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/class/$$d $(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/tests/java; \
-	done
-  endif
-
-	find $(PKGDIR)-qa-api-tests -type d -name "CVS" | xargs rm -rf
-	find $(PKGDIR)-qa-api-tests -type f | xargs chmod 0644
-
-  ifeq "$(ENABLE_JAVA)" "y"
-	echo "TestBase=java_fat" > $(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/java.props
-  endif
-	echo "TestBase=java_complex" > $(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/complex.props
-	echo "TestBase=basic_fat" > $(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/basic.props
-
-	echo "BASICBRIDGE=/$(OODIR)/qadevOOo/testdocs/BasicBridge.sxw" >> \
-		$(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/basic.props
-	echo "BASICRESPTH=/$(OODIR)/qadevOOo/tests/basic" >> \
-		$(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/basic.props
-
-  ifeq "$(ENABLE_JAVA)" "y"
-	echo "DescriptionPath=/$(OODIR)/qadevOOo/objdsc" >> \
-		$(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/java.props; \
-	echo "TestDocumentPath=/$(OODIR)/qadevOOo/testdocs" >> \
-		$(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/java.props; \
-	echo "AppExecutionCommand=/$(OODIR)/program/soffice" \
-		"-norestore -nocrashreport -accept=socket,host=localhost,port=8100;urp;" >> \
-		$(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/java.props
-  endif
-	for i in complex basic; do \
-		echo "DescriptionPath=/$(OODIR)/qadevOOo/objdsc" >> \
-			$(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/$$i.props; \
-		echo "TestDocumentPath=/$(OODIR)/qadevOOo/testdocs" >> \
-			$(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/$$i.props; \
-		echo "AppExecutionCommand=/$(OODIR)/program/soffice" \
-			"-norestore -nocrashreport -accept=socket,host=localhost,port=8100;urp;" >> \
-			$(PKGDIR)-qa-api-tests/$(OODIR)/qadevOOo/$$i.props; \
-	done
-endif
-
 	# add "openoffice" symlink
 	cd $(PKGDIR)-common/usr/bin && ln -s ooffice openoffice

Reply to:

Prev by Date: ./packages/openofficeorg/3.0.1/experimental r1438: add arm to OOO_MOZILLA_ARCHS again
Next by Date: ./packages/openofficeorg/3.0.1/experimental r1439: merge from 3.1
Previous by thread: ./packages/openofficeorg/3.0.1/experimental r1438: add arm to OOO_MOZILLA_ARCHS again
Next by thread: ./packages/openofficeorg/3.0.1/experimental r1439: merge from 3.1
Index(es):
- Date
- Thread