r22032 - in /trunk/libxml-grove-perl: ./ debian/ debian/patches/ t/
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Sat Jun 21 12:09:26 UTC 2008
Author: gregoa
Date: Sat Jun 21 12:09:25 2008
New Revision: 22032
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=22032
Log:
* Split out changes to upstream code into patches; add quilt framework.
* Refresh debian/rules, no functional changes.
* Remove debian/libxml-grove-perl.*, let debian/rules do the work.
Added:
trunk/libxml-grove-perl/debian/patches/
trunk/libxml-grove-perl/debian/patches/disable_tests.patch
trunk/libxml-grove-perl/debian/patches/pod.patch
trunk/libxml-grove-perl/debian/patches/series
Removed:
trunk/libxml-grove-perl/debian/libxml-grove-perl.docs
trunk/libxml-grove-perl/debian/libxml-grove-perl.examples
trunk/libxml-grove-perl/debian/libxml-grove-perl.install
Modified:
trunk/libxml-grove-perl/DOM-ecmascript.pod
trunk/libxml-grove-perl/debian/changelog
trunk/libxml-grove-perl/debian/control
trunk/libxml-grove-perl/debian/rules
trunk/libxml-grove-perl/t/grove.t
Modified: trunk/libxml-grove-perl/DOM-ecmascript.pod
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-grove-perl/DOM-ecmascript.pod?rev=22032&op=diff
==============================================================================
--- trunk/libxml-grove-perl/DOM-ecmascript.pod (original)
+++ trunk/libxml-grove-perl/DOM-ecmascript.pod Sat Jun 21 12:09:25 2008
@@ -1,7 +1,3 @@
-=head1 NAME
-
-XML::Grove and DOM Level One
-
=head1 XML::Grove and DOM Level One
XML::Grove is similar in concept to the ECMA Script Language Binding
Modified: trunk/libxml-grove-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-grove-perl/debian/changelog?rev=22032&op=diff
==============================================================================
--- trunk/libxml-grove-perl/debian/changelog (original)
+++ trunk/libxml-grove-perl/debian/changelog Sat Jun 21 12:09:25 2008
@@ -5,6 +5,9 @@
* Set Maintainer to Debian Perl Group.
* Use dist-based URL in debian/watch.
* debian/rules: delete /usr/lib/perl5 only if it exists.
+ * Split out changes to upstream code into patches; add quilt framework.
+ * Refresh debian/rules, no functional changes.
+ * Remove debian/libxml-grove-perl.*, let debian/rules do the work.
-- gregor herrmann <gregor+debian at comodo.priv.at> Sat, 01 Dec 2007 18:55:35 +0100
Modified: trunk/libxml-grove-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-grove-perl/debian/control?rev=22032&op=diff
==============================================================================
--- trunk/libxml-grove-perl/debian/control (original)
+++ trunk/libxml-grove-perl/debian/control Sat Jun 21 12:09:25 2008
@@ -7,7 +7,8 @@
Homepage: http://search.cpan.org/dist/XML-Grove/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libxml-grove-perl/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-grove-perl/
-Build-Depends-Indep: debhelper (>= 4.1), perl, libxml-perl
+Build-Depends: debhelper (>= 4.1), quilt (>= 0.40)
+Build-Depends-Indep: perl, libxml-perl
Package: libxml-grove-perl
Section: perl
Added: trunk/libxml-grove-perl/debian/patches/disable_tests.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-grove-perl/debian/patches/disable_tests.patch?rev=22032&op=file
==============================================================================
--- trunk/libxml-grove-perl/debian/patches/disable_tests.patch (added)
+++ trunk/libxml-grove-perl/debian/patches/disable_tests.patch Sat Jun 21 12:09:25 2008
@@ -1,0 +1,35 @@
+Author: Jay Bonci <jaybonci at debian.org>
+Description: Disabled two tests as they are failing pass due to problems
+with eq comparison of the strings
+
+--- libxml-grove-perl.orig/t/grove.t
++++ libxml-grove-perl/t/grove.t
+@@ -6,7 +6,7 @@
+ # Change 1..1 below to 1..last_test_to_print .
+ # (It may become useful if the test is moved to ./t subdirectory.)
+
+-BEGIN { $| = 1; print "1..5\n"; }
++BEGIN { $| = 1; print "1..3\n"; }
+ END {print "not ok 1\n" unless $loaded;}
+ use XML::Grove;
+ use XML::Parser::PerlSAX;
+@@ -111,7 +111,7 @@
+ chop ($expected);
+ $got = $g->as_canon_xml;
+
+-print (($got eq $expected) ? "ok 3\n" : "not ok 3\n");
++#print (($got eq $expected) ? "ok 3\n" : "not ok 3\n");
+
+ # TEST: as_string
+ $expected = <<'EOF';
+@@ -165,8 +165,8 @@
+
+ $got = $g->as_string;
+
+-print (($got eq $expected) ? "ok 4\n" : "not ok 4\n");
++#print (($got eq $expected) ? "ok 4\n" : "not ok 4\n");
+
+ # TEST: attr_as_string
+ $got = $g->root->{Contents}[1]{Contents}[4]->attr_as_string ('id');
+-print (($got eq 'OneKings') ? "ok 5\n" : "not ok 5\n");
++print (($got eq 'OneKings') ? "ok 3\n" : "not ok 3\n");
Added: trunk/libxml-grove-perl/debian/patches/pod.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-grove-perl/debian/patches/pod.patch?rev=22032&op=file
==============================================================================
--- trunk/libxml-grove-perl/debian/patches/pod.patch (added)
+++ trunk/libxml-grove-perl/debian/patches/pod.patch Sat Jun 21 12:09:25 2008
@@ -1,0 +1,25 @@
+Author: Jay Bonci <jaybonci at debian.org>
+Description: Squashed lintian error about bad manpage formatting from POD
+without a NAME section
+
+Author: gregor herrmann <gregoa at debian.org>
+Description: change NAME to satisfy lexgrog; break long URL
+
+--- libxml-grove-perl.orig/DOM-ecmascript.pod
++++ libxml-grove-perl/DOM-ecmascript.pod
+@@ -1,9 +1,14 @@
++=head1 NAME
++
++DOM-ecmascript - XML::Grove and ECMA Script Language Binding
++
+ =head1 XML::Grove and DOM Level One
+
+ XML::Grove is similar in concept to the ECMA Script Language Binding
+ to DOM Level 1 Core (Appendix E of the DOM Recommendation).
+
+-<http://www.w3.org/TR/REC-DOM-Level-1/ecma-script-language-binding.html>
++L<http://www.w3.org/TR/REC-DOM-Level-1/
++ecma-script-language-binding.html|http://www.w3.org/TR/REC-DOM-Level-1/ecma-script-language-binding.html>
+
+ The ECMA Script Language Binding presents DOM properties as ECMA
+ Script object properties. The same is true for XML::Grove, XML::Grove
Added: trunk/libxml-grove-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-grove-perl/debian/patches/series?rev=22032&op=file
==============================================================================
--- trunk/libxml-grove-perl/debian/patches/series (added)
+++ trunk/libxml-grove-perl/debian/patches/series Sat Jun 21 12:09:25 2008
@@ -1,0 +1,2 @@
+disable_tests.patch
+pod.patch
Modified: trunk/libxml-grove-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-grove-perl/debian/rules?rev=22032&op=diff
==============================================================================
--- trunk/libxml-grove-perl/debian/rules (original)
+++ trunk/libxml-grove-perl/debian/rules Sat Jun 21 12:09:25 2008
@@ -1,54 +1,63 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+# 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
-# This is the debhelper compatibility version to use.
-# export DH_COMPAT=4
+# 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=`pwd | sed -e "s/.*\/\\(.*\\)-.*/\\1/"`
+include /usr/share/quilt/quilt.make
+PERL ?= /usr/bin/perl
+PACKAGE = $(shell dh_listpackages)
+TMP = $(CURDIR)/debian/$(PACKAGE)
-build:
+build: build-stamp
+build-stamp: $(QUILT_STAMPFN)
dh_testdir
- # Add here commands to compile the package.
- perl Makefile.PL verbose INSTALLDIRS=vendor
-clean:
+ $(PERL) Makefile.PL INSTALLDIRS=vendor
+ $(MAKE)
+ $(MAKE) test
+ touch $@
+
+clean: unpatch
dh_testdir
dh_testroot
+ dh_clean build-stamp install-stamp
+ [ ! -f Makefile ] || $(MAKE) realclean
- -$(MAKE) clean
- rm -f Makefile.old
- dh_clean
-
-install:
+install: install-stamp
+install-stamp: build-stamp
dh_testdir
dh_testroot
dh_clean -k
- dh_installdirs
+ $(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+ [ ! -d $(TMP)/usr/lib/perl5 ] || \
+ rmdir --ignore-fail-on-non-empty --parents --verbose \
+ $(TMP)/usr/lib/perl5
+ touch $@
- $(MAKE) PREFIX=$(CURDIR)/debian/$(PACKAGE)/usr OPTIMIZE="-O2 -g -Wall" test install
- [ ! -d $(CURDIR)/debian/$(shell dh_listpackages)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(CURDIR)/debian/$(shell dh_listpackages)/usr/lib/perl5
+binary-arch:
+# We have nothing to do here for an architecture-independent package
-binary-arch:;
binary-indep: build install
dh_testdir
dh_testroot
- dh_installdocs
- dh_installman
- dh_installchangelogs ChangeLog
- dh_installexamples
- dh_link
- dh_strip
+ dh_installexamples examples/*
+ dh_installdocs README DOM
+ dh_installchangelogs Changes
+ dh_perl
dh_compress
dh_fixperms
dh_installdeb
- dh_perl
dh_gencontrol
dh_md5sums
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install
Modified: trunk/libxml-grove-perl/t/grove.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-grove-perl/t/grove.t?rev=22032&op=diff
==============================================================================
--- trunk/libxml-grove-perl/t/grove.t (original)
+++ trunk/libxml-grove-perl/t/grove.t Sat Jun 21 12:09:25 2008
@@ -6,7 +6,7 @@
# Change 1..1 below to 1..last_test_to_print .
# (It may become useful if the test is moved to ./t subdirectory.)
-BEGIN { $| = 1; print "1..3\n"; }
+BEGIN { $| = 1; print "1..5\n"; }
END {print "not ok 1\n" unless $loaded;}
use XML::Grove;
use XML::Parser::PerlSAX;
@@ -111,7 +111,7 @@
chop ($expected);
$got = $g->as_canon_xml;
-#print (($got eq $expected) ? "ok 3\n" : "not ok 3\n");
+print (($got eq $expected) ? "ok 3\n" : "not ok 3\n");
# TEST: as_string
$expected = <<'EOF';
@@ -165,8 +165,8 @@
$got = $g->as_string;
-#print (($got eq $expected) ? "ok 4\n" : "not ok 4\n");
+print (($got eq $expected) ? "ok 4\n" : "not ok 4\n");
# TEST: attr_as_string
$got = $g->root->{Contents}[1]{Contents}[4]->attr_as_string ('id');
-print (($got eq 'OneKings') ? "ok 3\n" : "not ok 3\n");
+print (($got eq 'OneKings') ? "ok 5\n" : "not ok 5\n");
More information about the Pkg-perl-cvs-commits
mailing list