[Pkg-cli-apps-commits] [gnome-do] 02/04: Import new upstream 0.95.1 release
Christopher Halse Rogers
raof-guest at moszumanska.debian.org
Tue Jan 28 06:42:51 UTC 2014
This is an automated email from the git hooks/post-receive script.
raof-guest pushed a commit to branch master
in repository gnome-do.
commit 688ad3f7559cc9a9d531cb7fedd2ff654bf5b4ea
Author: Christopher James Halse Rogers <raof at ubuntu.com>
Date: Tue Jan 28 17:40:55 2014 +1100
Import new upstream 0.95.1 release
---
Do.Interface.Linux.AnimationBase/Makefile.in | 2 +-
Do.Interface.Linux.Classic/Makefile.in | 2 +-
Do.Interface.Linux.GlassFrame/Makefile.in | 2 +-
Do.Interface.Linux.HUD/Makefile.in | 2 +-
Do.Interface.Linux.Mini/Makefile.in | 2 +-
Do.Interface.Linux/Makefile.am | 12 +++++
Do.Interface.Linux/Makefile.in | 18 ++++++--
.../Cairo32Compatibility.cs | 39 ++++++++++++++++
.../Do.Interface.CairoUtils/CairoUtils.cs | 4 ++
.../src/Do.Interface/Do.Interface.Widgets/Frame.cs | 2 +
.../Do.Interface.Widgets/GlossyRoundedFrame.cs | 4 ++
Do.Platform.Linux.JoliCloud/Makefile.in | 2 +-
Do.Platform.Linux/Makefile.in | 2 +-
Do.Platform/Makefile.in | 2 +-
Do.Universe/Makefile.in | 2 +-
Do/Makefile.in | 2 +-
Do/src/AssemblyInfo.cs | 4 +-
Makefile.in | 5 +-
Tests/Makefile.in | 2 +-
aclocal.m4 | 6 +--
configure | 54 ++++++++++++++++++----
configure.ac | 13 +++++-
data/Makefile.in | 2 +-
data/icons/Makefile.in | 2 +-
data/icons/hicolor/128x128/Makefile.in | 2 +-
data/icons/hicolor/128x128/apps/Makefile.in | 2 +-
data/icons/hicolor/16x16/Makefile.in | 2 +-
data/icons/hicolor/16x16/apps/Makefile.in | 2 +-
data/icons/hicolor/24x24/Makefile.in | 2 +-
data/icons/hicolor/24x24/apps/Makefile.in | 2 +-
data/icons/hicolor/32x32/Makefile.in | 2 +-
data/icons/hicolor/32x32/apps/Makefile.in | 2 +-
data/icons/hicolor/48x48/Makefile.in | 2 +-
data/icons/hicolor/48x48/apps/Makefile.in | 2 +-
data/icons/hicolor/64x64/Makefile.in | 2 +-
data/icons/hicolor/64x64/apps/Makefile.in | 2 +-
data/icons/hicolor/Makefile.in | 2 +-
data/icons/hicolor/scalable/Makefile.in | 2 +-
data/icons/hicolor/scalable/apps/Makefile.in | 2 +-
libdo/Makefile.in | 2 +-
ltmain.sh | 4 +-
m4/Makefile.in | 2 +-
missing | 4 +-
test-driver | 20 ++++++--
44 files changed, 189 insertions(+), 60 deletions(-)
diff --git a/Do.Interface.Linux.AnimationBase/Makefile.in b/Do.Interface.Linux.AnimationBase/Makefile.in
index 3fd102f..ae88a3f 100644
--- a/Do.Interface.Linux.AnimationBase/Makefile.in
+++ b/Do.Interface.Linux.AnimationBase/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/Do.Interface.Linux.Classic/Makefile.in b/Do.Interface.Linux.Classic/Makefile.in
index 60c1d05..0762643 100644
--- a/Do.Interface.Linux.Classic/Makefile.in
+++ b/Do.Interface.Linux.Classic/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/Do.Interface.Linux.GlassFrame/Makefile.in b/Do.Interface.Linux.GlassFrame/Makefile.in
index f0fcab4..f11bc46 100644
--- a/Do.Interface.Linux.GlassFrame/Makefile.in
+++ b/Do.Interface.Linux.GlassFrame/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/Do.Interface.Linux.HUD/Makefile.in b/Do.Interface.Linux.HUD/Makefile.in
index 3ad64d6..087809a 100644
--- a/Do.Interface.Linux.HUD/Makefile.in
+++ b/Do.Interface.Linux.HUD/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/Do.Interface.Linux.Mini/Makefile.in b/Do.Interface.Linux.Mini/Makefile.in
index ce0b7e7..5a7d2cb 100644
--- a/Do.Interface.Linux.Mini/Makefile.in
+++ b/Do.Interface.Linux.Mini/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/Do.Interface.Linux/Makefile.am b/Do.Interface.Linux/Makefile.am
index e60d594..7cd5f13 100644
--- a/Do.Interface.Linux/Makefile.am
+++ b/Do.Interface.Linux/Makefile.am
@@ -37,6 +37,18 @@ FILES += \
src/Do.Interface/Tests/TestPositionWindow.cs
endif
+if NEED_CAIRO_SHIM
+FILES += \
+ src/Do.Interface/Do.Interface.CairoUtils/Cairo32Compatibility.cs
+
+BUILD_DEFINES = \
+ -define:USING_OLD_CAIRO
+endif
+
+# Automake won't do this for us
+EXTRA_DIST += \
+ src/Do.Interface/Do.Interface.CairoUtils/Cairo32Compatibility.cs
+
RESOURCES = \
Resources/Do.Interface.Linux.addin.xml \
Resources/settings-triangle.png
diff --git a/Do.Interface.Linux/Makefile.in b/Do.Interface.Linux/Makefile.in
index 51e3c71..b6554b9 100644
--- a/Do.Interface.Linux/Makefile.in
+++ b/Do.Interface.Linux/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -90,6 +90,9 @@ DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
@HAVE_NUNIT_TRUE at am__append_3 = \
@HAVE_NUNIT_TRUE@ src/Do.Interface/Tests/TestPositionWindow.cs
+ at NEED_CAIRO_SHIM_TRUE@am__append_4 = \
+ at NEED_CAIRO_SHIM_TRUE@ src/Do.Interface/Do.Interface.CairoUtils/Cairo32Compatibility.cs
+
subdir = Do.Interface.Linux
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
@@ -380,9 +383,12 @@ pkgconfig_DATA = $(PKG_CONFIG_FILES)
#
# Clean and dist targets
#
-EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+# Automake won't do this for us
+EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) \
+ $(THEME_ICONS_SOURCE) $(foreach pkgcfg_file, \
+ $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ src/Do.Interface/Do.Interface.CairoUtils/Cairo32Compatibility.cs
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
MAINTAINERCLEANFILES = Makefile.in
@@ -413,7 +419,11 @@ FILES = src/AssemblyInfo.cs \
src/Do.Interface/SearchFinishState.cs \
src/Do.Interface/UIContext.cs src/Do.Interface/Util.cs \
src/Do.Interface/Windowing.cs \
- src/Do.Universe/ImplicitTextItem.cs $(am__append_3)
+ src/Do.Universe/ImplicitTextItem.cs $(am__append_3) \
+ $(am__append_4)
+ at NEED_CAIRO_SHIM_TRUE@BUILD_DEFINES = \
+ at NEED_CAIRO_SHIM_TRUE@ -define:USING_OLD_CAIRO
+
RESOURCES = \
Resources/Do.Interface.Linux.addin.xml \
Resources/settings-triangle.png
diff --git a/Do.Interface.Linux/src/Do.Interface/Do.Interface.CairoUtils/Cairo32Compatibility.cs b/Do.Interface.Linux/src/Do.Interface/Do.Interface.CairoUtils/Cairo32Compatibility.cs
new file mode 100644
index 0000000..b150630
--- /dev/null
+++ b/Do.Interface.Linux/src/Do.Interface/Do.Interface.CairoUtils/Cairo32Compatibility.cs
@@ -0,0 +1,39 @@
+//
+// Cario32Compatibility.cs
+//
+// Author:
+// Christohper James Halse Rogers <raof at ubuntu.com>
+//
+// Copyright (c) 2014 Christopher James Halse Rogers <raof at ubuntu.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+using System;
+
+using Cairo;
+
+namespace Do.Interface.CairoUtils
+{
+ public static class Cairo32Compatibility
+ {
+ public static Surface GetTarget(this Cairo.Context cr)
+ {
+ return cr.Target;
+ }
+ public static void SetSource(this Cairo.Context cr, Pattern sourcePattern)
+ {
+ cr.Source = sourcePattern;
+ }
+ }
+}
+
diff --git a/Do.Interface.Linux/src/Do.Interface/Do.Interface.CairoUtils/CairoUtils.cs b/Do.Interface.Linux/src/Do.Interface/Do.Interface.CairoUtils/CairoUtils.cs
index 6e0e25a..1b14101 100644
--- a/Do.Interface.Linux/src/Do.Interface/Do.Interface.CairoUtils/CairoUtils.cs
+++ b/Do.Interface.Linux/src/Do.Interface/Do.Interface.CairoUtils/CairoUtils.cs
@@ -371,9 +371,13 @@ namespace Do.Interface.CairoUtils
/// <param name="height">Height for new surface</param>
public static Surface CreateSimilarToTarget(this Cairo.Context cr, int width, int height)
{
+#if USING_OLD_CAIRO
+ return cr.GetTarget().CreateSimilar (cr.GetTarget().Content, width, height);
+#else
using (var targetSurface = cr.GetTarget()) {
return targetSurface.CreateSimilar (targetSurface.Content, width, height);
}
+#endif
}
}
}
diff --git a/Do.Interface.Linux/src/Do.Interface/Do.Interface.Widgets/Frame.cs b/Do.Interface.Linux/src/Do.Interface/Do.Interface.Widgets/Frame.cs
index 109b4cc..0fa61c0 100644
--- a/Do.Interface.Linux/src/Do.Interface/Do.Interface.Widgets/Frame.cs
+++ b/Do.Interface.Linux/src/Do.Interface/Do.Interface.Widgets/Frame.cs
@@ -20,6 +20,8 @@
using System;
using Gtk;
using Gdk;
+// For Mono.Cairo 3.2 compatibility shims
+using Do.Interface.CairoUtils;
namespace Do.Interface.Widgets
{
diff --git a/Do.Interface.Linux/src/Do.Interface/Do.Interface.Widgets/GlossyRoundedFrame.cs b/Do.Interface.Linux/src/Do.Interface/Do.Interface.Widgets/GlossyRoundedFrame.cs
index b4c3c9c..5a1a1bb 100644
--- a/Do.Interface.Linux/src/Do.Interface/Do.Interface.Widgets/GlossyRoundedFrame.cs
+++ b/Do.Interface.Linux/src/Do.Interface/Do.Interface.Widgets/GlossyRoundedFrame.cs
@@ -23,6 +23,10 @@ using Cairo;
using Gtk;
using Gdk;
+// For Mono.Cairo 3.2 compatibility shims
+using Do.Interface.CairoUtils;
+
+
namespace Do.Interface.Widgets
{
public class GlossyRoundedFrame : Frame
diff --git a/Do.Platform.Linux.JoliCloud/Makefile.in b/Do.Platform.Linux.JoliCloud/Makefile.in
index 7c549df..650f0d6 100644
--- a/Do.Platform.Linux.JoliCloud/Makefile.in
+++ b/Do.Platform.Linux.JoliCloud/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/Do.Platform.Linux/Makefile.in b/Do.Platform.Linux/Makefile.in
index a063ae8..c39da74 100644
--- a/Do.Platform.Linux/Makefile.in
+++ b/Do.Platform.Linux/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/Do.Platform/Makefile.in b/Do.Platform/Makefile.in
index d31a600..d795f9b 100644
--- a/Do.Platform/Makefile.in
+++ b/Do.Platform/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/Do.Universe/Makefile.in b/Do.Universe/Makefile.in
index f7873ce..4682d5c 100644
--- a/Do.Universe/Makefile.in
+++ b/Do.Universe/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/Do/Makefile.in b/Do/Makefile.in
index 4c5f4f5..0b4a25b 100644
--- a/Do/Makefile.in
+++ b/Do/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/Do/src/AssemblyInfo.cs b/Do/src/AssemblyInfo.cs
index 094cd1a..000d094 100644
--- a/Do/src/AssemblyInfo.cs
+++ b/Do/src/AssemblyInfo.cs
@@ -55,8 +55,8 @@ namespace Do
{
internal static class AssemblyInfo
{
- public const string DisplayVersion = "0.95";
- public const string VersionDetails = "bzr trunk r1398";
+ public const string DisplayVersion = "0.95.1";
+ public const string VersionDetails = "bzr trunk r1403";
public const string LocaleDirectory = "/usr/local/share/locale";
}
}
diff --git a/Makefile.in b/Makefile.in
index aff46b7..573f090 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -766,9 +766,10 @@ distcheck: dist
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
- && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+ && ../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
+ --srcdir=.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
diff --git a/Tests/Makefile.in b/Tests/Makefile.in
index 45ae57e..c4f6590 100644
--- a/Tests/Makefile.in
+++ b/Tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/aclocal.m4 b/aclocal.m4
index 3143843..53ba638 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.14 -*- Autoconf -*-
+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
@@ -709,7 +709,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.14'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.14], [],
+m4_if([$1], [1.14.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -725,7 +725,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14])dnl
+[AM_AUTOMAKE_VERSION([1.14.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/configure b/configure
index ffc3c81..42530e0 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gnome-do 0.95.
+# Generated by GNU Autoconf 2.69 for gnome-do 0.95.1.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -647,8 +647,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='gnome-do'
PACKAGE_TARNAME='gnome-do'
-PACKAGE_VERSION='0.95'
-PACKAGE_STRING='gnome-do 0.95'
+PACKAGE_VERSION='0.95.1'
+PACKAGE_STRING='gnome-do 0.95.1'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -692,6 +692,8 @@ ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
+NEED_CAIRO_SHIM_FALSE
+NEED_CAIRO_SHIM_TRUE
ENABLE_JOLICLOUD_FALSE
ENABLE_JOLICLOUD_TRUE
DEBUG_CFLAGS
@@ -1514,7 +1516,7 @@ if test "$ac_init_help" = "long"; then
# 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 gnome-do 0.95 to adapt to many kinds of systems.
+\`configure' configures gnome-do 0.95.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1584,7 +1586,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of gnome-do 0.95:";;
+ short | recursive ) echo "Configuration of gnome-do 0.95.1:";;
esac
cat <<\_ACEOF
@@ -1763,7 +1765,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-gnome-do configure 0.95
+gnome-do configure 0.95.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2128,7 +2130,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by gnome-do $as_me 0.95, which was
+It was created by gnome-do $as_me 0.95.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2991,7 +2993,7 @@ fi
# Define the identity of the package.
PACKAGE='gnome-do'
- VERSION='0.95'
+ VERSION='0.95.1'
cat >>confdefs.h <<_ACEOF
@@ -16047,6 +16049,34 @@ else
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mono.Cairo ≥ 3.2" >&5
+$as_echo_n "checking for Mono.Cairo ≥ 3.2... " >&6; }
+if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mono-cairo >= 3.2\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "mono-cairo >= 3.2") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ need_cairo_shim=no
+else
+ need_cairo_shim=yes
+fi
+if test "x$need_cairo_shim" = "xno" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using compatibility shim" >&5
+$as_echo "no, using compatibility shim" >&6; }
+fi
+ if test "x$need_cairo_shim" = "xyes"; then
+ NEED_CAIRO_SHIM_TRUE=
+ NEED_CAIRO_SHIM_FALSE='#'
+else
+ NEED_CAIRO_SHIM_TRUE='#'
+ NEED_CAIRO_SHIM_FALSE=
+fi
+
+
ac_config_files="$ac_config_files Do/Makefile Do/gnome-do Do/src/AssemblyInfo.cs Do.Interface.Linux/Makefile Do.Interface.Linux/src/AssemblyInfo.cs Do.Interface.Linux.AnimationBase/Makefile Do.Interface.Linux.Classic/Makefile Do.Interface.Linux.GlassFrame/Makefile Do.Interface.Linux.HUD/Makefile Do.Interface.Linux.Mini/Makefile Do.Platform/Makefile Do.Platform/src/AssemblyInfo.cs Do.Platform.Linux/Makefile Do.Platform.Linux/Do.Platform.Linux.dll.config Do.Platform.Linux/src/AssemblyInfo. [...]
@@ -16251,6 +16281,10 @@ if test -z "${ENABLE_JOLICLOUD_TRUE}" && test -z "${ENABLE_JOLICLOUD_FALSE}"; th
as_fn_error $? "conditional \"ENABLE_JOLICLOUD\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${NEED_CAIRO_SHIM_TRUE}" && test -z "${NEED_CAIRO_SHIM_FALSE}"; then
+ as_fn_error $? "conditional \"NEED_CAIRO_SHIM\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
: "${CONFIG_STATUS=./config.status}"
ac_write_fail=0
@@ -16648,7 +16682,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by gnome-do $as_me 0.95, which was
+This file was extended by gnome-do $as_me 0.95.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16705,7 +16739,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-gnome-do config.status 0.95
+gnome-do config.status 0.95.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index ec80210..5ea0825 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ([2.54])
-AC_INIT([gnome-do], [0.95])
+AC_INIT([gnome-do], [0.95.1])
AM_INIT_AUTOMAKE([foreign tar-pax])
AC_CONFIG_MACRO_DIR([m4])
@@ -160,6 +160,17 @@ AC_ARG_ENABLE(jolicloud,
AM_CONDITIONAL(ENABLE_JOLICLOUD, test "x$enable_jolicloud" = "xyes")
dnl }}}
+dnl {{{ check to see whether to include compatibility shims for Mono.Cairo < 3.2
+AC_MSG_CHECKING([for Mono.Cairo ≥ 3.2])
+PKG_CHECK_EXISTS([mono-cairo >= 3.2], need_cairo_shim=no, need_cairo_shim=yes)
+if test "x$need_cairo_shim" = "xno" ; then
+ AC_MSG_RESULT([yes])
+else
+ AC_MSG_RESULT([no, using compatibility shim])
+fi
+AM_CONDITIONAL(NEED_CAIRO_SHIM, test "x$need_cairo_shim" = "xyes")
+dnl }}
+
AC_CONFIG_FILES([
Do/Makefile
Do/gnome-do
diff --git a/data/Makefile.in b/data/Makefile.in
index 5e62a68..767416b 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in
index b9f10b4..b74fa2e 100644
--- a/data/icons/Makefile.in
+++ b/data/icons/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/data/icons/hicolor/128x128/Makefile.in b/data/icons/hicolor/128x128/Makefile.in
index c6af477..824568b 100644
--- a/data/icons/hicolor/128x128/Makefile.in
+++ b/data/icons/hicolor/128x128/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/data/icons/hicolor/128x128/apps/Makefile.in b/data/icons/hicolor/128x128/apps/Makefile.in
index 18d9040..710eedd 100644
--- a/data/icons/hicolor/128x128/apps/Makefile.in
+++ b/data/icons/hicolor/128x128/apps/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/data/icons/hicolor/16x16/Makefile.in b/data/icons/hicolor/16x16/Makefile.in
index b4cef31..1427b65 100644
--- a/data/icons/hicolor/16x16/Makefile.in
+++ b/data/icons/hicolor/16x16/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/data/icons/hicolor/16x16/apps/Makefile.in b/data/icons/hicolor/16x16/apps/Makefile.in
index 3723045..2e0f570 100644
--- a/data/icons/hicolor/16x16/apps/Makefile.in
+++ b/data/icons/hicolor/16x16/apps/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/data/icons/hicolor/24x24/Makefile.in b/data/icons/hicolor/24x24/Makefile.in
index 8643b30..2cc6204 100644
--- a/data/icons/hicolor/24x24/Makefile.in
+++ b/data/icons/hicolor/24x24/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/data/icons/hicolor/24x24/apps/Makefile.in b/data/icons/hicolor/24x24/apps/Makefile.in
index 46c9ab9..bf4fbaf 100644
--- a/data/icons/hicolor/24x24/apps/Makefile.in
+++ b/data/icons/hicolor/24x24/apps/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/data/icons/hicolor/32x32/Makefile.in b/data/icons/hicolor/32x32/Makefile.in
index 92b8439..f11b706 100644
--- a/data/icons/hicolor/32x32/Makefile.in
+++ b/data/icons/hicolor/32x32/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/data/icons/hicolor/32x32/apps/Makefile.in b/data/icons/hicolor/32x32/apps/Makefile.in
index 87e1b1d..30c65b7 100644
--- a/data/icons/hicolor/32x32/apps/Makefile.in
+++ b/data/icons/hicolor/32x32/apps/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/data/icons/hicolor/48x48/Makefile.in b/data/icons/hicolor/48x48/Makefile.in
index 3ca8de2..14fd0c5 100644
--- a/data/icons/hicolor/48x48/Makefile.in
+++ b/data/icons/hicolor/48x48/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/data/icons/hicolor/48x48/apps/Makefile.in b/data/icons/hicolor/48x48/apps/Makefile.in
index f64aee9..3327cef 100644
--- a/data/icons/hicolor/48x48/apps/Makefile.in
+++ b/data/icons/hicolor/48x48/apps/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/data/icons/hicolor/64x64/Makefile.in b/data/icons/hicolor/64x64/Makefile.in
index 7a80bdd..e92cd5a 100644
--- a/data/icons/hicolor/64x64/Makefile.in
+++ b/data/icons/hicolor/64x64/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/data/icons/hicolor/64x64/apps/Makefile.in b/data/icons/hicolor/64x64/apps/Makefile.in
index 3960ea1..3e7dd77 100644
--- a/data/icons/hicolor/64x64/apps/Makefile.in
+++ b/data/icons/hicolor/64x64/apps/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/data/icons/hicolor/Makefile.in b/data/icons/hicolor/Makefile.in
index 673f0a4..51c5e1e 100644
--- a/data/icons/hicolor/Makefile.in
+++ b/data/icons/hicolor/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/data/icons/hicolor/scalable/Makefile.in b/data/icons/hicolor/scalable/Makefile.in
index ff8e02d..6d9b426 100644
--- a/data/icons/hicolor/scalable/Makefile.in
+++ b/data/icons/hicolor/scalable/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/data/icons/hicolor/scalable/apps/Makefile.in b/data/icons/hicolor/scalable/apps/Makefile.in
index 7925e56..d222319 100644
--- a/data/icons/hicolor/scalable/apps/Makefile.in
+++ b/data/icons/hicolor/scalable/apps/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/libdo/Makefile.in b/libdo/Makefile.in
index ff6b6dd..c03aa14 100644
--- a/libdo/Makefile.in
+++ b/libdo/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/ltmain.sh b/ltmain.sh
index 2551929..632145e 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -70,7 +70,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.3ubuntu2
+# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.6ubuntu3
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -80,7 +80,7 @@
PROGRAM=libtool
PACKAGE=libtool
-VERSION="2.4.2 Debian-2.4.2-1.3ubuntu2"
+VERSION="2.4.2 Debian-2.4.2-1.6ubuntu3"
TIMESTAMP=""
package_revision=1.3337
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 2bf8f9d..18eef6f 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/missing b/missing
index cdea514..db98974 100755
--- a/missing
+++ b/missing
@@ -1,7 +1,7 @@
#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2012-06-26.16; # UTC
+scriptversion=2013-10-28.13; # UTC
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
@@ -160,7 +160,7 @@ give_advice ()
;;
autom4te*)
echo "You might have modified some maintainer files that require"
- echo "the 'automa4te' program to be rebuilt."
+ echo "the 'autom4te' program to be rebuilt."
program_details 'autom4te'
;;
bison*|yacc*)
diff --git a/test-driver b/test-driver
index 32bf39e..d306056 100755
--- a/test-driver
+++ b/test-driver
@@ -1,7 +1,7 @@
#! /bin/sh
# test-driver - basic testsuite driver script.
-scriptversion=2012-06-27.10; # UTC
+scriptversion=2013-07-13.22; # UTC
# Copyright (C) 2011-2013 Free Software Foundation, Inc.
#
@@ -44,13 +44,12 @@ print_usage ()
Usage:
test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
[--expect-failure={yes|no}] [--color-tests={yes|no}]
- [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT
+ [--enable-hard-errors={yes|no}] [--]
+ TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
The '--test-name', '--log-file' and '--trs-file' options are mandatory.
END
}
-# TODO: better error handling in option parsing (in particular, ensure
-# TODO: $log_file, $trs_file and $test_name are defined).
test_name= # Used for reporting.
log_file= # Where to save the output of the test script.
trs_file= # Where to save the metadata of the test run.
@@ -69,10 +68,23 @@ while test $# -gt 0; do
--enable-hard-errors) enable_hard_errors=$2; shift;;
--) shift; break;;
-*) usage_error "invalid option: '$1'";;
+ *) break;;
esac
shift
done
+missing_opts=
+test x"$test_name" = x && missing_opts="$missing_opts --test-name"
+test x"$log_file" = x && missing_opts="$missing_opts --log-file"
+test x"$trs_file" = x && missing_opts="$missing_opts --trs-file"
+if test x"$missing_opts" != x; then
+ usage_error "the following mandatory options are missing:$missing_opts"
+fi
+
+if test $# -eq 0; then
+ usage_error "missing argument"
+fi
+
if test $color_tests = yes; then
# Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
red='[0;31m' # Red.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/gnome-do.git
More information about the Pkg-cli-apps-commits
mailing list