r20912 - in /trunk/libinline-perl: C/C-Cookbook.pod C/C.pod debian/changelog debian/control debian/patches/ debian/patches/fix-pod.patch debian/patches/local_dollar_underline.patch debian/patches/series debian/rules lib/Inline/denter.pm
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Tue Jun 10 18:23:21 UTC 2008
Author: gregoa
Date: Tue Jun 10 18:23:21 2008
New Revision: 20912
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=20912
Log:
* Set Standards-Version to 3.7.3 (no changes).
* Split changes to upstream code out into quilt patches; add quilt
framework.
* Refresh debian/rules, no functional changes.
Added:
trunk/libinline-perl/debian/patches/
trunk/libinline-perl/debian/patches/fix-pod.patch
trunk/libinline-perl/debian/patches/local_dollar_underline.patch
trunk/libinline-perl/debian/patches/series
Modified:
trunk/libinline-perl/C/C-Cookbook.pod
trunk/libinline-perl/C/C.pod
trunk/libinline-perl/debian/changelog
trunk/libinline-perl/debian/control
trunk/libinline-perl/debian/rules
trunk/libinline-perl/lib/Inline/denter.pm
Modified: trunk/libinline-perl/C/C-Cookbook.pod
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libinline-perl/C/C-Cookbook.pod?rev=20912&op=diff
==============================================================================
--- trunk/libinline-perl/C/C-Cookbook.pod (original)
+++ trunk/libinline-perl/C/C-Cookbook.pod Tue Jun 10 18:23:21 2008
@@ -633,10 +633,10 @@
In the class definition (second part) the Perl C<package> statement is
used to name the object class or namespace. But that's where the
-similarities end and Inline takes over.
+similarities end Inline takes over.
The idea is that we call a C subroutine called C<new()> which returns a
-blessed scalar. The scalar is a reference to a readonly integer which is a C
+blessed scalar. The scalar contains a readonly integer which is a C
pointer to a Soldier struct. This is our object.
The C<new()> function needs to malloc the memory for the struct and then
@@ -1362,7 +1362,7 @@
=item Discussion
I can't think of a real life application where you would want to
-generate C code on the fly, but at least I know how I would do it.
+generate C code on the fly, but at least I know know how I would do it.
:)
The C<bind()> function of Inline let's you bind (compile/load/execute) C
Modified: trunk/libinline-perl/C/C.pod
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libinline-perl/C/C.pod?rev=20912&op=diff
==============================================================================
--- trunk/libinline-perl/C/C.pod (original)
+++ trunk/libinline-perl/C/C.pod Tue Jun 10 18:23:21 2008
@@ -213,7 +213,7 @@
non-standard types such as C<typedef>-ed structs.
Inline uses the default Perl typemap file for its default types. This
-file is called C</usr/share/perl/5.6.1/ExtUtils/typemap>, or
+file is called C</usr/local/lib/perl5/5.6.1/ExtUtils/typemap>, or
something similar, depending on your Perl installation. It has
definitions for over 40 types, which are automatically used by Inline.
(You should probably browse this file at least once, just to get an idea
@@ -369,7 +369,7 @@
return stack.
If you really want to return nothing, then don't use the
-C<Inline_Stack_> macros. If you must use them, then use
+C<Inline_Stack_> macros. If you must use them, then set use
C<Inline_Stack_Void> at the end of your function.
=item 3
Modified: trunk/libinline-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libinline-perl/debian/changelog?rev=20912&op=diff
==============================================================================
--- trunk/libinline-perl/debian/changelog (original)
+++ trunk/libinline-perl/debian/changelog Tue Jun 10 18:23:21 2008
@@ -8,6 +8,10 @@
* debian/rules: don't install empty /usr/lib/perl5 directory.
* debian/rules: delete /usr/lib/perl5 only if it exists.
* Remove build dependency on historic dpkg-dev version.
+ * Set Standards-Version to 3.7.3 (no changes).
+ * Split changes to upstream code out into quilt patches; add quilt
+ framework.
+ * Refresh debian/rules, no functional changes.
-- gregor herrmann <gregor+debian at comodo.priv.at> Tue, 09 Oct 2007 22:29:50 +0200
Modified: trunk/libinline-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libinline-perl/debian/control?rev=20912&op=diff
==============================================================================
--- trunk/libinline-perl/debian/control (original)
+++ trunk/libinline-perl/debian/control Tue Jun 10 18:23:21 2008
@@ -2,9 +2,9 @@
Section: perl
Priority: optional
Build-Depends-Indep: perl (>= 5.8), libdigest-md5-perl, libparse-recdescent-perl
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 5), quilt (>= 0.40)
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
Homepage: http://search.cpan.org/dist/Inline/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libinline-perl/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libinline-perl/
Added: trunk/libinline-perl/debian/patches/fix-pod.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libinline-perl/debian/patches/fix-pod.patch?rev=20912&op=file
==============================================================================
--- trunk/libinline-perl/debian/patches/fix-pod.patch (added)
+++ trunk/libinline-perl/debian/patches/fix-pod.patch Tue Jun 10 18:23:21 2008
@@ -1,0 +1,47 @@
+Author: Joey Hess <joeyh at debian.org>
+Description: various POD fixes
+
+--- libinline-perl.orig/C/C-Cookbook.pod
++++ libinline-perl/C/C-Cookbook.pod
+@@ -633,10 +633,10 @@
+
+ In the class definition (second part) the Perl C<package> statement is
+ used to name the object class or namespace. But that's where the
+-similarities end Inline takes over.
++similarities end and Inline takes over.
+
+ The idea is that we call a C subroutine called C<new()> which returns a
+-blessed scalar. The scalar contains a readonly integer which is a C
++blessed scalar. The scalar is a reference to a readonly integer which is a C
+ pointer to a Soldier struct. This is our object.
+
+ The C<new()> function needs to malloc the memory for the struct and then
+@@ -1362,7 +1362,7 @@
+ =item Discussion
+
+ I can't think of a real life application where you would want to
+-generate C code on the fly, but at least I know know how I would do it.
++generate C code on the fly, but at least I know how I would do it.
+ :)
+
+ The C<bind()> function of Inline let's you bind (compile/load/execute) C
+--- libinline-perl.orig/C/C.pod
++++ libinline-perl/C/C.pod
+@@ -213,7 +213,7 @@
+ non-standard types such as C<typedef>-ed structs.
+
+ Inline uses the default Perl typemap file for its default types. This
+-file is called C</usr/local/lib/perl5/5.6.1/ExtUtils/typemap>, or
++file is called C</usr/share/perl/5.6.1/ExtUtils/typemap>, or
+ something similar, depending on your Perl installation. It has
+ definitions for over 40 types, which are automatically used by Inline.
+ (You should probably browse this file at least once, just to get an idea
+@@ -369,7 +369,7 @@
+ return stack.
+
+ If you really want to return nothing, then don't use the
+-C<Inline_Stack_> macros. If you must use them, then set use
++C<Inline_Stack_> macros. If you must use them, then use
+ C<Inline_Stack_Void> at the end of your function.
+
+ =item 3
Added: trunk/libinline-perl/debian/patches/local_dollar_underline.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libinline-perl/debian/patches/local_dollar_underline.patch?rev=20912&op=file
==============================================================================
--- trunk/libinline-perl/debian/patches/local_dollar_underline.patch (added)
+++ trunk/libinline-perl/debian/patches/local_dollar_underline.patch Tue Jun 10 18:23:21 2008
@@ -1,0 +1,30 @@
+Authr: Joey Hess <joeyh at debian.org>
+Description: Fixed $_ localizations in denter.pm.
+Bug: #172649
+
+--- libinline-perl.orig/lib/Inline/denter.pm
++++ libinline-perl/lib/Inline/denter.pm
+@@ -177,6 +177,7 @@
+ }
+
+ sub _next_line {
++ local ($_);
+ my $o = shift;
+ $o->{done}++, $o->{level} = -1, return unless @{$o->{lines}};
+ $_ = shift @{$o->{lines}};
+@@ -188,6 +189,7 @@
+ $o->{done}++, $o->{level} = -1, return unless @{$o->{lines}};
+ my ($width, $tabwidth) = @{$o}{qw(width tabwidth)};
+ while (1) {
++ local ($_);
+ $_ = $o->{lines}[0];
+ # expand tabs in leading whitespace;
+ $o->next_line, next if /^(\s*$|\#)/; # skip comments and blank lines
+@@ -221,6 +223,7 @@
+
+ sub indent_data {
+ my $o = shift;
++ local ($_);
+ $_ = shift;
+ return $o->indent_undef($_)
+ if not defined;
Added: trunk/libinline-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libinline-perl/debian/patches/series?rev=20912&op=file
==============================================================================
--- trunk/libinline-perl/debian/patches/series (added)
+++ trunk/libinline-perl/debian/patches/series Tue Jun 10 18:23:21 2008
@@ -1,0 +1,2 @@
+fix-pod.patch
+local_dollar_underline.patch
Modified: trunk/libinline-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libinline-perl/debian/rules?rev=20912&op=diff
==============================================================================
--- trunk/libinline-perl/debian/rules (original)
+++ trunk/libinline-perl/debian/rules Tue Jun 10 18:23:21 2008
@@ -1,43 +1,59 @@
#!/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
+
+include /usr/share/quilt/quilt.make
+
+PERL ?= /usr/bin/perl
+PACKAGE = $(shell dh_listpackages)
+TMP = $(CURDIR)/debian/$(PACKAGE)
build: build-stamp
-build-stamp:
+build-stamp: $(QUILT_STAMPFN)
dh_testdir
- echo y | perl Makefile.PL INSTALLDIRS=vendor
+ $(PERL) Makefile.PL INSTALLDIRS=vendor
$(MAKE)
$(MAKE) test
- touch build-stamp
+ touch $@
-clean:
+clean: unpatch
dh_testdir
dh_testroot
- rm -f build-stamp
- if [ -e Makefile ]; then $(MAKE) realclean; fi
- dh_clean
+ dh_clean build-stamp install-stamp
+ [ ! -f Makefile ] || $(MAKE) realclean
-install: build
+install: install-stamp
+install-stamp: build-stamp
dh_testdir
dh_testroot
dh_clean -k
- dh_installdirs usr/lib
- $(MAKE) install PREFIX=$(CURDIR)/debian/`dh_listpackages`/usr
- [ ! -d $(CURDIR)/debian/`dh_listpackages`/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(CURDIR)/debian/`dh_listpackages`/usr/lib/perl5
+ $(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+ [ ! -d $(TMP)/usr/lib/perl5 ] || \
+ rmdir --ignore-fail-on-non-empty --parents --verbose \
+ $(TMP)/usr/lib/perl5
+ touch $@
+
+binary-arch:
+# We have nothing to do here for an architecture-independent package
binary-indep: build install
-
-binary-arch: build install
dh_testdir
dh_testroot
dh_installdocs README
- dh_installexamples
dh_installchangelogs Changes
- dh_link
- dh_strip
+ dh_perl
dh_compress
dh_fixperms
dh_installdeb
- dh_perl
- dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
Modified: trunk/libinline-perl/lib/Inline/denter.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libinline-perl/lib/Inline/denter.pm?rev=20912&op=diff
==============================================================================
--- trunk/libinline-perl/lib/Inline/denter.pm (original)
+++ trunk/libinline-perl/lib/Inline/denter.pm Tue Jun 10 18:23:21 2008
@@ -177,7 +177,6 @@
}
sub _next_line {
- local ($_);
my $o = shift;
$o->{done}++, $o->{level} = -1, return unless @{$o->{lines}};
$_ = shift @{$o->{lines}};
@@ -189,7 +188,6 @@
$o->{done}++, $o->{level} = -1, return unless @{$o->{lines}};
my ($width, $tabwidth) = @{$o}{qw(width tabwidth)};
while (1) {
- local ($_);
$_ = $o->{lines}[0];
# expand tabs in leading whitespace;
$o->next_line, next if /^(\s*$|\#)/; # skip comments and blank lines
@@ -223,7 +221,6 @@
sub indent_data {
my $o = shift;
- local ($_);
$_ = shift;
return $o->indent_undef($_)
if not defined;
More information about the Pkg-perl-cvs-commits
mailing list