[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0_rc1-1-20-g8b4a784
The following commit has been merged in the debian-experimental-3.5 branch:
commit 402d3fb24e3854bfa44acea9295a00aadb269a92
Author: Rene Engelhard <rene@debian.org>
Date: Tue Jan 24 18:26:01 2012 +0100
update to rc2
diff --git a/changelog b/changelog
index 4767d8e..347de3d 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:3.5.0~rc2-1) UNRELEASED; urgency=low
+
+ * new upstream release candidate
+
+ -- Rene Engelhard <rene@debian.org> Tue, 24 Jan 2012 18:25:17 +0100
+
libreoffice (1:3.5.0~rc1-2) UNRELEASED; urgency=low
* debian/rules:
diff --git a/patches/gbuild-JavaClassSet-honour-JAVAFLAGS.diff b/patches/gbuild-JavaClassSet-honour-JAVAFLAGS.diff
deleted file mode 100644
index ddc3460..0000000
--- a/patches/gbuild-JavaClassSet-honour-JAVAFLAGS.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/solenv/gbuild/JavaClassSet.mk-old 2012-01-19 12:30:15.000000000 +0000
-+++ b/solenv/gbuild/JavaClassSet.mk 2012-01-19 12:30:29.000000000 +0000
-@@ -26,7 +26,7 @@
- #
- #*************************************************************************
-
--gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER)
-+gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER) $(JAVAFLAGS)
- gb_JavaClassSet_JAVACDEBUG :=
-
- ifneq ($(gb_DEBUGLEVEL),0)
diff --git a/patches/series b/patches/series
index 7318b98..c50a0b0 100644
--- a/patches/series
+++ b/patches/series
@@ -26,4 +26,3 @@ add-debian-multiarch-support.diff
revert-468fe685e3c58c84bce6d9a48b931dcc21682679.diff
propagate-gb_FULLDEPS.diff
disable-sc-unoapi-subsequentcheck-for-now.diff
-gbuild-JavaClassSet-honour-JAVAFLAGS.diff
diff --git a/rules b/rules
index 30fb993..12069a1 100755
--- a/rules
+++ b/rules
@@ -63,9 +63,9 @@ export QUILT_OPTIONS="-p1 -F0"
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
# NOT in proper libreoffice-3-5 branch
-# use ./g checkout -b tag-libreoffice-3.5.0.1 libreoffice-3.5.0.1
-GIT_TAG=libreoffice-3.5.0.1
-GIT_BRANCH=tag-libreoffice-3.5.0.1
+# use ./g checkout -b tag-libreoffice-3.5.0.2 libreoffice-3.5.0.2
+GIT_TAG=libreoffice-3.5.0.2
+GIT_BRANCH=tag-libreoffice-3.5.0.2
SOURCE_TREE=.
STAMP_DIR=debian/stampdir
TARFILE_LOCATION=$(CURDIR)/ext-sources
--
LibreOffice packaging repository
Reply to: