r31779 - in /trunk/libgtk2-perl/debian: changelog control patches/fix-bindings-tests patches/fix-number-of-style-tests patches/series

ryan52-guest at users.alioth.debian.org ryan52-guest at users.alioth.debian.org
Mon Mar 9 03:05:58 UTC 2009 

Author: ryan52-guest
Date: Mon Mar  9 03:05:45 2009
New Revision: 31779

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=31779
Log:
* (build)-depend on shared-mime-info (Closes: #518293)
* add a patch to skip a few bindings tests that rely on a keymap
* fix the number of style tests

Added:
    trunk/libgtk2-perl/debian/patches/fix-bindings-tests
    trunk/libgtk2-perl/debian/patches/fix-number-of-style-tests
Modified:
    trunk/libgtk2-perl/debian/changelog
    trunk/libgtk2-perl/debian/control
    trunk/libgtk2-perl/debian/patches/series

Modified: trunk/libgtk2-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-perl/debian/changelog?rev=31779&op=diff
==============================================================================
--- trunk/libgtk2-perl/debian/changelog (original)
+++ trunk/libgtk2-perl/debian/changelog Mon Mar  9 03:05:45 2009
@@ -12,8 +12,11 @@
   * machine readable copyright format
   * remove 10-fix_unicode_chars_in_manpages.patch and 20-
     fix_GdkKeys_tests_for_xvfb.patch patches, they are fixed upstream
-
- -- Ryan Niebur <ryanryan52 at gmail.com>  Sun, 08 Mar 2009 15:25:02 -0700
+  * (build)-depend on shared-mime-info (Closes: #518293)
+  * add a patch to skip a few bindings tests that rely on a keymap
+  * fix the number of style tests
+
+ -- Ryan Niebur <ryanryan52 at gmail.com>  Sun, 08 Mar 2009 20:04:44 -0700
 
 libgtk2-perl (1:1.190-1) unstable; urgency=low
 

Modified: trunk/libgtk2-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-perl/debian/control?rev=31779&op=diff
==============================================================================
--- trunk/libgtk2-perl/debian/control (original)
+++ trunk/libgtk2-perl/debian/control Mon Mar  9 03:05:45 2009
@@ -1,7 +1,7 @@
 Source: libgtk2-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 7), quilt (>= 0.40), perl (>= 5.8.0-7), libextutils-depends-perl (>= 0.300), libextutils-pkgconfig-perl (>= 1.03), libgtk2.0-dev (>= 2.6.0), libglib-perl (>= 1:1.214), libcairo-perl (>= 1.00), xvfb, xauth, xfonts-base, hicolor-icon-theme, libpango-perl
+Build-Depends: debhelper (>= 7), quilt (>= 0.40), perl (>= 5.8.0-7), libextutils-depends-perl (>= 0.300), libextutils-pkgconfig-perl (>= 1.03), libgtk2.0-dev (>= 2.6.0), libglib-perl (>= 1:1.214), libcairo-perl (>= 1.00), xvfb, xauth, xfonts-base, hicolor-icon-theme, libpango-perl, shared-mime-info
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Ryan Niebur <ryanryan52 at gmail.com>
 Standards-Version: 3.8.0
@@ -11,7 +11,7 @@
 
 Package: libgtk2-perl
 Architecture: any
-Depends: ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}, libglib-perl (>= 1:1.214), libcairo-perl, libpango-perl
+Depends: ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}, libglib-perl (>= 1:1.214), libcairo-perl, libpango-perl, shared-mime-info
 Suggests: libgtk2-perl-doc, librsvg2-common
 Description: Perl interface to the 2.x series of the Gimp Toolkit library
  libgtk2-perl allows a perl developer to use the Gtk+ graphical user

Added: trunk/libgtk2-perl/debian/patches/fix-bindings-tests
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-perl/debian/patches/fix-bindings-tests?rev=31779&op=file
==============================================================================
--- trunk/libgtk2-perl/debian/patches/fix-bindings-tests (added)
+++ trunk/libgtk2-perl/debian/patches/fix-bindings-tests Mon Mar  9 03:05:45 2009
@@ -1,0 +1,51 @@
+in xvfb there is no keymap, so that parts of the tests that rely on it fail.
+
+--- a/t/GtkBindings.t
++++ b/t/GtkBindings.t
+@@ -35,6 +35,12 @@
+                                      flags         => ['run-last','action'],
+                                      class_closure => \&do_mysig_with_float },
+              };
++
++use Gtk2::Gdk::Keysyms;
++my $display = Gtk2::Gdk::Display -> get_default();
++my $keymap = Gtk2::Gdk::Keymap -> get_for_display ($display);
++my(@other_keys) = $keymap -> get_entries_for_keyval($Gtk2::Gdk::Keysyms{ Escape });
++
+ my $mysig_seen;
+ sub do_mysig {
+   #Test::More::diag ("mysig runs");
+@@ -154,7 +160,10 @@
+ # As of Gtk 2.12 $gtkobj->bindings_activate() only actually works on a
+ # Gtk2::Widget, not a Gtk2::Object, hence using My::Widget to exercise
+ # add_path() instead of My::Object.
+-{
++SKIP: {
++    if (scalar(@other_keys) == 0) {
++        skip "Needs a keymap", 5;
++    }
+   my $my_widget_bindings = Gtk2::BindingSet->find('my_widget_bindings');
+   ok ($my_widget_bindings, 'find() of RC parsed bindings');
+ 
+@@ -374,12 +383,16 @@
+   #
+   my $mywidget = My::Widget->new;
+ 
++ SKIP: {
++    if (scalar(@other_keys) == 0) {
++        skip "Needs a keymap", 2;
++    }
+   $mywidgetsig_seen = 0;
+-  ok ($mywidget->bindings_activate (Gtk2::Gdk->keyval_from_name('Return'),[]),
+-      'before entry_skip(), bindings_activate return true on mywidget');
+-  is ($mywidgetsig_seen, 1,
+-      'before entry_skip(), bindings_activate runs mywidgetsig on mywidget');
+-
++    ok ($mywidget->bindings_activate (Gtk2::Gdk->keyval_from_name('Return'),[]),
++        'before entry_skip(), bindings_activate return true on mywidget');
++    is ($mywidgetsig_seen, 1,
++        'before entry_skip(), bindings_activate runs mywidgetsig on mywidget');
++  }
+   $skip_bindings->add_path ('widget-class', 'My__Widget',
+                             Gtk2::GTK_PATH_PRIO_HIGHEST);
+ 

Added: trunk/libgtk2-perl/debian/patches/fix-number-of-style-tests
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-perl/debian/patches/fix-number-of-style-tests?rev=31779&op=file
==============================================================================
--- trunk/libgtk2-perl/debian/patches/fix-number-of-style-tests (added)
+++ trunk/libgtk2-perl/debian/patches/fix-number-of-style-tests Mon Mar  9 03:05:45 2009
@@ -1,0 +1,13 @@
+they counted wrong
+
+--- a/t/GtkStyle.t
++++ b/t/GtkStyle.t
+@@ -1,7 +1,7 @@
+ #!/usr/bin/perl -w
+ # vim: set ft=perl expandtab shiftwidth=2 softtabstop=2 :
+ use strict;
+-use Gtk2::TestHelper tests => 124;
++use Gtk2::TestHelper tests => 125;
+ use Carp;
+ 
+ # $Id: GtkStyle.t 2152 2009-03-08 17:01:28Z tsch $

Modified: trunk/libgtk2-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-perl/debian/patches/series?rev=31779&op=diff
==============================================================================
--- trunk/libgtk2-perl/debian/patches/series (original)
+++ trunk/libgtk2-perl/debian/patches/series Mon Mar  9 03:05:45 2009
@@ -1,1 +1,3 @@
 30-disable_libgtk_version_check.patch
+fix-number-of-style-tests
+fix-bindings-tests

More information about the Pkg-perl-cvs-commits mailing list