[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. libreoffice_3.3.3-1-84-g3df0684
The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 3df0684de9d791d8fde8a46b488acde1acdbfd2b
Author: Rene Engelhard <rene@debian.org>
Date: Fri Jun 24 19:40:53 2011 +0200
update libreoffice-build
diff --git a/changelog b/changelog
index 0aa60b9..7b035d9 100644
--- a/changelog
+++ b/changelog
@@ -5,7 +5,7 @@ libreoffice (1:3.4.0-1) UNRELEASED; urgency=low
(closes: #617596)
- should fix embedding of (some) fonts in PDFs (closes: #616117)
- (still) use libreoffice-build for now; not tagged,
- use fa53eff3b6bee370e65a5e42767f83b35e1bc5af
+ use 3fd2f1b1cbcab8ecd5a642d36cf071d391ad881f
* debian/rules:
- bump build-dep on libmdds-dev to >= 0.5.0
@@ -28,14 +28,14 @@ libreoffice (1:3.4.0-1) UNRELEASED; urgency=low
* debian/rules, debian/patches/packcomponents-remove-split-components.diff:
remove evoab, binfilter and kdeab deregistering into patch patching
the new packcomponents
- * debian/shell-lib-components.sh: add new update_services_rdb() merging "default"
- services.rdb and the .component files from registered-components
+ * debian/shell-lib-components.sh: add new update_services_rdb() merging
+ "default" services.rdb and the .component files from registered-components
* debian/libreoffice-common.triggers.in, libreoffice-*.p*.in:
new trigger running update_services_rdb, remove obsolete maintainer scripts
* debian/libreoffice-filter-binfilter.links.in: actually create symlink
for libbindet*so in registered-components
- -- Rene Engelhard <rene@debian.org> Wed, 22 Jun 2011 22:21:55 +0000
+ -- Rene Engelhard <rene@debian.org> Sat, 25 Jun 2011 09:15:02 +0200
libreoffice (1:3.3.3-1) unstable; urgency=medium
diff --git a/rules b/rules
index f5908d3..575be26 100755
--- a/rules
+++ b/rules
@@ -200,11 +200,7 @@ USE_OOO_BUILD_DESKTOPS=n
PACKAGE_SDK=y
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(JDK)" "openjdk"
- ifneq "$(ARCH)" "sparc"
- RUN_SMOKETEST=y
- else
- RUN_SMOKETEST=n
- endif
+ RUN_SMOKETEST=n
RUN_SUBSEQUENT_TESTS=y
else
ifneq ($(ON_BUILDD),y)
--
LibreOffice packaging repository
Reply to: