diff -Nru libgtk2-unique-perl-0.02/Changes libgtk2-unique-perl-0.01/Changes --- libgtk2-unique-perl-0.02/Changes 2009-07-12 15:29:33.000000000 +0100 +++ libgtk2-unique-perl-0.01/Changes 2009-04-02 21:12:49.000000000 +0100 @@ -1,9 +1,6 @@ Revision history for Gtk2::Unique -0.02 Sun Jul 12 16:28:57 CEST 2009 - More perlish API with send_message_by_name() - - 0.01 Thu Apr 2 15:44:36 CEST 2009 First version, released on an unsuspecting world. + diff -Nru /tmp/l15aPzpDi4/libgtk2-unique-perl-0.02/debian/changelog /tmp/6vJp5wlw5G/libgtk2-unique-perl-0.01/debian/changelog --- libgtk2-unique-perl-0.02/debian/changelog 2009-11-26 22:00:22.000000000 +0000 +++ libgtk2-unique-perl-0.01/debian/changelog 2009-11-26 21:46:16.000000000 +0000 @@ -1,16 +1,8 @@ -libgtk2-unique-perl (0.02-1) unstable; urgency=low +libgtk2-unique-perl (0.01-1~shutterhardy1) hardy; urgency=low - [ Nathan Handler ] - * debian/watch: Update to ignore development releases. + * backported from karmic - [ Ryan Niebur ] - * New upstream release - * Debian Policy 3.8.2 - - [ gregor herrmann ] - * debian/copyright: add year of upstream copyright. - - -- Ryan Niebur Mon, 13 Jul 2009 12:54:52 -0700 + -- Mario Kemper Tue, 24 Nov 2009 23:51:13 +0100 libgtk2-unique-perl (0.01-1) unstable; urgency=low diff -Nru /tmp/l15aPzpDi4/libgtk2-unique-perl-0.02/debian/compat /tmp/6vJp5wlw5G/libgtk2-unique-perl-0.01/debian/compat --- libgtk2-unique-perl-0.02/debian/compat 2009-11-26 22:00:22.000000000 +0000 +++ libgtk2-unique-perl-0.01/debian/compat 2009-11-25 01:15:59.000000000 +0000 @@ -1 +1 @@ -7 +5 diff -Nru /tmp/l15aPzpDi4/libgtk2-unique-perl-0.02/debian/control /tmp/6vJp5wlw5G/libgtk2-unique-perl-0.01/debian/control --- libgtk2-unique-perl-0.02/debian/control 2009-11-26 22:00:22.000000000 +0000 +++ libgtk2-unique-perl-0.01/debian/control 2009-11-24 23:21:14.000000000 +0000 @@ -1,12 +1,12 @@ Source: libgtk2-unique-perl Section: perl Priority: optional -Build-Depends: debhelper (>= 7.0.50), libextutils-depends-perl, - libextutils-pkgconfig-perl, libgtk2-perl (>= 1.161), libunique-dev, quilt (>= 0.46-7), +Build-Depends: debhelper (>= 6.0.4), libextutils-depends-perl, + libextutils-pkgconfig-perl, libgtk2-perl (>= 1.161), libunique-dev, quilt (>= 0.46-4), # xvfb, xauth, xfonts-base, dbus-x11 Maintainer: Debian Perl Group Uploaders: Ryan Niebur -Standards-Version: 3.8.2 +Standards-Version: 3.8.1 Homepage: http://search.cpan.org/dist/Gtk2-Unique/ Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libgtk2-unique-perl/ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libgtk2-unique-perl/ diff -Nru /tmp/l15aPzpDi4/libgtk2-unique-perl-0.02/debian/copyright /tmp/6vJp5wlw5G/libgtk2-unique-perl-0.01/debian/copyright --- libgtk2-unique-perl-0.02/debian/copyright 2009-11-26 22:00:22.000000000 +0000 +++ libgtk2-unique-perl-0.01/debian/copyright 2009-11-24 22:50:21.000000000 +0000 @@ -5,7 +5,7 @@ Upstream-Name: Gtk2-Unique Files: * -Copyright: 2009, Emmanuel Rodriguez +Copyright: Emmanuel Rodriguez License-Alias: Perl License: Artistic | GPL-1+ diff -Nru /tmp/l15aPzpDi4/libgtk2-unique-perl-0.02/debian/rules /tmp/6vJp5wlw5G/libgtk2-unique-perl-0.01/debian/rules --- libgtk2-unique-perl-0.02/debian/rules 2009-11-26 22:00:22.000000000 +0000 +++ libgtk2-unique-perl-0.01/debian/rules 2009-11-25 00:10:46.000000000 +0000 @@ -1,10 +1,26 @@ #!/usr/bin/make -f -%: - dh --with quilt $@ +include /usr/share/quilt/quilt.make -CMD=$(shell echo $@ | sed 's/^override_//') +build: build-stamp +build-stamp: $(QUILT_STAMPFN) + dh build + touch $@ -override_dh_auto_test: - # broken - #dbus-launch xvfb-run $(CMD) +clean: unpatch + dh $@ + +install: install-stamp +install-stamp: build-stamp + dh install + rm -fr ./debian/$(shell dh_listpackages)/usr/bin/ ./debian/$(shell dh_listpackages)/usr/share/man/man1/ + touch $@ + +binary-arch: install + dh $@ + +binary-indep: + +binary: binary-arch binary-indep + +.PHONY: binary binary-arch binary-indep install clean build diff -Nru /tmp/l15aPzpDi4/libgtk2-unique-perl-0.02/debian/watch /tmp/6vJp5wlw5G/libgtk2-unique-perl-0.01/debian/watch --- libgtk2-unique-perl-0.02/debian/watch 2009-11-26 22:00:22.000000000 +0000 +++ libgtk2-unique-perl-0.01/debian/watch 2009-11-24 22:50:21.000000000 +0000 @@ -1,2 +1,2 @@ version=3 -http://search.cpan.org/dist/Gtk2-Unique/ .*/Gtk2-Unique-v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$ +http://search.cpan.org/dist/Gtk2-Unique/ .*/Gtk2-Unique-v?(\d[\d_.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$ diff -Nru /tmp/l15aPzpDi4/libgtk2-unique-perl-0.02/examples/sample.pl /tmp/6vJp5wlw5G/libgtk2-unique-perl-0.01/examples/sample.pl --- libgtk2-unique-perl-0.02/examples/sample.pl 2009-07-12 15:16:32.000000000 +0100 +++ libgtk2-unique-perl-0.01/examples/sample.pl 2009-05-04 20:13:38.000000000 +0100 @@ -33,7 +33,8 @@ # If there already is an instance running, this will return TRUE; there's no # race condition because the check is already performed at construction time. if ($app->is_running) { - my $response = $app->send_message_by_name(write => data => $text); + my $data = [$text, '/etc/passwd']; + my $response = $app->send_message($COMMAND_WRITE, data => '/etc/passwd'); return 0; } diff -Nru /tmp/l15aPzpDi4/libgtk2-unique-perl-0.02/lib/Gtk2/Unique.pm /tmp/6vJp5wlw5G/libgtk2-unique-perl-0.01/lib/Gtk2/Unique.pm --- libgtk2-unique-perl-0.02/lib/Gtk2/Unique.pm 2009-07-12 15:32:21.000000000 +0100 +++ libgtk2-unique-perl-0.01/lib/Gtk2/Unique.pm 2009-05-04 20:21:35.000000000 +0100 @@ -22,7 +22,7 @@ if ($app->is_running) { # The application is already running, send it a message my ($text) = @ARGV ? @ARGV : ("Foo text here"); - $app->send_message_by_name('foo', text => $text); + $app->send_message($COMMAND_FOO, text => $text); } else { # Create the single application instance and wait for other requests @@ -91,7 +91,7 @@ use Gtk2; -our $VERSION = '0.02'; +our $VERSION = '0.01'; sub dl_load_flags { $^O eq 'darwin' ? 0x00 : 0x01 } diff -Nru /tmp/l15aPzpDi4/libgtk2-unique-perl-0.02/META.yml /tmp/6vJp5wlw5G/libgtk2-unique-perl-0.01/META.yml --- libgtk2-unique-perl-0.02/META.yml 2009-07-12 15:36:11.000000000 +0100 +++ libgtk2-unique-perl-0.01/META.yml 2009-05-04 20:38:01.000000000 +0100 @@ -1,6 +1,6 @@ --- #YAML:1.0 name: Gtk2-Unique -version: 0.02 +version: 0.01 abstract: Use single instance applications license: perl, lgpl author: diff -Nru /tmp/l15aPzpDi4/libgtk2-unique-perl-0.02/t/UniqueApp.t /tmp/6vJp5wlw5G/libgtk2-unique-perl-0.01/t/UniqueApp.t --- libgtk2-unique-perl-0.02/t/UniqueApp.t 2009-07-12 15:16:32.000000000 +0100 +++ libgtk2-unique-perl-0.01/t/UniqueApp.t 2009-05-04 20:03:24.000000000 +0100 @@ -3,7 +3,7 @@ use strict; use warnings; -use Gtk2::TestHelper tests => 16; +use Gtk2::TestHelper tests => 10; use Gtk2::Unique; @@ -79,7 +79,7 @@ if (! $app->is_running()) { SKIP: { - skip "No app is running; execute perl -Mblib t/unit-tests.pl", 6; + skip "No app is running; execute perl -Mblib t/unit-tests.pl", 3; } return; } @@ -88,29 +88,15 @@ $response = $app->send_message($COMMAND_FOO, text => "hello"); is($response, 'ok', "send_message(text)"); - $response = $app->send_message_by_name(foo => text => "hello"); - is($response, 'ok', "send_message_by_name(text)"); - - $response = $app->send_message($COMMAND_BAR, filename => __FILE__); is($response, 'invalid', "send_message(filename)"); - $response = $app->send_message_by_name(bar => filename => __FILE__); - is($response, 'invalid', "send_message_by_name(filename)"); - - $response = $app->send_message($COMMAND_FOO, uris => [ 'http://live.gnome.org/LibUnique', 'http://gtk2-perl.sourceforge.net/', ]); is($response, 'ok', "send_message(uris)"); - $response = $app->send_message_by_name(foo =>, uris => [ - 'http://live.gnome.org/LibUnique', - 'http://gtk2-perl.sourceforge.net/', - ]); - is($response, 'ok', "send_message_by_name(uris)"); - my $window = Gtk2::Window->new(); $app->watch_window($window); diff -Nru /tmp/l15aPzpDi4/libgtk2-unique-perl-0.02/xs/UniqueApp.xs /tmp/6vJp5wlw5G/libgtk2-unique-perl-0.01/xs/UniqueApp.xs --- libgtk2-unique-perl-0.02/xs/UniqueApp.xs 2009-07-12 15:16:32.000000000 +0100 +++ libgtk2-unique-perl-0.01/xs/UniqueApp.xs 2009-05-04 19:58:20.000000000 +0100 @@ -7,7 +7,7 @@ UniqueApp_noinc* unique_app_new (class, const gchar *name, const gchar_ornull *startup_id, ...) ALIAS: - new_with_commands = 1 + Gtk2::UniqueApp::new_with_commands = 1 PREINIT: UniqueApp *app = NULL; @@ -70,51 +70,19 @@ unique_app_is_running (UniqueApp *app) -# # $app->send_message($ID) -> unique_app_send_message(app, command_id, NULL); # $app->send_message($ID, text => $text) -> set_text() unique_app_send_message(app, command_id, message); # $app->send_message($ID, data => $data) -> set() unique_app_send_message(app, command_id, message); # $app->send_message($ID, uris => @uri) -> set_uris() unique_app_send_message(app, command_id, message); # -# $app->send_message_by_name('command') -> unique_app_send_message(app, command_id, NULL); -# $app->send_message_by_name('command', text => $text) -> set_text() unique_app_send_message(app, command_id, message); -# $app->send_message_by_name('command', data => $data) -> set() unique_app_send_message(app, command_id, message); -# $app->send_message_by_name('command', uris => @uri) -> set_uris() unique_app_send_message(app, command_id, message); -# # UniqueResponse -unique_app_send_message (UniqueApp *app, SV *command, ...) - ALIAS: - send_message_by_name = 1 - +unique_app_send_message (UniqueApp *app, gint command_id, ...) PREINIT: UniqueMessageData *message = NULL; SV **s = NULL; - gint command_id = 0; CODE: - - switch (ix) { - case 0: - { - command_id = (gint) SvIV(command); - } - break; - - case 1: - { - gchar *command_name = SvGChar(command); - command_id = unique_command_from_string(app, command_name); - if (command_id == 0) { - croak("Command '%s' isn't registered with the application", command_name); - } - } - break; - - default: - croak("Method called with the wrong name"); - } - if (items == 4) { SV *sv_data; gchar *type;