[SCM] LibreOffice packaging repository branch, debian-experimental-3.7, updated. libreoffice_3.6.4_rc1-1-114-gcd0967d
The following commit has been merged in the debian-experimental-3.7 branch:
commit e1cb5b61c548d992fe20db5a5f915257bf352634
Author: Rene Engelhard <rene@debian.org>
Date: Wed Nov 21 01:47:08 2012 +0100
git update; don't use --enable-release-build for alpha/beta
diff --git a/changelog b/changelog
index 7a9e79c..1754db9 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.0.0~alpha0~git20121116-1) UNRELEASED; urgency=low
+libreoffice (1:4.0.0~alpha1+git20121120-1) UNRELEASED; urgency=low
* new upstream snapshot
- contains new driver for mozab (mork). Automatically enabled thus
@@ -22,7 +22,7 @@ libreoffice (1:4.0.0~alpha0~git20121116-1) UNRELEASED; urgency=low
* debian/control*.in, debian/rules, debian/scripts/gid2pkgdirs.sh: binfilter
is gone. yay.
- -- Rene Engelhard <rene@debian.org> Tue, 06 Nov 2012 20:43:46 +0100
+ -- Rene Engelhard <rene@debian.org> Tue, 20 Nov 2012 14:16:33 +0100
libreoffice (1:3.6.4~rc1-1) experimental; urgency=low
diff --git a/rules b/rules
index f50a8d6..64f0bf5 100755
--- a/rules
+++ b/rules
@@ -70,10 +70,10 @@ USE_SOURCE_TARBALLS=y
USE_GIT_TARBALLS=n
ifeq "$(USE_GIT_TARBALLS)" "y"
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
-lo_sources_ver=4.0.0.0.alpha
+lo_sources_ver=4.0.0.0.alpha1
# 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_TAG=libreoffice-$(lo_sources_ver)
#GIT_BRANCH=libreoffice-3-6-2
endif
ifeq "$(USE_SOURCE_TARBALLS)" "y"
@@ -340,10 +340,13 @@ CONFIGURE_FLAGS= \
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--disable-online-update \
--disable-fetch-external \
- --enable-release-build \
--without-fonts \
--without-myspell-dicts
+ifeq "$(shell echo $(DEB_VERSION_UPSTREAM) | grep -E '(alpha|beta)'; echo $$?)" "0"
+CONFIGURE_FLAGS += --enable-release-build
+endif
+
ifneq ($(ON_BUILDD),y)
CONFIGURE_FLAGS += --enable-verbose
endif
@@ -2281,18 +2284,6 @@ ifeq "$(PACKAGE_SDK)" "y"
cd $(PKGDIR)-dev/$(OOSDKDIR) && \
rm docs
- # install gsicheck into -dev
- mkdir -p $(PKGDIR)-dev/$(OODIR)/program
- install -m755 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo $$OUTPATH$$PROEXT)/bin/gsicheck \
- $(PKGDIR)-dev/$(OODIR)/program/gsicheck.bin
- ( \
- echo '#! /bin/sh'; \
- echo 'LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}/$(OODIR)/program'; \
- echo 'export LD_LIBRARY_PATH'; \
- echo 'exec /$(OODIR)/program/gsicheck.bin "$$@"'; \
- ) > $(PKGDIR)-dev/$(OODIR)/program/gsicheck
- chmod 755 $(PKGDIR)-dev/$(OODIR)/program/gsicheck
-
# fix permissions
find $(PKGDIR)-dev/usr/share/idl/$(OODIRNAME) -type f -exec chmod 644 {} \;
--
LibreOffice packaging repository
Reply to: