[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.3-4-19-g4ab7ba1
The following commit has been merged in the master branch:
commit c4919f7e90f4e59115166874bb295708054963c5
Author: Rene Engelhard <rene@debian.org>
Date: Wed Nov 2 07:56:43 2011 +0000
update for rc2
diff --git a/changelog b/changelog
index 7b83aec..f8b4816 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.4.4~rc1-1) UNRELEASED; urgency=low
+libreoffice (1:3.4.4~rc2-1) UNRELEASED; urgency=low
* New upstream release
- repackage liblayout and seamonkey in ext-sources to remove
@@ -18,7 +18,7 @@ libreoffice (1:3.4.4~rc1-1) UNRELEASED; urgency=low
* debian/rules, debian/*.menu.in:
- also add icon version to debian menus (closes: #645953)
- -- Rene Engelhard <rene@debian.org> Thu, 27 Oct 2011 19:40:31 +0000
+ -- Rene Engelhard <rene@debian.org> Tue, 01 Nov 2011 20:33:15 +0100
libreoffice (1:3.4.3-4) unstable; urgency=low
diff --git a/patches/autogen.diff b/patches/autogen.diff
index a877db6..10b527a 100644
--- a/patches/autogen.diff
+++ b/patches/autogen.diff
@@ -2552,7 +2552,7 @@
@@ -0,0 +1,8705 @@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
-+# Generated by GNU Autoconf 2.68 for libreoffice-build 3.4.4.1.
++# Generated by GNU Autoconf 2.68 for libreoffice-build 3.4.4.2.
+#
+#
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -3109,8 +3109,8 @@
+# Identity of this package.
+PACKAGE_NAME='libreoffice-build'
+PACKAGE_TARNAME='libreoffice-build'
-+PACKAGE_VERSION='3.4.4.1'
-+PACKAGE_STRING='libreoffice-build 3.4.4.1'
++PACKAGE_VERSION='3.4.4.2'
++PACKAGE_STRING='libreoffice-build 3.4.4.2'
+PACKAGE_BUGREPORT=''
+PACKAGE_URL=''
+
@@ -4021,7 +4021,7 @@
+ # Omit some internal or obsolete options to make the list less imposing.
+ # This message is too long to be a string in the A/UX 3.1 sh.
+ cat <<_ACEOF
-+\`configure' configures libreoffice-build 3.4.4.1 to adapt to many kinds of systems.
++\`configure' configures libreoffice-build 3.4.4.2 to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
@@ -4088,7 +4088,7 @@
+
+if test -n "$ac_init_help"; then
+ case $ac_init_help in
-+ short | recursive ) echo "Configuration of libreoffice-build 3.4.4.1:";;
++ short | recursive ) echo "Configuration of libreoffice-build 3.4.4.2:";;
+ esac
+ cat <<\_ACEOF
+
@@ -4492,7 +4492,7 @@
+test -n "$ac_init_help" && exit $ac_status
+if $ac_init_version; then
+ cat <<\_ACEOF
-+libreoffice-build configure 3.4.4.1
++libreoffice-build configure 3.4.4.2
+generated by GNU Autoconf 2.68
+
+Copyright (C) 2010 Free Software Foundation, Inc.
@@ -4744,7 +4744,7 @@
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
-+It was created by libreoffice-build $as_me 3.4.4.1, which was
++It was created by libreoffice-build $as_me 3.4.4.2, which was
+generated by GNU Autoconf 2.68. Invocation command line was
+
+ $ $0 $@
@@ -5566,7 +5566,7 @@
+
+# Define the identity of the package.
+ PACKAGE='libreoffice-build'
-+ VERSION='3.4.4.1'
++ VERSION='3.4.4.2'
+
+
+cat >>confdefs.h <<_ACEOF
@@ -5693,7 +5693,7 @@
+DEJAVU_FONTS_UPSTREAM_MAJOR_VER=2
+DEJAVU_FONTS_UPSTREAM_MINOR_VER=32
+
-+OOO_BUILDVERSION=3.4.4.1
++OOO_BUILDVERSION=3.4.4.2
+
+
+PROPAGATED_ARGS=$ac_configure_args
@@ -10310,7 +10310,7 @@
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
-+This file was extended by libreoffice-build $as_me 3.4.4.1, which was
++This file was extended by libreoffice-build $as_me 3.4.4.2, which was
+generated by GNU Autoconf 2.68. Invocation command line was
+
+ CONFIG_FILES = $CONFIG_FILES
@@ -10367,7 +10367,7 @@
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ac_cs_version="\\
-+libreoffice-build config.status 3.4.4.1
++libreoffice-build config.status 3.4.4.2
+configured by $0, generated by GNU Autoconf 2.68,
+ with options \\"\$ac_cs_config\\"
+
diff --git a/rules b/rules
index 9a28464..9a68675 100755
--- a/rules
+++ b/rules
@@ -82,7 +82,7 @@ MILESTONE=m1
TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
GIT_TAG=$(MWS)_$(MILESTONE)
OOO_BUILD_BRANCH=libreoffice-3-4-4
-OOO_BUILD_VERSION=3.4.4.1
+OOO_BUILD_VERSION=3.4.4.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)
--
LibreOffice packaging repository
Reply to: