The following commit has been merged in the debian-experimental-4.1 branch:
commit ea81963bf48b7e01a0fde6886473d41327f1e539
Author: Rene Engelhard <[email protected]>
Date: Wed Jul 3 18:59:19 2013 +0200
rc2
diff --git a/changelog b/changelog
index dba642c..cdca0f0 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,6 @@
-libreoffice (1:4.1.0~rc1-2) UNRELEASED; urgency=low
+libreoffice (1:4.1.0~rc2-1) UNRELEASED; urgency=low
+
+ * new upstream release candidate
* debian/patches/hack-interlck_sparc.diff: hack around sparc build failure,
#undef __sparcv8plus, __sparcv9 and __sparc_v9__ for interlck_sparc.o as
diff --git a/control b/control
index 93ca776..7013e9f 100644
--- a/control
+++ b/control
@@ -168,7 +168,7 @@ XS-Python3-Version: 3.3
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: mailto:[email protected]
Homepage: http://www.libreoffice.org
Package: libreoffice
diff --git a/patches/javadoc-optional.diff b/patches/javadoc-optional.diff
index ebbd831..47e5232 100644
--- a/patches/javadoc-optional.diff
+++ b/patches/javadoc-optional.diff
@@ -4,20 +4,22 @@ Gemeinsame Unterverzeichnisse: odk-old/examples und
odk/examples.
diff -u odk-old/Module_odk.mk odk/Module_odk.mk
--- a/odk-old/Module_odk.mk 2013-05-22 16:12:06.000000000 +0200
+++ b/odk/Module_odk.mk 2013-05-27 18:25:34.811316443 +0200
-@@ -55,9 +55,11 @@
+@@ -55,11 +55,13 @@ ifneq ($(SOLAR_JAVA),)
$(eval $(call gb_Module_add_targets,odk,\
$(if $(filter YESGCC,$(BUILD_UNOWINREG)$(COM)),CustomTarget_unowinreg) \
CustomTarget_classes \
- CustomTarget_javadoc \
+ GeneratedPackage_uno_loader_classes \
$(if $(filter WNT,$(OS)),Library_unowinreg) \
- Package_javadoc \
+ Package_unowinreg \
+ $(if $(JAVADOC),\
+ CustomTarget_javadoc \
+ Package_javadoc \
+ ) \
- Package_uno_loader_classes \
- Package_unowinreg \
))
+ endif
+
Gemeinsame Unterverzeichnisse: odk-old/pack und odk/pack.
Gemeinsame Unterverzeichnisse: odk-old/qa und odk/qa.
Gemeinsame Unterverzeichnisse: odk-old/settings und odk/settings.
diff --git a/rules b/rules
index 54e4e6a..f815b87 100755
--- a/rules
+++ b/rules
@@ -70,7 +70,7 @@ lo_sources_ver=$(shell grep AC_INIT
$(SOURCE_TREE)/configure.ac | grep documentf
# NOT in proper libreoffice-3-6 branch
# use ./g checkout -b tag-libreoffice-3.6.2.1 libreoffice-3.6.2.1
GIT_TAG=libreoffice-$(lo_sources_ver)
-GIT_BRANCH=libreoffice-4-1
+GIT_BRANCH=libreoffice-4-1-0
endif
ifeq "$(USE_SOURCE_TARBALLS)" "y"
lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
