The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit c42f607dc9e28a6dbc0f7f3bf3a6b8d892c9ae7e
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Mon Jun 25 09:58:20 2012 +0200
update to beta2
diff --git a/changelog b/changelog
index 4b1b933..e602926 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+libreoffice (1:3.6.0~beta2) quantal; urgency=low
+
+ * new upstream beta
+ * fix gcc versioning
+ * disable broken pdfimport test for now
+
+ -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Mon, 25 Jun 2012
09:55:11 +0200
+
libreoffice (1:3.6.0~beta1-0ubuntu5) quantal; urgency=low
* new upstream beta, rebasing on debian
diff --git a/rules b/rules
index 8e29f15..9bd99bc 100755
--- a/rules
+++ b/rules
@@ -69,11 +69,9 @@ 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.0.0.beta2
-# NOT in proper libreoffice-3-6 branch
-# use ./g checkout -b tag-libreoffice-3.6.0.0.beta2 libreoffice-3.6.0.0.beta2
-GIT_TAG=libreoffice-$(lo_sources_ver)
-GIT_BRANCH=libreoffice-3-6
+lo_sources_ver:=3.6.0.0.beta2
+GIT_TAG:=libreoffice-$(lo_sources_ver)
+GIT_BRANCH=libreoffice-3.6
ifneq ($(findstring ~git,$(DEB_VERSION_UPSTREAM)),)
GIT_TAG=master
endif
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1sjs7z-0006ls...@vasks.debian.org
