[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-1' - configure.ac

2015-08-28 Thread Rene Engelhard 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d31ce1157a2edf8c966abcd5000b0adf44178aae
Author: Rene Engelhard r...@debian.org
Date:   Fri Aug 28 13:55:53 2015 +0200

bump gtk check to gtk+-3.0 = 3.8

Needed since 2ce903c7b2d67a46c2fe2755cfaa66d98f2eddf2

Conflicts:
configure.ac

Change-Id: I589e782baae0bd4d5906b97c371cad587aaf5c94

diff --git a/configure.ac b/configure.ac
index e77c598..02e8c7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9895,7 +9895,7 @@ if test x$enable_gtk3 = xyes; then
 AC_MSG_ERROR([System cairo required for gtk3 support, do not combine 
--enable-gtk3 with --without-system-cairo])
 fi
 : ${with_system_cairo:=yes}
-PKG_CHECK_MODULES(GTK3, gtk+-3.0 = 3.2 gtk+-unix-print-3.0 
gmodule-no-export-2.0 cairo, ENABLE_GTK3=TRUE, ENABLE_GTK3=)
+PKG_CHECK_MODULES(GTK3, gtk+-3.0 = 3.8 gtk+-unix-print-3.0 
gmodule-no-export-2.0 cairo, ENABLE_GTK3=TRUE, ENABLE_GTK3=)
 if test x$ENABLE_GTK3 = xTRUE; then
 R=gtk3
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-1' - configure.ac

2015-08-28 Thread Rene Engelhard 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f390174847c955d34db0f7753887cc1ce1b4df9d
Author: Rene Engelhard r...@debian.org
Date:   Fri Aug 28 14:02:28 2015 +0200

Revert bump gtk check to gtk+-3.0 = 3.8

This reverts commit d31ce1157a2edf8c966abcd5000b0adf44178aae.

Wrong branch..

diff --git a/configure.ac b/configure.ac
index 02e8c7f..e77c598 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9895,7 +9895,7 @@ if test x$enable_gtk3 = xyes; then
 AC_MSG_ERROR([System cairo required for gtk3 support, do not combine 
--enable-gtk3 with --without-system-cairo])
 fi
 : ${with_system_cairo:=yes}
-PKG_CHECK_MODULES(GTK3, gtk+-3.0 = 3.8 gtk+-unix-print-3.0 
gmodule-no-export-2.0 cairo, ENABLE_GTK3=TRUE, ENABLE_GTK3=)
+PKG_CHECK_MODULES(GTK3, gtk+-3.0 = 3.2 gtk+-unix-print-3.0 
gmodule-no-export-2.0 cairo, ENABLE_GTK3=TRUE, ENABLE_GTK3=)
 if test x$ENABLE_GTK3 = xTRUE; then
 R=gtk3
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-1' - configure.ac

2015-08-22 Thread Robinson Tryon 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 529b52b5f0439fee06c69abdc30d129a2d3ac157
Author: Robinson Tryon qu...@runcibility.com
Date:   Sat Aug 22 01:41:35 2015 -0500

bump product version to 5.0.1.2

Change-Id: I6bcb18fd29aafdf4f3b89d07d7eefa616ed35795

diff --git a/configure.ac b/configure.ac
index 4afd95b..e77c598 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[5.0.1.1.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.0.1.2.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-1' - configure.ac

2015-08-07 Thread Christian Lohmaier 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f19f66f716e63a752c8985b27d7c36b9f189a44e
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Fri Aug 7 19:26:04 2015 +0200

bump product version to 5.0.1.1.0+

Change-Id: I700f0e2b829e017ac094e762990a06c375b6f8fe

diff --git a/configure.ac b/configure.ac
index 601a3cf..4afd95b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[5.0.1.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.0.1.1.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits