r25853 - in /trunk/libtk-gbarr-perl: ./ debian/ debian/patches/ t/

rmayorga-guest at users.alioth.debian.org rmayorga-guest at users.alioth.debian.org
Wed Oct 8 01:30:48 UTC 2008


Author: rmayorga-guest
Date: Wed Oct  8 01:30:45 2008
New Revision: 25853

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=25853
Log:
* New upstream release
* debian/control
  + set debhelper version to 7
  + bump standards-version to 3.8.0
  + Add ${misc:Depends} to Depends
  + add myself to uploaders
  + remove xbase-clients B-D-I and add xvfb, xauth and
    xfonts-base
  + add quilt to B-D
* debian/rules
  + Refresh with dh-make-perl -R --dh7
  + Add workaround to run test with xvfp-run
  + Add workaround to override perms for examples and 
    remove /demos and move usr/lib/perl5/Tk to usr/share/perl5/Tk 
* Add fix_pod_errors.patch to fix POD errors.
* debian/copyright + use (new)format
* Add shebang_examples.patch to use /usr/bin/perl 
  instead of /usr/local/bin/perl

Added:
    trunk/libtk-gbarr-perl/debian/libtk-gbarr-perl.docs
    trunk/libtk-gbarr-perl/debian/libtk-gbarr-perl.examples
    trunk/libtk-gbarr-perl/debian/patches/
    trunk/libtk-gbarr-perl/debian/patches/fix_pod_errors.patch
    trunk/libtk-gbarr-perl/debian/patches/series
    trunk/libtk-gbarr-perl/debian/patches/shebang_examples.patch
Modified:
    trunk/libtk-gbarr-perl/Changes
    trunk/libtk-gbarr-perl/MANIFEST
    trunk/libtk-gbarr-perl/META.yml
    trunk/libtk-gbarr-perl/Makefile.PL
    trunk/libtk-gbarr-perl/TFrame.pm
    trunk/libtk-gbarr-perl/debian/changelog
    trunk/libtk-gbarr-perl/debian/compat
    trunk/libtk-gbarr-perl/debian/control
    trunk/libtk-gbarr-perl/debian/copyright
    trunk/libtk-gbarr-perl/debian/rules
    trunk/libtk-gbarr-perl/t/0basic.t
    trunk/libtk-gbarr-perl/t/0firebutton.t
    trunk/libtk-gbarr-perl/t/1numentryplain.t
    trunk/libtk-gbarr-perl/t/2numentry.t
    trunk/libtk-gbarr-perl/t/3cloth.t
    trunk/libtk-gbarr-perl/t/6numentry.t

Modified: trunk/libtk-gbarr-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtk-gbarr-perl/Changes?rev=25853&op=diff
==============================================================================
--- trunk/libtk-gbarr-perl/Changes (original)
+++ trunk/libtk-gbarr-perl/Changes Wed Oct  8 01:30:45 2008
@@ -1,3 +1,6 @@
+*** Release 2.08
+  - make test scripts more robust against missing DISPLAY
+
 *** Release 2.07
   - fixed foreground propagation in Tk::NumEntry
 

Modified: trunk/libtk-gbarr-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtk-gbarr-perl/MANIFEST?rev=25853&op=diff
==============================================================================
--- trunk/libtk-gbarr-perl/MANIFEST (original)
+++ trunk/libtk-gbarr-perl/MANIFEST Wed Oct  8 01:30:45 2008
@@ -29,4 +29,3 @@
 t/3cloth.t
 t/5tframe.t
 t/6numentry.t
-META.yml                                 Module meta-data (added by MakeMaker)

Modified: trunk/libtk-gbarr-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtk-gbarr-perl/META.yml?rev=25853&op=diff
==============================================================================
--- trunk/libtk-gbarr-perl/META.yml (original)
+++ trunk/libtk-gbarr-perl/META.yml Wed Oct  8 01:30:45 2008
@@ -1,11 +1,13 @@
-# http://module-build.sourceforge.net/META-spec.html
-#XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
-name:         Tk-GBARR
-version:      2.07
-version_from: 
-installdirs:  site
-requires:
+--- #YAML:1.0
+name:                Tk-GBARR
+version:             2.08
+abstract:            Additional Tk widgets (NumEntry, FireButton, Cloth...)
+license:             ~
+author:              ~
+generated_by:        ExtUtils::MakeMaker version 6.44
+distribution_type:   module
+requires:     
     Tk:                            402.002
-
-distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.30
+meta-spec:
+    url:     http://module-build.sourceforge.net/META-spec-v1.3.html
+    version: 1.3

Modified: trunk/libtk-gbarr-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtk-gbarr-perl/Makefile.PL?rev=25853&op=diff
==============================================================================
--- trunk/libtk-gbarr-perl/Makefile.PL (original)
+++ trunk/libtk-gbarr-perl/Makefile.PL Wed Oct  8 01:30:45 2008
@@ -29,7 +29,7 @@
 	PREREQ_PM => { 'Tk' => '402.002' }, # Tk/NumEntry need it
 	NAME	=> 'Tk::GBARR',
 	DISTNAME => 'Tk-GBARR',
-	VERSION	=> "2.07",
+	VERSION	=> "2.08",
 	PM => \%pm,
 	'dist'	=> {
 			COMPRESS 	=> 'gzip -9f',

Modified: trunk/libtk-gbarr-perl/TFrame.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtk-gbarr-perl/TFrame.pm?rev=25853&op=diff
==============================================================================
--- trunk/libtk-gbarr-perl/TFrame.pm (original)
+++ trunk/libtk-gbarr-perl/TFrame.pm Wed Oct  8 01:30:45 2008
@@ -1,4 +1,4 @@
-# $Id: TFrame.pm,v 2.1 2000/10/22 17:12:40 eserte Exp $
+# $Id: TFrame.pm,v 2.2 2007/12/06 20:09:39 eserte Exp $
 
 package Tk::TFrame;
 
@@ -7,7 +7,7 @@
 use vars qw($VERSION @ISA);
 
 @ISA = qw(Tk::Derived Tk::Frame);
-$VERSION = sprintf("%d.%02d", q$Revision: 2.1 $ =~ /(\d+)\.(\d+)/);
+$VERSION = sprintf("%d.%02d", q$Revision: 2.2 $ =~ /(\d+)\.(\d+)/);
 
 Construct Tk::Widget "TFrame";
 
@@ -175,9 +175,9 @@
     use Tk::TFrame;
     
     $frame1 = $parent->TFrame(
-	-label => [ -text => 'Title' ]
+	-label => [ -text => 'Title' ],
 	-borderwidth => 2,
-	-relief => 'groove'
+	-relief => 'groove',
     );
 
     # or simply

Modified: trunk/libtk-gbarr-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtk-gbarr-perl/debian/changelog?rev=25853&op=diff
==============================================================================
--- trunk/libtk-gbarr-perl/debian/changelog (original)
+++ trunk/libtk-gbarr-perl/debian/changelog Wed Oct  8 01:30:45 2008
@@ -1,3 +1,26 @@
+libtk-gbarr-perl (2.08-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/control
+    + set debhelper version to 7
+    + bump standards-version to 3.8.0
+    + Add ${misc:Depends} to Depends
+    + add myself to uploaders
+    + remove xbase-clients B-D-I and add xvfb, xauth and
+      xfonts-base
+    + add quilt to B-D
+  * debian/rules
+    + Refresh with dh-make-perl -R --dh7
+    + Add workaround to run test with xvfp-run
+    + Add workaround to override perms for examples and 
+      remove /demos and move usr/lib/perl5/Tk to usr/share/perl5/Tk 
+  * Add fix_pod_errors.patch to fix POD errors.
+  * debian/copyright + use (new)format
+  * Add shebang_examples.patch to use /usr/bin/perl 
+    instead of /usr/local/bin/perl
+
+ -- Rene Mayorga <rmayorga at debian.org.sv>  Tue, 07 Oct 2008 16:55:37 -0600
+
 libtk-gbarr-perl (2.07-4) unstable; urgency=medium
 
   * create usr/share/perl5 before moving Tk there from usr/lib/perl5

Modified: trunk/libtk-gbarr-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtk-gbarr-perl/debian/compat?rev=25853&op=diff
==============================================================================
--- trunk/libtk-gbarr-perl/debian/compat (original)
+++ trunk/libtk-gbarr-perl/debian/compat Wed Oct  8 01:30:45 2008
@@ -1,1 +1,1 @@
-5
+7

Modified: trunk/libtk-gbarr-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtk-gbarr-perl/debian/control?rev=25853&op=diff
==============================================================================
--- trunk/libtk-gbarr-perl/debian/control (original)
+++ trunk/libtk-gbarr-perl/debian/control Wed Oct  8 01:30:45 2008
@@ -4,17 +4,17 @@
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Carlo Segre <segre at debian.org>, Gustavo Franco <stratus at debian.org>,
  Niko Tyni <ntyni at iki.fi>, gregor herrmann <gregor+debian at comodo.priv.at>,
- Damyan Ivanov <dmn at debian.org>
-Build-Depends: debhelper (>= 5.0.0)
-Build-Depends-Indep: perl, perl-tk, xvfb, xbase-clients, xfonts-base
-Standards-Version: 3.7.3
+ Damyan Ivanov <dmn at debian.org>, Rene Mayorga <rmayorga at debian.org.sv>
+Build-Depends: debhelper (>= 7), quilt
+Build-Depends-Indep: perl, perl-tk, xvfb, xfonts-base, xauth
+Standards-Version: 3.8.0
 Homepage: http://search.cpan.org/dist/Tk-GBARR/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libtk-gbarr-perl/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libtk-gbarr-perl/
 
 Package: libtk-gbarr-perl
 Architecture: all
-Depends: ${perl:Depends}, perl-tk
+Depends: ${perl:Depends}, ${misc:Depends}, perl-tk
 Description: Various Tk Perl widgets
  A contribution to the ever growing collection of Tk Widgets, currently it 
  includes:

Modified: trunk/libtk-gbarr-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtk-gbarr-perl/debian/copyright?rev=25853&op=diff
==============================================================================
--- trunk/libtk-gbarr-perl/debian/copyright (original)
+++ trunk/libtk-gbarr-perl/debian/copyright Wed Oct  8 01:30:45 2008
@@ -1,13 +1,23 @@
 This package was debianized by Carlo Segre <segre at iit.edu> on
 Mon, 14 Mar 2005 00:14:56 -0600.
 
-Upstream source location: http://search.cpan.org/dist/Tk-GBARR/
+It was downloaded from: http://search.cpan.org/dist/Tk-GBARR/
 
-Upstream Maintainer: Slaven Rezic <slaven.rezic at berlin.de>
+Upstream Author: Slaven Rezic <slaven.rezic at berlin.de>
 
-Copyright (c) 1997-1998 Graham Barr <gbarr at pobox.com>. All rights reserved.
-This program is free software; you can redistribute it and/or modify it
-under the same terms as Perl itself.
+Files: * 
+ Copyright: Copyright (c) 1997-1998 Graham Barr <gbarr at pobox.com>. All rights reserved.
+License: GPL-1+ | Artistic
+ This program is free software; you can redistribute it and/or modify it
+ under the same terms as Perl itself.
 
-On Debian GNU/Linux systems, the complete text of these licenses can be found
-in /usr/share/common-licenses/GPL and /usr/share/common-licenses/Artistic.
+Files: debian/*
+ Copyright: Copyright (c) 2005-2008 Debian Perl Group <debian-perl at lists.debian.org>
+License: GPL-1+ | Artistic
+ This program is free software; you can redistribute it and/or
+ modify it under the same terms as Perl itself.
+
+Perl is distributed under your choice of the GNU General Public License or
+the Artistic License.  On Debian GNU/Linux systems, the complete text of the
+GNU General Public License can be found in `/usr/share/common-licenses/GPL'
+and the Artistic Licence in `/usr/share/common-licenses/Artistic'.

Added: trunk/libtk-gbarr-perl/debian/libtk-gbarr-perl.docs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtk-gbarr-perl/debian/libtk-gbarr-perl.docs?rev=25853&op=file
==============================================================================
--- trunk/libtk-gbarr-perl/debian/libtk-gbarr-perl.docs (added)
+++ trunk/libtk-gbarr-perl/debian/libtk-gbarr-perl.docs Wed Oct  8 01:30:45 2008
@@ -1,0 +1,1 @@
+TODO

Added: trunk/libtk-gbarr-perl/debian/libtk-gbarr-perl.examples
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtk-gbarr-perl/debian/libtk-gbarr-perl.examples?rev=25853&op=file
==============================================================================
--- trunk/libtk-gbarr-perl/debian/libtk-gbarr-perl.examples (added)
+++ trunk/libtk-gbarr-perl/debian/libtk-gbarr-perl.examples Wed Oct  8 01:30:45 2008
@@ -1,0 +1,1 @@
+examples/*

Added: trunk/libtk-gbarr-perl/debian/patches/fix_pod_errors.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtk-gbarr-perl/debian/patches/fix_pod_errors.patch?rev=25853&op=file
==============================================================================
--- trunk/libtk-gbarr-perl/debian/patches/fix_pod_errors.patch (added)
+++ trunk/libtk-gbarr-perl/debian/patches/fix_pod_errors.patch Wed Oct  8 01:30:45 2008
@@ -1,0 +1,25 @@
+--- libtk-gbarr-perl.orig/NumEntryPlain.pm
++++ libtk-gbarr-perl/NumEntryPlain.pm
+@@ -202,7 +202,7 @@
+ 
+ =head1 SYNOPSIS
+ 
+-S<    >B<use Tk::NumEntryPlain>;
++B<use Tk::NumEntryPlain;>
+ 
+ =head1 DESCRIPTION
+ 
+--- libtk-gbarr-perl.orig/NumEntry.pm
++++ libtk-gbarr-perl/NumEntry.pm
+@@ -134,9 +134,9 @@
+ 
+ =head1 SYNOPSIS
+ 
+-S<    >B<use Tk::NumEntry;>
++B<use Tk::NumEntry;>
+ 
+-S<    >I<$parent>-E<gt>B<NumEntry>(?I<-option>=E<gt>I<value>, ...?);
++I<$parent>-E<gt>B<NumEntry>(?I<-option>=E<gt>I<value>, ...?);
+ 
+ =head1 DESCRIPTION
+ 

Added: trunk/libtk-gbarr-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtk-gbarr-perl/debian/patches/series?rev=25853&op=file
==============================================================================
--- trunk/libtk-gbarr-perl/debian/patches/series (added)
+++ trunk/libtk-gbarr-perl/debian/patches/series Wed Oct  8 01:30:45 2008
@@ -1,0 +1,2 @@
+fix_pod_errors.patch
+shebang_examples.patch

Added: trunk/libtk-gbarr-perl/debian/patches/shebang_examples.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtk-gbarr-perl/debian/patches/shebang_examples.patch?rev=25853&op=file
==============================================================================
--- trunk/libtk-gbarr-perl/debian/patches/shebang_examples.patch (added)
+++ trunk/libtk-gbarr-perl/debian/patches/shebang_examples.patch Wed Oct  8 01:30:45 2008
@@ -1,0 +1,45 @@
+--- libtk-gbarr-perl.orig/examples/cloth
++++ libtk-gbarr-perl/examples/cloth
+@@ -1,5 +1,5 @@
+ # Object-oriented Canvas.
+-#!/usr/local/bin/perl -w
++#!/usr/bin/perl -w
+ use strict;
+ use Tk qw(Ev);
+ use Tk::Cloth;
+--- libtk-gbarr-perl.orig/examples/firebutton
++++ libtk-gbarr-perl/examples/firebutton
+@@ -1,5 +1,5 @@
+ # Button with "repeat" effect.
+-#!/usr/local/bin/perl -w
++#!/usr/bin/perl -w
+ use strict;
+ use Tk;
+ use Tk::FireButton;
+--- libtk-gbarr-perl.orig/examples/numentry
++++ libtk-gbarr-perl/examples/numentry
+@@ -1,5 +1,5 @@
+ # Entry for entering numeric values.
+-#!/usr/local/bin/perl -w
++#!/usr/bin/perl -w
+ use strict;
+ use Tk;
+ use Tk::NumEntry;
+--- libtk-gbarr-perl.orig/examples/numentryplain
++++ libtk-gbarr-perl/examples/numentryplain
+@@ -1,5 +1,5 @@
+ # Entry for entering numeric values, plain version.
+-#!/usr/local/bin/perl -w
++#!/usr/bin/perl -w
+ use strict;
+ use Tk;
+ use Tk::NumEntryPlain;
+--- libtk-gbarr-perl.orig/examples/tframe
++++ libtk-gbarr-perl/examples/tframe
+@@ -1,5 +1,5 @@
+ # A Titled Frame widget.
+-#!/usr/local/bin/perl -w
++#!/usr/bin/perl -w
+ use strict;
+ use Tk;
+ use Tk::TFrame;

Modified: trunk/libtk-gbarr-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtk-gbarr-perl/debian/rules?rev=25853&op=diff
==============================================================================
--- trunk/libtk-gbarr-perl/debian/rules (original)
+++ trunk/libtk-gbarr-perl/debian/rules Wed Oct  8 01:30:45 2008
@@ -1,80 +1,39 @@
 #!/usr/bin/make -f
-# This debian/rules file is provided as a template for normal perl
-# packages. It was created by Marc Brockschmidt <marc at dch-faq.de> for
-# the Debian Perl Group (http://pkg-perl.alioth.debian.org/) but may
-# be used freely wherever it is useful.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# 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
 
 PACKAGE=$(shell dh_listpackages)
+TMP	=$(CURDIR)/debian/$(PACKAGE)
 
-ifndef PERL
-PERL = /usr/bin/perl
-endif
-
-TMP     =$(CURDIR)/debian/$(PACKAGE)
+include /usr/share/quilt/quilt.make
 
 build: build-stamp
-build-stamp:
-	dh_testdir
-
-	$(PERL) Makefile.PL INSTALLDIRS=vendor
-	$(MAKE)
+build-stamp: $(QUILT_STAMPFN)
+	dh build --before test
+	# Use xvfp-run
 	xvfb-run $(MAKE) test
-
+	dh build --after test
 	touch $@
 
-clean:
-	dh_testdir
-	dh_testroot
-
-	dh_clean build-stamp install-stamp
-	[ ! -f Makefile ] || $(MAKE) realclean
+clean: unpatch
+	dh $@
 
 install: install-stamp
 install-stamp: build-stamp
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-
-	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
-
-	# wrong directory
+	dh install --until dh_auto_install
 	mkdir -p $(TMP)/usr/share/perl5
 	mv $(TMP)/usr/lib/perl5/Tk $(TMP)/usr/share/perl5/Tk
 	# make sure all demo programs are not executable ...
 	chmod 0644 examples/*
 	# ... and remove /usr/share/perl5/Tk/demos, we install them to examples/
 	[ ! -d $(TMP)/usr/share/perl5/Tk/demos ] || rm -rvf $(TMP)/usr/share/perl5/Tk/demos
-
 	[ ! -d $(TMP)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/lib/perl5
-
+	dh install --after dh_auto_install
 	touch $@
 
 binary-arch:
-# We have nothing to do here for an architecture-independent package
 
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installexamples examples/*
-	dh_installdocs README TODO
-	dh_installchangelogs Changes
-	dh_perl
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+binary-indep: install
+	dh $@
 
-source diff:
-	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+binary: binary-arch binary-indep
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+.PHONY: binary binary-arch binary-indep install clean build

Modified: trunk/libtk-gbarr-perl/t/0basic.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtk-gbarr-perl/t/0basic.t?rev=25853&op=diff
==============================================================================
--- trunk/libtk-gbarr-perl/t/0basic.t (original)
+++ trunk/libtk-gbarr-perl/t/0basic.t Wed Oct  8 01:30:45 2008
@@ -33,17 +33,21 @@
 	TFrame
       );
 
-   plan test => (10*@class+3);
-
   };
 
-eval { require Tk; };
-ok($@, "", "loading Tk module");
+my $mw;
+BEGIN {
+    if (!eval {
+	require Tk;
+	$mw = Tk::MainWindow->new();
+	Tk::Exists($mw);
+    }) {
+	print "1..0 # skip cannot open DISPLAY\n";
+	CORE::exit;
+    }
+}
 
-my $mw;
-eval {$mw = Tk::MainWindow->new();};
-ok($@, "", "can't create MainWindow");
-ok(Tk::Exists($mw), 1, "MainWindow creation failed");
+plan test => 10*@class;
 
 my $w;
 foreach my $class (@class)

Modified: trunk/libtk-gbarr-perl/t/0firebutton.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtk-gbarr-perl/t/0firebutton.t?rev=25853&op=diff
==============================================================================
--- trunk/libtk-gbarr-perl/t/0firebutton.t (original)
+++ trunk/libtk-gbarr-perl/t/0firebutton.t Wed Oct  8 01:30:45 2008
@@ -1,15 +1,26 @@
 use strict;
 use vars '$loaded';
+
+my $top1;
+my $top2;
+BEGIN {
+    if (!eval {
+	# two MainWindows test...
+	require Tk;
+	$top1 = MainWindow->new;
+	$top2 = MainWindow->new;
+    }) {
+	print "1..0 # skip cannot open DISPLAY\n";
+	CORE::exit;
+    }
+}
+
 BEGIN { $^W= 1; $| = 1; print "1..10\n"; }
 END {print "not ok 1\n" unless $loaded;}
 use Tk::FireButton;
 $loaded = 1;
 my $ok = 1;
 print "ok " . $ok++ . "\n";
-
-# two MainWindows test...
-my $top1 = new MainWindow;
-my $top2 = new MainWindow;
 
 my $fb;
 eval {

Modified: trunk/libtk-gbarr-perl/t/1numentryplain.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtk-gbarr-perl/t/1numentryplain.t?rev=25853&op=diff
==============================================================================
--- trunk/libtk-gbarr-perl/t/1numentryplain.t (original)
+++ trunk/libtk-gbarr-perl/t/1numentryplain.t Wed Oct  8 01:30:45 2008
@@ -16,9 +16,17 @@
 use strict;
 use Tk;
 
+my $mw;
+BEGIN 
+  {
+    if (!eval { $mw = Tk::MainWindow->new })
+      {
+	print "1..0 # skip cannot open DISPLAY\n";
+	CORE::exit;
+      }
+  }
+
 BEGIN { plan tests => 10 };
-
-my $mw = Tk::MainWindow->new;
 
 my $nep;
 {

Modified: trunk/libtk-gbarr-perl/t/2numentry.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtk-gbarr-perl/t/2numentry.t?rev=25853&op=diff
==============================================================================
--- trunk/libtk-gbarr-perl/t/2numentry.t (original)
+++ trunk/libtk-gbarr-perl/t/2numentry.t Wed Oct  8 01:30:45 2008
@@ -1,5 +1,17 @@
 use strict;
 use vars '$loaded';
+
+my $top;
+BEGIN {
+    if (!eval {
+	require Tk;
+	$top = MainWindow->new;
+    }) {
+	print "1..0 # skip cannot open DISPLAY\n";
+	CORE::exit;
+    }
+}
+
 BEGIN { $^W= 1; $| = 1; print "1..7\n"; }
 END {print "not ok 1\n" unless $loaded;}
 use Tk::NumEntry;
@@ -7,7 +19,6 @@
 my $ok = 1;
 print "ok " . $ok++ . "\n";
 
-my $top = new MainWindow;
 my $ne;
 eval {
     $ne = $top->NumEntry->pack;

Modified: trunk/libtk-gbarr-perl/t/3cloth.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtk-gbarr-perl/t/3cloth.t?rev=25853&op=diff
==============================================================================
--- trunk/libtk-gbarr-perl/t/3cloth.t (original)
+++ trunk/libtk-gbarr-perl/t/3cloth.t Wed Oct  8 01:30:45 2008
@@ -1,14 +1,23 @@
 use strict;
 use vars '$loaded';
 use Tk;
+
+my $top;
+BEGIN {
+    if (!eval {
+	$top = MainWindow->new;
+    }) {
+	print "1..0 # skip cannot open DISPLAY\n";
+	CORE::exit;
+    }
+}
+
 BEGIN { $^W= 1; $| = 1; print "1..10\n"; }
 END {print "not ok 1\n" unless $loaded;}
 use Tk::Cloth;
 $loaded = 1;
 my $ok = 1;
 print "ok @{[ $ok++ ]}\n";
-
-my $top = new MainWindow;
 
 my $cloth;
 eval {

Modified: trunk/libtk-gbarr-perl/t/6numentry.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtk-gbarr-perl/t/6numentry.t?rev=25853&op=diff
==============================================================================
--- trunk/libtk-gbarr-perl/t/6numentry.t (original)
+++ trunk/libtk-gbarr-perl/t/6numentry.t Wed Oct  8 01:30:45 2008
@@ -1,5 +1,17 @@
 use strict;
 use vars '$loaded';
+
+my $top;
+BEGIN {
+    if (!eval {
+	require Tk;
+	$top = MainWindow->new;
+    }) {
+	print "1..0 # skip cannot open DISPLAY\n";
+	CORE::exit;
+    }
+}
+
 BEGIN { $^W= 1; $| = 1; print "1..6\n"; }
 END {print "not ok 1\n" unless $loaded;}
 use Tk::NumEntry;
@@ -62,7 +74,6 @@
 # back to main again
 package main;
 
-my $top = new MainWindow;
 my $ne;
 eval {
     $ne = $top->MyNumEntry(-defaultvalue => 42,




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