[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. libreoffice_3.3.3-3-98-gc7ce3fb
The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 3eec5128efa4005a4a1e0530d2e2069c5fdf9d41
Author: Rene Engelhard <rene@debian.org>
Date: Fri Jul 1 12:41:18 2011 +0200
3.4.1 is released
diff --git a/changelog b/changelog
index 03bac6d..ccaad7b 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.4.0-1) UNRELEASED; urgency=low
+libreoffice (1:3.4.1-1) UNRELEASED; urgency=low
* new upstream release
- handles various table columns differing in case correct
diff --git a/patches/fix-connectivity-tests-with-system-hsqldb.diff b/patches/fix-connectivity-tests-with-system-hsqldb.diff
deleted file mode 100644
index d04e3b2..0000000
--- a/patches/fix-connectivity-tests-with-system-hsqldb.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- libreoffice-3.4.0/libreoffice-build/patches/dev300/apply-old 2011-06-14 22:04:36.000000000 +0000
-+++ libreoffice-3.4.0/libreoffice-build/patches/dev300/apply 2011-06-14 22:05:17.000000000 +0000
-@@ -358,6 +358,8 @@
- # add missing #include <stdio.h> in autodoc, breaks when building with STLport5
- #autodoc-add-missing-stdio-h.diff, rengelha
-
-+fix-connectivity-tests-with-system-hsqldb.diff
-+
- [ DebianOnly ]
- open-url-support-iceanimals.diff
-
---- /dev/null 2011-06-02 14:58:12.448567841 +0000
-+++ libreoffice-3.4.0/libreoffice-build/patches/dev300/fix-connectivity-tests-with-system-hsqldb.diff 2011-05-31 10:55:44.000000000 +0000
-@@ -0,0 +1,19 @@
-+--- connectivity/qa/makefile.mk-old 2011-05-31 10:44:54.000000000 +0000
-++++ connectivity/qa/makefile.mk 2011-05-31 10:55:37.000000000 +0000
-+@@ -35,9 +35,15 @@
-+
-+ #----- compile .java files -----------------------------------------
-+
-+-JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar hsqldb.jar
-++JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-+ JAVAFILES := $(shell @$(FIND) complex -name "*.java")
-+
-++.IF "$(SYSTEM_HSQLDB)" == "YES"
-++XCLASSPATH:=$(XCLASSPATH)$(PATH_SEPERATOR)$(HSQLDB_JAR)
-++.ELSE
-++JARFILES+= hsqldb.jar
-++.ENDIF
-++
-+ #----- make a jar from compiled files ------------------------------
-+
-+ JARCLASSDIRS = $(PACKAGE)
diff --git a/rules b/rules
index 006e7b0..b799c0e 100755
--- a/rules
+++ b/rules
@@ -81,8 +81,8 @@ MWS=OOO340
MILESTONE=m1
TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
GIT_TAG=$(MWS)_$(MILESTONE)
-OOO_BUILD_BRANCH=libreoffice-3-4-0
-OOO_BUILD_VERSION=3.4.0.2
+OOO_BUILD_BRANCH=libreoffice-3-4-1
+OOO_BUILD_VERSION=3.4.1.3
# in ooo-build releases the same as OOO_BUILD_VERSION
OOO_BUILD_TARBALL_VERSION=$(OOO_BUILD_VERSION)
OOO_BUILD_TAG=libreoffice-$(OOO_BUILD_TARBALL_VERSION)
--
LibreOffice packaging repository
Reply to: