[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.6.5-1-30-g65c318d
The following commit has been merged in the debian-experimental-3.6 branch:
commit a22064dc6614ba15d735f669347e424dd5c4c748
Author: Rene Engelhard <rene@debian.org>
Date: Mon Mar 18 23:51:13 2013 +0100
prepare for 3.6.6 rc1
diff --git a/changelog b/changelog
index 926d9d3..362a85b 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,6 @@
-libreoffice (1:3.6.5-2) UNRELEASED; urgency=low
+libreoffice (1:3.6.6~rc1-1) UNRELEASED; urgency=low
+
+ * new upstream release candidate
* debian/patches/odk-link-to-jdk-1.5-docs.diff: link to
http://java.sun.com/j2se/1.5/docs/api instead of /1.4.1/ as the former
@@ -16,7 +18,7 @@ libreoffice (1:3.6.5-2) UNRELEASED; urgency=low
* debian/control.help.in:
- remove obsolete ${java-common-depends} Recommends
- -- Rene Engelhard <rene@debian.org> Sun, 03 Feb 2013 15:23:55 +0100
+ -- Rene Engelhard <rene@debian.org> Mon, 18 Mar 2013 23:50:23 +0100
libreoffice (1:3.6.5-1) experimental; urgency=low
diff --git a/rules b/rules
index 2e52bbe..5bf9cce 100755
--- a/rules
+++ b/rules
@@ -68,11 +68,11 @@ USE_SOURCE_TARBALLS=y
USE_GIT_TARBALLS=n
ifeq "$(USE_GIT_TARBALLS)" "y"
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
-lo_sources_ver=3.6.5.2
+lo_sources_ver=3.6.6.1
# NOT in proper libreoffice-3-6 branch
-# use ./g checkout -b tag-libreoffice-3.6.5.2 libreoffice-3.6.5.2
+# use ./g checkout -b tag-libreoffice-3.6.6.1 libreoffice-3.6.6.1
GIT_TAG=libreoffice-$(lo_sources_ver)
-GIT_BRANCH=libreoffice-3-6-5
+GIT_BRANCH=libreoffice-3-6-6
endif
ifeq "$(USE_SOURCE_TARBALLS)" "y"
lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)
--
LibreOffice packaging repository
Reply to: