From 8d9c915be849c2c2ac1f2cd2ffba1f9c1963f9d4 Mon Sep 17 00:00:00 2001 From: Andreas Henriksson Date: Wed, 23 Sep 2015 15:38:17 +0000 Subject: [PATCH] * New upstream release. * Drop debian/patches/git_test-simplify-use-bash.patch - now included in upstream release. --- debian/changelog | 7 ++++-- .../patches/git_test-simplify-use-bash.patch | 22 ------------------- debian/patches/series | 1 - 3 files changed, 5 insertions(+), 25 deletions(-) delete mode 100644 debian/patches/git_test-simplify-use-bash.patch diff --git a/debian/changelog b/debian/changelog index e4cfb2c7a8..eecbfee4e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -gtk+3.0 (3.17.9-3) UNRELEASED; urgency=medium +gtk+3.0 (3.18.0-1) experimental; urgency=medium * Drop debian/patches/061_multiarch_module_fallback.patch - now obsolete since all packages has been fixed to install @@ -7,8 +7,11 @@ gtk+3.0 (3.17.9-3) UNRELEASED; urgency=medium - debian/patches/030_tests_skip_filechooser.patch - debian/patches/042_treeview_single-focus.patch - debian/patches/043_notebook_scroll.patch + * New upstream release. + * Drop debian/patches/git_test-simplify-use-bash.patch + - now included in upstream release. - -- Andreas Henriksson Tue, 22 Sep 2015 16:42:28 +0200 + -- Andreas Henriksson Wed, 23 Sep 2015 17:07:59 +0200 gtk+3.0 (3.17.9-2) experimental; urgency=medium diff --git a/debian/patches/git_test-simplify-use-bash.patch b/debian/patches/git_test-simplify-use-bash.patch deleted file mode 100644 index 11a6ac31df..0000000000 --- a/debian/patches/git_test-simplify-use-bash.patch +++ /dev/null @@ -1,22 +0,0 @@ -From e0d72c537699227992fc72599e59eefbbb209a8f Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -Date: Sun, 20 Sep 2015 12:17:12 -0400 -Subject: test-simplify: Explicitly use bash - -The script uses bash features, after all. - -https://bugzilla.gnome.org/show_bug.cgi?id=755274 - -diff --git a/testsuite/tools/test-simplify.in b/testsuite/tools/test-simplify.in -index 2de4366..6b4f2e8 100755 ---- a/testsuite/tools/test-simplify.in -+++ b/testsuite/tools/test-simplify.in -@@ -1,4 +1,4 @@ --#! /bin/sh -+#! /bin/bash - - GTK_BUILDER_TOOL=${GTK_BUILDER_TOOL:-gtk-builder-tool} - TEST_DATA_DIR=${TEST_DATA_DIR:-./simplify} --- -cgit v0.10.2 - diff --git a/debian/patches/series b/debian/patches/series index a6ec9558f6..0d085ed9fb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,4 +7,3 @@ 060_ignore-random-icons.patch 071_fix-installation-of-HTML-images.patch reftest-known-fail.patch -git_test-simplify-use-bash.patch