The following commit has been merged in the debian-experimental-3.5 branch:
commit f124f6e885cc78fc0f7c524a1a1025ebb553c6e6
Author: Rene Engelhard <r...@debian.org>
Date:   Sat Apr 21 17:23:08 2012 +0200

    set lo_sources_ver and use it for GIT_TAG/GIT_BRANCH

diff --git a/rules b/rules
index d2fc2e2..4bbc633 100755
--- a/rules
+++ b/rules
@@ -61,17 +61,23 @@ export DH_ALWAYS_EXCLUDE=CVS:.svn:.bzr:.git
 export QUILT_PATCHES=debian/patches
 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.3.1 libreoffice-3.5.3.1
-GIT_TAG=libreoffice-3.5.3.1
-GIT_BRANCH=tag-libreoffice-3.5.3.1
 SOURCE_TREE=.
 STAMP_DIR=debian/stampdir
 TARFILE_LOCATION=$(CURDIR)/src
 export TARFILE_LOCATION
 USE_SOURCE_TARBALLS=y
 USE_GIT_TARBALLS=n
+ifeq "$(USE_GIT_TARBALLS)" "y"
+GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
+lo_sources_ver=3.5.3.1
+# NOT in proper libreoffice-3-5 branch
+# use ./g checkout -b tag-libreoffice-3.5.3.1 libreoffice-3.5.3.1
+GIT_TAG=libreoffice-$(lo_sources_ver)
+GIT_BRANCH=tag-libreoffice-$(lo_sources_ver)
+endif
+ifeq "$(USE_SOURCE_TARBALLS)" "y"
+lo_sources_ver=$(eval cat $(CURDIR)/sources.ver)
+endif
 
 ifeq "$(DISTREL)" "squeeze"
  SQUEEZE_BACKPORT=y

-- 
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/e1slu3e-00028t...@vasks.debian.org

Reply via email to