[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, ubuntu-saucy-4.1, updated. libreoffice_4.1.0_beta1-2-287-g58523f8



The following commit has been merged in the ubuntu-saucy-4.1 branch:
commit ae9f50ea4e8a99b438d4d9d2274dd994c8e4f778
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Fri Jun 7 17:48:22 2013 +0200

    upstream beta2

diff --git a/changelog b/changelog
index 1e7cc58..c34d190 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:4.1.0~beta2-0ubuntu1~ppa1) saucy; urgency=low
+
+  * new upstream beta
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Fri, 07 Jun 2013 17:47:48 +0200
+
 libreoffice (1:4.1.0~beta2~git20130604-1) UNRELEASED; urgency=low
 
   * debian/patches/show-the-startcenter.diff: as name says, remove
diff --git a/rules b/rules
index a31f5bb..7b985a1 100755
--- a/rules
+++ b/rules
@@ -69,7 +69,9 @@ USE_SOURCE_TARBALLS=n
 USE_GIT_TARBALLS=n
 ifeq "$(USE_GIT_TARBALLS)" "y"
 GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
-lo_sources_ver=$(shell grep AC_INIT $(SOURCE_TREE)/configure.ac | grep documentfoundation | cut -d, -f2 | sed -e 's,\[,,' -e 's,\],,')
+# bootstraping this from the source tree is breaking get-orig-source
+#lo_sources_ver=$(shell grep AC_INIT $(SOURCE_TREE)/configure.ac | grep documentfoundation | cut -d, -f2 | sed -e 's,\[,,' -e 's,\],,')
+lo_sources_ver=4.1.0.0.beta2
 # 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)

-- 
LibreOffice packaging repository


Reply to: