summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian.droege@collabora.co.uk>2010-12-28 14:46:45 +0100
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2010-12-28 14:46:45 +0100
commita1f0ada7a95eee3b2e21a9d8d76453626674311c (patch)
treed617c8756781e2acd99939a209721e22c3214e2c
parent69f43d8bd0101877e1b8d84e8f16701f3eeb1799 (diff)
New upstream bugfix release:
* New upstream bugfix release: + debian/patches/01_build_perf_utils.patch, debian/patches/02_am-maintainer-mode.patch: - Refresh patches.
-rw-r--r--debian/changelog9
-rw-r--r--debian/patches/01_build_perf_utils.patch12
-rw-r--r--debian/patches/02_am-maintainer-mode.patch8
3 files changed, 19 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog
index aed4435..bedad47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+cairo (1.10.2-1) experimental; urgency=low
+
+ * New upstream bugfix release:
+ + debian/patches/01_build_perf_utils.patch,
+ debian/patches/02_am-maintainer-mode.patch:
+ - Refresh patches.
+
+ -- Sebastian Dröge <slomo@debian.org> Tue, 28 Dec 2010 14:45:49 +0100
+
cairo (1.10.0-1) experimental; urgency=low
[ Alexandros Frantzis ]
diff --git a/debian/patches/01_build_perf_utils.patch b/debian/patches/01_build_perf_utils.patch
index a1f0ef0..e458467 100644
--- a/debian/patches/01_build_perf_utils.patch
+++ b/debian/patches/01_build_perf_utils.patch
@@ -4,8 +4,8 @@ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=28865
Last-Update: 2010-08-03
Index: cairo/configure.ac
===================================================================
---- cairo.orig/configure.ac 2010-09-06 23:48:27.643436170 +0200
-+++ cairo/configure.ac 2010-09-06 23:49:18.527408723 +0200
+--- cairo.orig/configure.ac 2010-12-28 14:41:21.499228916 +0100
++++ cairo/configure.ac 2010-12-28 14:42:06.162226875 +0100
@@ -796,6 +796,11 @@
PKG_CHECK_MODULES(gtk, "gtk+-2.0",have_gtk=yes, have_gtk=no)
AM_CONDITIONAL(HAVE_GTK, test "x$have_gtk" = "xyes")
@@ -20,8 +20,8 @@ Index: cairo/configure.ac
boilerplate/Makefile
Index: cairo/perf/Makefile.am
===================================================================
---- cairo.orig/perf/Makefile.am 2010-09-06 23:48:27.619417195 +0200
-+++ cairo/perf/Makefile.am 2010-09-06 23:49:18.531419987 +0200
+--- cairo.orig/perf/Makefile.am 2010-06-18 13:47:11.000000000 +0200
++++ cairo/perf/Makefile.am 2010-12-28 14:42:06.162226875 +0100
@@ -10,6 +10,18 @@
AM_LDFLAGS = $(CAIRO_LDFLAGS)
@@ -43,8 +43,8 @@ Index: cairo/perf/Makefile.am
cairo-perf-diff-files \
Index: cairo/build/configure.ac.features
===================================================================
---- cairo.orig/build/configure.ac.features 2010-09-06 23:48:27.603407060 +0200
-+++ cairo/build/configure.ac.features 2010-09-06 23:49:18.531419987 +0200
+--- cairo.orig/build/configure.ac.features 2010-12-28 14:41:21.487225155 +0100
++++ cairo/build/configure.ac.features 2010-12-28 14:42:06.166239606 +0100
@@ -407,6 +407,7 @@
echo "The following features and utilities:"
echo " cairo-trace: $use_trace"
diff --git a/debian/patches/02_am-maintainer-mode.patch b/debian/patches/02_am-maintainer-mode.patch
index f976a93..5f0ee8f 100644
--- a/debian/patches/02_am-maintainer-mode.patch
+++ b/debian/patches/02_am-maintainer-mode.patch
@@ -1,10 +1,10 @@
Index: cairo/configure.ac
===================================================================
---- cairo.orig/configure.ac 2010-09-06 23:47:04.384406681 +0200
-+++ cairo/configure.ac 2010-09-06 23:47:15.719410978 +0200
+--- cairo.orig/configure.ac 2010-12-28 14:43:02.291226995 +0100
++++ cairo/configure.ac 2010-12-28 14:43:18.191141863 +0100
@@ -10,6 +10,7 @@
- AC_CONFIG_AUX_DIR(build)
- AC_CONFIG_MACRO_DIR(build)
+ AC_CONFIG_SRCDIR(src/cairo.h)
+ AC_CONFIG_HEADERS(config.h)
AM_INIT_AUTOMAKE([1.9.6 gnu -Wall no-define])
+AM_MAINTAINER_MODE
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])