r22033 - in /trunk/libxml-perl: debian/changelog debian/control debian/libxml-perl.docs debian/libxml-perl.examples debian/patches/ debian/patches/debbugs.patch debian/patches/series debian/rules lib/XML/PatAct/ToObjects.pm
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Sat Jun 21 12:18:17 UTC 2008
Author: gregoa
Date: Sat Jun 21 12:18:17 2008
New Revision: 22033
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=22033
Log:
* Split out changes to lib/XML/PatAct/ToObjects.pm into a patch; add quilt
framework.
* Remove debian/libxml-perl.*, install docs and examples via debian/rules.
* Refresh debian/rules, no functional changes.
Added:
trunk/libxml-perl/debian/patches/
trunk/libxml-perl/debian/patches/debbugs.patch
trunk/libxml-perl/debian/patches/series
Removed:
trunk/libxml-perl/debian/libxml-perl.docs
trunk/libxml-perl/debian/libxml-perl.examples
Modified:
trunk/libxml-perl/debian/changelog
trunk/libxml-perl/debian/control
trunk/libxml-perl/debian/rules
trunk/libxml-perl/lib/XML/PatAct/ToObjects.pm
Modified: trunk/libxml-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-perl/debian/changelog?rev=22033&op=diff
==============================================================================
--- trunk/libxml-perl/debian/changelog (original)
+++ trunk/libxml-perl/debian/changelog Sat Jun 21 12:18:17 2008
@@ -5,6 +5,10 @@
* 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 lib/XML/PatAct/ToObjects.pm into a patch; add quilt
+ framework.
+ * Remove debian/libxml-perl.*, install docs and examples via debian/rules.
+ * Refresh debian/rules, no functional changes.
-- gregor herrmann <gregor+debian at comodo.priv.at> Sat, 01 Dec 2007 18:55:41 +0100
Modified: trunk/libxml-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-perl/debian/control?rev=22033&op=diff
==============================================================================
--- trunk/libxml-perl/debian/control (original)
+++ trunk/libxml-perl/debian/control Sat Jun 21 12:18:17 2008
@@ -7,7 +7,8 @@
Homepage: http://search.cpan.org/dist/libxml-perl/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libxml-perl/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-perl/
-Build-Depends-Indep: debhelper (>= 4.1), perl, libxml-parser-perl
+Build-Depends: debhelper (>= 4.1), quilt (>= 0.40)
+Build-Depends-Indep: perl, libxml-parser-perl
Package: libxml-perl
Section: perl
Added: trunk/libxml-perl/debian/patches/debbugs.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-perl/debian/patches/debbugs.patch?rev=22033&op=file
==============================================================================
--- trunk/libxml-perl/debian/patches/debbugs.patch (added)
+++ trunk/libxml-perl/debian/patches/debbugs.patch Sat Jun 21 12:18:17 2008
@@ -1,0 +1,49 @@
+Author: Ardo van Rangelrooij <ardo at debian.org>
+Description:
+ * lib/XML/PatAct/ToObjects.pm: applied two patches by Adam Heath which are
+ needed for a rewrite of 'debbugs'
+ (closes: Bug#174315)
+ * lib/XML/PatAct/ToObjects.pm: applied another patch from Adam Heath
+ which is needed for the new version of 'debbugs'
+ (closes: Bug#174434)
+
+
+--- libxml-perl.orig/lib/XML/PatAct/ToObjects.pm
++++ libxml-perl/lib/XML/PatAct/ToObjects.pm
+@@ -176,6 +176,8 @@
+
+ if ($action->{Make} eq 'HASH') {
+ push @{$self->{Parents}}, { @args };
++ } elsif ($action->{Make} eq 'ARRAY') {
++ push @{$self->{Parents}}, [ @args ];
+ } else {
+ my $is_defined = 0;
+ #eval "\$is_defined = defined %{$action->{Make}" . "::}";
+@@ -253,9 +255,16 @@
+ if ($action->{FieldIsArray}) {
+ push @{$self->{Parents}[-1]{$action->{Field}}}, $value;
+ } elsif (defined $action->{Field}) {
+- $self->{Parents}[-1]{$action->{Field}} = $value;
++ my $field = $action->{Field};
++ $field =~ s/%\{($name_re)\}/$element->{Attributes}{$1}/ge;
++ $self->{Parents}[-1]{$field} = $value;
+ } else {
+- push @{$self->{Parents}[-1]{Contents}}, $value;
++ my $ref = ref($self->{Parents}[-1]);
++ if ($ref eq 'ARRAY') {
++ push @{$self->{Parents}[-1]}, $value;
++ } else {
++ push @{$self->{Parents}[-1]{Contents}}, $value;
++ }
+ }
+ }
+
+@@ -293,7 +302,7 @@
+ $action->{Make} = shift @$source;
+ } elsif ($option eq '-args') {
+ my $args = shift @$source;
+- $args =~ s/%\{($name_re)\}/(\$element->{Attributes}{'$1'})/g;
++ $args =~ s/%\{($name_re)\}/\$element->{Attributes}{'$1'}/g;
+ $action->{Args} = $args;
+ } elsif ($option eq '-field') {
+ $action->{Field} = shift @$source;
Added: trunk/libxml-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-perl/debian/patches/series?rev=22033&op=file
==============================================================================
--- trunk/libxml-perl/debian/patches/series (added)
+++ trunk/libxml-perl/debian/patches/series Sat Jun 21 12:18:17 2008
@@ -1,0 +1,1 @@
+debbugs.patch
Modified: trunk/libxml-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-perl/debian/rules?rev=22033&op=diff
==============================================================================
--- trunk/libxml-perl/debian/rules (original)
+++ trunk/libxml-perl/debian/rules Sat Jun 21 12:18:17 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_installexamples
- dh_installman
- dh_installchangelogs ChangeLog
- dh_link
- dh_strip
+ dh_installexamples examples/*
+ dh_installdocs README doc
+ 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-perl/lib/XML/PatAct/ToObjects.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-perl/lib/XML/PatAct/ToObjects.pm?rev=22033&op=diff
==============================================================================
--- trunk/libxml-perl/lib/XML/PatAct/ToObjects.pm (original)
+++ trunk/libxml-perl/lib/XML/PatAct/ToObjects.pm Sat Jun 21 12:18:17 2008
@@ -176,8 +176,6 @@
if ($action->{Make} eq 'HASH') {
push @{$self->{Parents}}, { @args };
- } elsif ($action->{Make} eq 'ARRAY') {
- push @{$self->{Parents}}, [ @args ];
} else {
my $is_defined = 0;
#eval "\$is_defined = defined %{$action->{Make}" . "::}";
@@ -255,16 +253,9 @@
if ($action->{FieldIsArray}) {
push @{$self->{Parents}[-1]{$action->{Field}}}, $value;
} elsif (defined $action->{Field}) {
- my $field = $action->{Field};
- $field =~ s/%\{($name_re)\}/$element->{Attributes}{$1}/ge;
- $self->{Parents}[-1]{$field} = $value;
+ $self->{Parents}[-1]{$action->{Field}} = $value;
} else {
- my $ref = ref($self->{Parents}[-1]);
- if ($ref eq 'ARRAY') {
- push @{$self->{Parents}[-1]}, $value;
- } else {
- push @{$self->{Parents}[-1]{Contents}}, $value;
- }
+ push @{$self->{Parents}[-1]{Contents}}, $value;
}
}
@@ -302,7 +293,7 @@
$action->{Make} = shift @$source;
} elsif ($option eq '-args') {
my $args = shift @$source;
- $args =~ s/%\{($name_re)\}/\$element->{Attributes}{'$1'}/g;
+ $args =~ s/%\{($name_re)\}/(\$element->{Attributes}{'$1'})/g;
$action->{Args} = $args;
} elsif ($option eq '-field') {
$action->{Field} = shift @$source;
More information about the Pkg-perl-cvs-commits
mailing list