r51565 - in /trunk/libgtk2-ex-entry-pango-perl: Changes META.yml commands debian/changelog lib/Gtk2/Ex/Entry/Pango.pm t/Gtk2-Ex-Entry-Pango.t

xoswald at users.alioth.debian.org xoswald at users.alioth.debian.org
Mon Jan 25 17:24:41 UTC 2010


Author: xoswald
Date: Mon Jan 25 17:24:33 2010
New Revision: 51565

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=51565
Log:
Ready for upload

Modified:
    trunk/libgtk2-ex-entry-pango-perl/Changes
    trunk/libgtk2-ex-entry-pango-perl/META.yml
    trunk/libgtk2-ex-entry-pango-perl/commands
    trunk/libgtk2-ex-entry-pango-perl/debian/changelog
    trunk/libgtk2-ex-entry-pango-perl/lib/Gtk2/Ex/Entry/Pango.pm
    trunk/libgtk2-ex-entry-pango-perl/t/Gtk2-Ex-Entry-Pango.t

Modified: trunk/libgtk2-ex-entry-pango-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-ex-entry-pango-perl/Changes?rev=51565&op=diff
==============================================================================
--- trunk/libgtk2-ex-entry-pango-perl/Changes (original)
+++ trunk/libgtk2-ex-entry-pango-perl/Changes Mon Jan 25 17:24:33 2010
@@ -1,4 +1,12 @@
 Revision history for Perl extension Gtk2::Ex::Entry::Pango.
+
+0.09 Wed Dec 23 19:53:57 CET 2009
+	- Issue 1 - test failure under locale.
+
+
+0.08 Sun Dec  6 20:30:19 CET 2009
+	- Fix an undef warning when reverting to the default empty text.
+
 
 0.07 Tue May  5 07:45:03 CEST 2009
 	- Bug fix: Old versions of Gtk2 would fail to have a proper $EMPTY_ATTRLIST

Modified: trunk/libgtk2-ex-entry-pango-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-ex-entry-pango-perl/META.yml?rev=51565&op=diff
==============================================================================
--- trunk/libgtk2-ex-entry-pango-perl/META.yml (original)
+++ trunk/libgtk2-ex-entry-pango-perl/META.yml Mon Jan 25 17:24:33 2010
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:                Gtk2-Ex-Entry-Pango
-version:             0.07
+version:             0.09
 abstract:            Gtk2 Entry that accepts Pango markup.
 license:             ~
 author:              

Modified: trunk/libgtk2-ex-entry-pango-perl/commands
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-ex-entry-pango-perl/commands?rev=51565&op=diff
==============================================================================
--- trunk/libgtk2-ex-entry-pango-perl/commands (original)
+++ trunk/libgtk2-ex-entry-pango-perl/commands Mon Jan 25 17:24:33 2010
@@ -3,14 +3,14 @@
 # Local installation place
 DEST=target
 
-SVN_REPO=$(shell svn info | grep -E '^URL: ' | cut -f2 -d' ' | sed -e 's%/trunk%%')
 VERSION=$(shell perl -le "print `grep VERSION lib/Gtk2/Ex/Entry/Pango.pm`")
 PACKAGE=Gtk2-Ex-Entry-Pango
+EMAIL=$(shell git config --global user.email)
 
 
 .PHONY: info
 info:
-	@echo "SVN     ${SVN_REPO}"
+	@echo "EMAIL   ${EMAIL}"
 	@echo "VERSION ${VERSION}"
 	@echo "PACKAGE ${PACKAGE}"
 
@@ -40,8 +40,12 @@
 
 .PHONY: tag
 tag:
-	sh -c 'if svn ls "${SVN_REPO}/tags/${VERSION}" > /dev/null 2>&1 ; then echo "SVN TAG ${VERSION} exists already"; exit 1; else exit 0 ; fi';
-	svn cp -m "Tag for version ${VERSION}" ${SVN_REPO}/trunk ${SVN_REPO}/tags/${VERSION}
+	git tag "${VERSION}"
+
+
+.PHONY: push
+push:
+	git push --tags origin master
 
 
 .PHONY: upload
@@ -50,7 +54,7 @@
 
 
 .PHONY: release
-release: clean dist distcheck tag upload
+release: clean test dist distcheck tag push upload
 	@echo "Release ${PACKAGE} ${VERSION} done."
 
 

Modified: trunk/libgtk2-ex-entry-pango-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-ex-entry-pango-perl/debian/changelog?rev=51565&op=diff
==============================================================================
--- trunk/libgtk2-ex-entry-pango-perl/debian/changelog (original)
+++ trunk/libgtk2-ex-entry-pango-perl/debian/changelog Mon Jan 25 17:24:33 2010
@@ -1,4 +1,10 @@
-libgtk2-ex-entry-pango-perl (0.07-1) UNRELEASED; urgency=low
+libgtk2-ex-entry-pango-perl (0.09-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Xavier Oswald <xoswald at debian.org>  Mon, 25 Jan 2010 18:07:44 +0100
+
+libgtk2-ex-entry-pango-perl (0.07-1) unstable; urgency=low
 
   * Initial Release.
 

Modified: trunk/libgtk2-ex-entry-pango-perl/lib/Gtk2/Ex/Entry/Pango.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-ex-entry-pango-perl/lib/Gtk2/Ex/Entry/Pango.pm?rev=51565&op=diff
==============================================================================
--- trunk/libgtk2-ex-entry-pango-perl/lib/Gtk2/Ex/Entry/Pango.pm (original)
+++ trunk/libgtk2-ex-entry-pango-perl/lib/Gtk2/Ex/Entry/Pango.pm Mon Jan 25 17:24:33 2010
@@ -137,7 +137,7 @@
 use Carp;
 
 # Module version
-our $VERSION = '0.07';
+our $VERSION = '0.09';
 
 
 # Emty Pango attributes list that's used to clear the previous markup
@@ -207,8 +207,8 @@
 	$self->{attributes} = undef;
 	
 	# The Pango text and attributes to apply when the entry has no text.
-	$self->{'empty_attributes'} = undef;
-	$self->{'empty_text'} = undef;
+	$self->{empty_attributes} = undef;
+	$self->{empty_text} = '';
 }
 
 
@@ -231,7 +231,7 @@
 			($self->{empty_attributes}, $self->{empty_text}) = Gtk2::Pango->parse_markup($value);
 		}
 		else {
-			($self->{empty_attributes}, $self->{empty_text}) = (undef, undef);
+			($self->{empty_attributes}, $self->{empty_text}) = (undef, '');
 		}
 		$self->{$field} = $value;
 		$self->signal_emit('empty-markup-changed' => $value);

Modified: trunk/libgtk2-ex-entry-pango-perl/t/Gtk2-Ex-Entry-Pango.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-ex-entry-pango-perl/t/Gtk2-Ex-Entry-Pango.t?rev=51565&op=diff
==============================================================================
--- trunk/libgtk2-ex-entry-pango-perl/t/Gtk2-Ex-Entry-Pango.t (original)
+++ trunk/libgtk2-ex-entry-pango-perl/t/Gtk2-Ex-Entry-Pango.t Mon Jan 25 17:24:33 2010
@@ -255,46 +255,37 @@
 	
 	test_die(
 		sub { $entry->set_markup("Me & You");},
-		qr/^Error on line 1: Character ' ' is not valid at the start of an entity name;/,
 		"set_markup is passed a character not escaped",
 	);
 	
 	test_die(
 		sub { $entry->set_markup("4 < 5");},
-		qr/^Error on line 1 char 12: ' ' is not a valid character following a '<' character;/,
 		"set_markup is passed broken XML",
 	);
 	
 	test_die(
 		sub { $entry->set_empty_markup("Me & You");},
-		qr/^Error on line 1: Character ' ' is not valid at the start of an entity name;/,
 		"set_empty_markup is passed a character not escaped",
 	);
 	
 	test_die(
 		sub { $entry->set_empty_markup("4 < 5");},
-		qr/^Error on line 1 char 12: ' ' is not a valid character following a '<' character;/,
 		"set_empty_markup is passed broken XML",
 	);
 }
 
 
 sub test_die {
-	my ($code, $regexp, $name) = @_;
+	my ($code, $name) = @_;
 	croak "First parameter isn't a code referce (sub)" unless ref $code eq 'CODE';
 	
 	my $test = 0;
 	eval {
 		$code->();
+		1;
+	} or do {
+		$test = 1;
 	};
-	if (my $error = $@) {
-		if ($error =~ /$regexp/) {
-			$test = 1 
-		}
-		else {
-			diag("Error message $error doesn't match against /$regexp/");
-		}
-	}
 
 	my $tb = Test::More->builder;
 	return $tb->ok($test, $name);




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