[Pkg-sugar-commit] [sugar-artwork] 03/10: Drop patch 1002 (workaround for older GTK+) as it causes other errors. Instead tighten build-dependency on libgtk2.0-dev to at least 2.16. Closes: bug#584717, thanks to Sascha Silbe.

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag debian/0.86.0-5
in repository sugar-artwork.

commit c65b3d3847d636d8d3dc60b6820d1f275238d984
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Jun 6 02:36:59 2010 +0200

    Drop patch 1002 (workaround for older GTK+) as it causes other errors. Instead tighten build-dependency on libgtk2.0-dev to at least 2.16. Closes: bug#584717, thanks to Sascha Silbe.
---
 debian/patches/1002_skip_none-arow_only_if_supported.patch | 14 --------------
 debian/patches/series                                      |  1 -
 debian/rules                                               |  2 +-
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/debian/patches/1002_skip_none-arow_only_if_supported.patch b/debian/patches/1002_skip_none-arow_only_if_supported.patch
deleted file mode 100644
index 0e36a7b..0000000
--- a/debian/patches/1002_skip_none-arow_only_if_supported.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/gtk/engine/sugar-style.c
-+++ b/gtk/engine/sugar-style.c
-@@ -676,8 +676,11 @@
-     SugarInfo *info = &arrow_info.info;
-     cairo_t *cr;
- 
-+// GTK_ARROW_NONE was implemented around GTK+ 2.10
-+#ifdef GTK_ARROW_NONE
-     if (arrow_type == GTK_ARROW_NONE)
-         return;
-+#endif
- 
-     if (width < 0 || height < 0)
-         return;
diff --git a/debian/patches/series b/debian/patches/series
index a7fdb64..5f1e6f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-1002_skip_none-arow_only_if_supported.patch
 2001_empy_from_system.patch
 2991_empy_from_system_automade.patch
diff --git a/debian/rules b/debian/rules
index 3d19085..3d296fd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,7 +44,7 @@ binary-strip/$(pkg)::
 #  * x11-apps needed only indirectly by icon-slicer. Can be dropped when
 #    icon-slicer is in Debian stable, or if depending on icon-slicer
 #    version 03-5
-CDBS_BUILD_DEPENDS += , libgtk2.0-dev, libglib2.0-dev, libcairo2-dev, python-empy, icon-slicer, icon-naming-utils (>= 0.8.2), x11-apps
+CDBS_BUILD_DEPENDS += , libgtk2.0-dev (>= 2.16), libglib2.0-dev, libcairo2-dev, python-empy, icon-slicer, icon-naming-utils (>= 0.8.2), x11-apps
 
 # Needed (always/often) at runtime
 CDBS_DEPENDS = ttf-dejavu-core

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sugar/sugar-artwork.git