[SCM] LibreOffice packaging repository branch, master, updated. 21948d8beeb534d53ef770d93abce6b0e9df0f64
The following commit has been merged in the master branch:
commit 6aed87acb4d053886dcb61c578fc2304a83f7391
Author: Rene Engelhard <rene@debian.org>
Date: Wed Feb 16 01:41:52 2011 +0100
update to rc2
diff --git a/changelog b/changelog
index d568e80..d928357 100644
--- a/changelog
+++ b/changelog
@@ -1,11 +1,13 @@
-libreoffice (1:3.3.1~rc1-3) UNRELEASED; urgency=low
+libreoffice (1:3.3.1~rc2-1) UNRELEASED; urgency=low
+
+ * new upstream release candidate
* debian/control.in:
- update for new git
* debian/rules, debian/soffice.sh, debian/README.DEbian:
- more s/OOo/LibreOffice/ (closes: #613215)
- -- Rene Engelhard <rene@debian.org> Mon, 14 Feb 2011 20:02:55 +0100
+ -- Rene Engelhard <rene@debian.org> Wed, 16 Feb 2011 00:53:26 +0100
libreoffice (1:3.3.1~rc1-2) unstable; urgency=low
diff --git a/rules b/rules
index a295377..13a06a2 100755
--- a/rules
+++ b/rules
@@ -82,7 +82,7 @@ MILESTONE=m19
TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
GIT_TAG=$(MWS)_$(MILESTONE)
OOO_BUILD_BRANCH=libreoffice-3-3-1
-OOO_BUILD_VERSION=3.3.1.1
+OOO_BUILD_VERSION=3.3.1.2
# in ooo-build releases the same as OOO_BUILD_VERSION
OOO_BUILD_TARBALL_VERSION=$(OOO_BUILD_VERSION)
OOO_BUILD_TAG=libreoffice-$(OOO_BUILD_TARBALL_VERSION)
@@ -1576,7 +1576,7 @@ ifeq "$(BUILD_KDE)" "y"
endif
ifeq "$(ENABLE_LDAP)" "y"
- perl -pi -e 's/paperconf$$/paperconf\n * $(LDAP_LIB): LDAP client library; needed for LibreOffice getting its profiles\n from LDAP/' debian/control
+ perl -pi -e 's/paperconf$$/paperconf\n * $(LDAP_LIB): LDAP client library; needed for LibreOffice getting its\n profiles from LDAP/' debian/control
endif
ifneq "$(DICT_DIR)" "/usr/share/hunspell"
--
LibreOffice packaging repository
Reply to: