r28823 - in /trunk/libgtk2-perl/debian: ./ patches/
ryan52-guest at users.alioth.debian.org
ryan52-guest at users.alioth.debian.org
Sun Dec 28 10:46:18 UTC 2008
Author: ryan52-guest
Date: Sun Dec 28 10:46:15 2008
New Revision: 28823
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=28823
Log:
convert to quilt
Added:
trunk/libgtk2-perl/debian/patches/10-fix_unicode_chars_in_manpages.patch
trunk/libgtk2-perl/debian/patches/20-fix_GdkKeys_tests_for_xvfb.patch
trunk/libgtk2-perl/debian/patches/30-disable_libgtk_version_check.patch
trunk/libgtk2-perl/debian/patches/series
Removed:
trunk/libgtk2-perl/debian/patches/00list
trunk/libgtk2-perl/debian/patches/10-fix_unicode_chars_in_manpages.dpatch
trunk/libgtk2-perl/debian/patches/20-fix_GdkKeys_tests_for_xvfb.dpatch
trunk/libgtk2-perl/debian/patches/30-disable_libgtk_version_check.dpatch
Modified:
trunk/libgtk2-perl/debian/changelog
trunk/libgtk2-perl/debian/control
trunk/libgtk2-perl/debian/rules
Modified: trunk/libgtk2-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-perl/debian/changelog?rev=28823&op=diff
==============================================================================
--- trunk/libgtk2-perl/debian/changelog (original)
+++ trunk/libgtk2-perl/debian/changelog Sun Dec 28 10:46:15 2008
@@ -10,8 +10,9 @@
Maintainers <pkg-gtk2-perl-maintainers at lists.alioth.debian.org>
moved to Uploaders.
* Add me to uploaders, remove old maintainer(s)
-
- -- Ryan Niebur <ryanryan52 at gmail.com> Sun, 28 Dec 2008 01:06:40 -0800
+ * convert to quilt
+
+ -- Ryan Niebur <ryanryan52 at gmail.com> Sun, 28 Dec 2008 02:46:05 -0800
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=28823&op=diff
==============================================================================
--- trunk/libgtk2-perl/debian/control (original)
+++ trunk/libgtk2-perl/debian/control Sun Dec 28 10:46:15 2008
@@ -1,7 +1,7 @@
Source: libgtk2-perl
Section: perl
Priority: optional
-Build-Depends: debhelper (>= 4.0.2), dpatch, 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.190), libcairo-perl (>= 1.00), xvfb, xauth, xfonts-base, hicolor-icon-theme
+Build-Depends: debhelper (>= 4.0.2), 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.190), libcairo-perl (>= 1.00), xvfb, xauth, xfonts-base, hicolor-icon-theme
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Ryan Niebur <ryanryan52 at gmail.com>
Standards-Version: 3.8.0
Added: trunk/libgtk2-perl/debian/patches/10-fix_unicode_chars_in_manpages.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-perl/debian/patches/10-fix_unicode_chars_in_manpages.patch?rev=28823&op=file
==============================================================================
--- trunk/libgtk2-perl/debian/patches/10-fix_unicode_chars_in_manpages.patch (added)
+++ trunk/libgtk2-perl/debian/patches/10-fix_unicode_chars_in_manpages.patch Sun Dec 28 10:46:15 2008
@@ -1,0 +1,31 @@
+Author: Marc 'HE' Brockschmidt <he at debian.org>
+Description: Patch docs to remove unicode characters which are not allowed in ASCII manpages
+--- a/Gtk2.pm
++++ b/Gtk2.pm
+@@ -337,8 +337,8 @@
+ Ross McFarland <rwmcfa1 at neces dot com>
+ Torsten Schoenfeld <kaffeetisch at web dot de>
+ Marc Lehmann <pcg at goof dot com>
+- Göran Thyni <gthyni at kirra dot net>
+- Jörn Reder <joern at zyn dot de>
++ Goeran Thyni <gthyni at kirra dot net>
++ Joern Reder <joern at zyn dot de>
+ Chas Owens <alas at wilma dot widomaker dot com>
+ Guillaume Cottenceau <gc at mandrakesoft dot com>
+
+--- a/pm/Helper.pm
++++ b/pm/Helper.pm
+@@ -184,11 +184,11 @@
+
+ =head1 AUTHOR
+
+-Jörn Reder E<lt>joern AT zyn.deE<gt>
++Joern Reder E<lt>joern AT zyn.deE<gt>
+
+ =head1 COPYRIGHT AND LICENSE
+
+-Copyright 2003 by Jörn Reder
++Copyright 2003 by Joern Reder
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
Added: trunk/libgtk2-perl/debian/patches/20-fix_GdkKeys_tests_for_xvfb.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-perl/debian/patches/20-fix_GdkKeys_tests_for_xvfb.patch?rev=28823&op=file
==============================================================================
--- trunk/libgtk2-perl/debian/patches/20-fix_GdkKeys_tests_for_xvfb.patch (added)
+++ trunk/libgtk2-perl/debian/patches/20-fix_GdkKeys_tests_for_xvfb.patch Sun Dec 28 10:46:15 2008
@@ -1,0 +1,113 @@
+Author: Marc 'HE' Brockschmidt <he at debian.org>
+Description: Skip GdkKeyMap tests if no keymap is available (like in xvfb)
+--- a/t/GdkKeys.t
++++ b/t/GdkKeys.t
+@@ -17,25 +17,28 @@
+ isa_ok($map, "Gtk2::Gdk::Keymap");
+ }
+
+-my @keys = $map -> get_entries_for_keyval($Gtk2::Gdk::Keysyms{ Escape });
+-isa_ok($keys[0], "HASH");
+-like($keys[0] -> { keycode }, qr/^\d+$/);
+-like($keys[0] -> { group }, qr/^\d+$/);
+-like($keys[0] -> { level }, qr/^\d+$/);
+-
+- at keys = Gtk2::Gdk::Keymap -> get_entries_for_keyval($Gtk2::Gdk::Keysyms{ Escape });
+-isa_ok($keys[0], "HASH");
+-like($keys[0] -> { keycode }, qr/^\d+$/);
+-like($keys[0] -> { group }, qr/^\d+$/);
+-like($keys[0] -> { level }, qr/^\d+$/);
+-
+-my ($keyval, $group, $level, $mods) = $map -> translate_keyboard_state($keys[0] -> { keycode }, [qw(shift-mask)], 0);
+-like($keyval, qr/^\d+$/);
+-like($group, qr/^\d+$/);
+-like($level, qr/^\d+$/);
+-isa_ok($mods, "Gtk2::Gdk::ModifierType");
+-
+ SKIP: {
++ my @keys = $map -> get_entries_for_keyval($Gtk2::Gdk::Keysyms{ Escape });
++ skip("can't check keymaps in environments without a keymap", 16)
++ if (scalar @keys == 0);
++
++ isa_ok($keys[0], "HASH");
++ like($keys[0] -> { keycode }, qr/^\d+$/);
++ like($keys[0] -> { group }, qr/^\d+$/);
++ like($keys[0] -> { level }, qr/^\d+$/);
++
++ @keys = Gtk2::Gdk::Keymap -> get_entries_for_keyval($Gtk2::Gdk::Keysyms{ Escape });
++ isa_ok($keys[0], "HASH");
++ like($keys[0] -> { keycode }, qr/^\d+$/);
++ like($keys[0] -> { group }, qr/^\d+$/);
++ like($keys[0] -> { level }, qr/^\d+$/);
++
++ my ($keyval, $group, $level, $mods) = $map -> translate_keyboard_state($keys[0] -> { keycode }, [qw(shift-mask)], 0);
++ like($keyval, qr/^\d+$/);
++ like($group, qr/^\d+$/);
++ like($level, qr/^\d+$/);
++ isa_ok($mods, "Gtk2::Gdk::ModifierType");
++
+ skip("translate_keyboard_state is broken", 4)
+ unless (Gtk2 -> CHECK_VERSION(2, 4, 1));
+
+@@ -46,30 +49,37 @@
+ isa_ok($mods, "Gtk2::Gdk::ModifierType");
+ }
+
+-my $key = {
+- keycode => $keys[0] -> { keycode },
+- group => $group,
+- level => $level
+-};
+-
+-like($map -> lookup_key($key), qr/^\d+$/);
+-like(Gtk2::Gdk::Keymap -> lookup_key($key), qr/^\d+$/);
+-
+-my @entries = $map -> get_entries_for_keycode($keys[0] -> { keycode });
+-isa_ok($entries[0], "HASH");
+-like($entries[0] -> { keyval }, qr/^\d+$/);
+-isa_ok($entries[0] -> { key }, "HASH");
+-like($entries[0] -> { key } -> { keycode }, qr/^\d+$/);
+-like($entries[0] -> { key } -> { group }, qr/^\d+$/);
+-like($entries[0] -> { key } -> { level }, qr/^\d+$/);
+-
+- at entries = Gtk2::Gdk::Keymap -> get_entries_for_keycode($keys[0] -> { keycode });
+-isa_ok($entries[0], "HASH");
+-like($entries[0] -> { keyval }, qr/^\d+$/);
+-isa_ok($entries[0] -> { key }, "HASH");
+-like($entries[0] -> { key } -> { keycode }, qr/^\d+$/);
+-like($entries[0] -> { key } -> { group }, qr/^\d+$/);
+-like($entries[0] -> { key } -> { level }, qr/^\d+$/);
++SKIP: {
++ my @keys = $map -> get_entries_for_keyval($Gtk2::Gdk::Keysyms{ Escape });
++ skip("can't check keymaps in environments without a keymap", 14)
++ if (scalar @keys == 0);
++
++ my ($keyval, $group, $level, $mods) = Gtk2::Gdk::Keymap -> translate_keyboard_state($keys[0] -> { keycode }, [qw(shift-mask)], 0);
++ my $key = {
++ keycode => $keys[0] -> { keycode },
++ group => $group,
++ level => $level
++ };
++
++ like($map -> lookup_key($key), qr/^\d+$/);
++ like(Gtk2::Gdk::Keymap -> lookup_key($key), qr/^\d+$/);
++
++ my @entries = $map -> get_entries_for_keycode($keys[0] -> { keycode });
++ isa_ok($entries[0], "HASH");
++ like($entries[0] -> { keyval }, qr/^\d+$/);
++ isa_ok($entries[0] -> { key }, "HASH");
++ like($entries[0] -> { key } -> { keycode }, qr/^\d+$/);
++ like($entries[0] -> { key } -> { group }, qr/^\d+$/);
++ like($entries[0] -> { key } -> { level }, qr/^\d+$/);
++
++ @entries = Gtk2::Gdk::Keymap -> get_entries_for_keycode($keys[0] -> { keycode });
++ isa_ok($entries[0], "HASH");
++ like($entries[0] -> { keyval }, qr/^\d+$/);
++ isa_ok($entries[0] -> { key }, "HASH");
++ like($entries[0] -> { key } -> { keycode }, qr/^\d+$/);
++ like($entries[0] -> { key } -> { group }, qr/^\d+$/);
++ like($entries[0] -> { key } -> { level }, qr/^\d+$/);
++}
+
+ ok(defined($map -> get_direction()));
+ ok(defined(Gtk2::Gdk::Keymap -> get_direction()));
Added: trunk/libgtk2-perl/debian/patches/30-disable_libgtk_version_check.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-perl/debian/patches/30-disable_libgtk_version_check.patch?rev=28823&op=file
==============================================================================
--- trunk/libgtk2-perl/debian/patches/30-disable_libgtk_version_check.patch (added)
+++ trunk/libgtk2-perl/debian/patches/30-disable_libgtk_version_check.patch Sun Dec 28 10:46:15 2008
@@ -1,0 +1,21 @@
+Author: Marc 'HE' Brockschmidt <he at debian.org>
+Description: Disable check for libgtk version - this might trigger false positives,
+our shlib-dep system is more fine-grained and correct anyway.
+--- a/xs/Gtk2.xs
++++ b/xs/Gtk2.xs
+@@ -126,6 +126,7 @@
+
+ /* make sure that we're running/linked against a version at least as
+ * new as we built against, otherwise bad things can happen. */
++ /* Not needed in Debian, we have a working shlib-dep system:
+ if ((((int)gtk_major_version) < GTK_MAJOR_VERSION)
+ ||
+ (gtk_major_version == GTK_MAJOR_VERSION &&
+@@ -139,6 +140,7 @@
+ " old. We'll continue, but expect problems!\n",
+ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION,
+ gtk_major_version, gtk_minor_version, gtk_micro_version);
++ */
+ }
+
+ #############################################################################
Added: trunk/libgtk2-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-perl/debian/patches/series?rev=28823&op=file
==============================================================================
--- trunk/libgtk2-perl/debian/patches/series (added)
+++ trunk/libgtk2-perl/debian/patches/series Sun Dec 28 10:46:15 2008
@@ -1,0 +1,3 @@
+10-fix_unicode_chars_in_manpages.patch
+20-fix_GdkKeys_tests_for_xvfb.patch
+30-disable_libgtk_version_check.patch
Modified: trunk/libgtk2-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-perl/debian/rules?rev=28823&op=diff
==============================================================================
--- trunk/libgtk2-perl/debian/rules (original)
+++ trunk/libgtk2-perl/debian/rules Sun Dec 28 10:46:15 2008
@@ -3,6 +3,8 @@
# If set to a true value then MakeMaker's prompt function will
# always return the default without waiting for user input.
export PERL_MM_USE_DEFAULT=1
+
+include /usr/share/quilt/quilt.make
PACKAGE=$(shell dh_listpackages)
@@ -19,17 +21,8 @@
CFLAGS += -O2
endif
-patch: patch-stamp
-patch-stamp:
- dpatch apply-all
- dpatch cat-all >patch-stamp
-
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
-
build: build-stamp
-build-stamp: patch-stamp
+build-stamp: $(QUILT_STAMPFN)
dh_testdir
$(PERL) Makefile.PL INSTALLDIRS=vendor
More information about the Pkg-perl-cvs-commits
mailing list