r6081 - in /trunk/libinline-perl: C/C-Cookbook.pod C/C.pod debian/ debian/NEWS debian/README.Debian debian/changelog debian/compat debian/control debian/copyright debian/rules debian/watch lib/Inline/denter.pm
joeyh at users.alioth.debian.org
joeyh at users.alioth.debian.org
Mon Jul 30 05:40:05 UTC 2007
Author: joeyh
Date: Mon Jul 30 05:40:05 2007
New Revision: 6081
URL: http://svn.debian.org/wsvn/?sc=1&rev=6081
Log:
[svn-inject] Applying Debian modifications to trunk
Added:
trunk/libinline-perl/debian/
trunk/libinline-perl/debian/NEWS
trunk/libinline-perl/debian/README.Debian
trunk/libinline-perl/debian/changelog
trunk/libinline-perl/debian/compat
trunk/libinline-perl/debian/control
trunk/libinline-perl/debian/copyright
trunk/libinline-perl/debian/rules (with props)
trunk/libinline-perl/debian/watch
Modified:
trunk/libinline-perl/C/C-Cookbook.pod
trunk/libinline-perl/C/C.pod
trunk/libinline-perl/lib/Inline/denter.pm
Modified: trunk/libinline-perl/C/C-Cookbook.pod
URL: http://svn.debian.org/wsvn/trunk/libinline-perl/C/C-Cookbook.pod?rev=6081&op=diff
==============================================================================
--- trunk/libinline-perl/C/C-Cookbook.pod (original)
+++ trunk/libinline-perl/C/C-Cookbook.pod Mon Jul 30 05:40:05 2007
@@ -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
Modified: trunk/libinline-perl/C/C.pod
URL: http://svn.debian.org/wsvn/trunk/libinline-perl/C/C.pod?rev=6081&op=diff
==============================================================================
--- trunk/libinline-perl/C/C.pod (original)
+++ trunk/libinline-perl/C/C.pod Mon Jul 30 05:40:05 2007
@@ -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/NEWS
URL: http://svn.debian.org/wsvn/trunk/libinline-perl/debian/NEWS?rev=6081&op=file
==============================================================================
--- trunk/libinline-perl/debian/NEWS (added)
+++ trunk/libinline-perl/debian/NEWS Mon Jul 30 05:40:05 2007
@@ -1,0 +1,11 @@
+libinline-perl (0.43-5) unstable; urgency=low
+
+ Note that when you upgrade from perl 5.6 to 5.8, binaries built with
+ libinline (this may include compiled objects cached in .Inline/_Inline
+ directories) will fail to work with the new version of perl. This is
+ because perl's ABI for binaries changed between perl 5.6 and 5.8.
+
+ The solution is to delete and regenerate any such binaries you might have.
+ I have not tried to automate this in the Debian package.
+
+ -- Joey Hess <joeyh at debian.org> Wed, 11 Sep 2002 21:37:56 -0400
Added: trunk/libinline-perl/debian/README.Debian
URL: http://svn.debian.org/wsvn/trunk/libinline-perl/debian/README.Debian?rev=6081&op=file
==============================================================================
--- trunk/libinline-perl/debian/README.Debian (added)
+++ trunk/libinline-perl/debian/README.Debian Mon Jul 30 05:40:05 2007
@@ -1,0 +1,9 @@
+Note that this package recommends that you install a C compiler. A C
+compiler will certianly be necessary if you want to use Inline to do
+programming in C. However, a C compiler is not necessary if you're using
+Inline with some other language, or if you are using a program, such as
+grepmail, that is compiled using Inline::MakeMaker and ships the compiled C
+code. Therefore, this package does not depend on a C compiler, it only
+recommends one.
+
+-- Joey Hess <joeyh at debian.org>
Added: trunk/libinline-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libinline-perl/debian/changelog?rev=6081&op=file
==============================================================================
--- trunk/libinline-perl/debian/changelog (added)
+++ trunk/libinline-perl/debian/changelog Mon Jul 30 05:40:05 2007
@@ -1,0 +1,85 @@
+libinline-perl (0.44-4) unstable; urgency=low
+
+ * Add gcc as a leading alternate in the recommends. Closes: #310897
+
+ -- Joey Hess <joeyh at debian.org> Thu, 26 May 2005 16:15:09 -0400
+
+libinline-perl (0.44-3) unstable; urgency=low
+
+ * Move from build-depends-indep to build-depends to meet current policy.
+
+ -- Joey Hess <joeyh at debian.org> Wed, 3 Sep 2003 12:06:49 -0400
+
+libinline-perl (0.44-2) unstable; urgency=low
+
+ * Fixed $_ localizations in denter.pm. (Patch already in upstream cvs.)
+ Closes: #172649
+
+ -- Joey Hess <joeyh at debian.org> Wed, 11 Dec 2002 13:00:31 -0500
+
+libinline-perl (0.44-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Joey Hess <joeyh at debian.org> Wed, 6 Nov 2002 13:45:27 -0500
+
+libinline-perl (0.43-6) unstable; urgency=low
+
+ * Added important note to NEWS.Debian about the perl 5.8 upgrade.
+
+ -- Joey Hess <joeyh at debian.org> Wed, 11 Sep 2002 21:41:33 -0400
+
+libinline-perl (0.43-5) unstable; urgency=low
+
+ * Built for perl 5.8.
+
+ -- Joey Hess <joeyh at debian.org> Wed, 31 Jul 2002 02:51:06 +0000
+
+libinline-perl (0.43-4) unstable; urgency=low
+
+ * debhelper v4
+
+ -- Joey Hess <joeyh at debian.org> Thu, 13 Jun 2002 16:46:09 -0400
+
+libinline-perl (0.43-3) unstable; urgency=low
+
+ * Added libdigest-md5-perl and libparse-recdescent-perl to build deps,
+ (so it can test itself). Closes: #133747
+
+ -- Joey Hess <joeyh at debian.org> Wed, 13 Feb 2002 10:35:56 -0500
+
+libinline-perl (0.43-2) unstable; urgency=low
+
+ * Corrected the path to the typemap in Inline::C man page. Closes: #126945
+ * Typos, Closes: #126948, #126955, #127034, #127036 (will send upstream).
+
+ -- Joey Hess <joeyh at debian.org> Sun, 30 Dec 2001 00:12:53 -0500
+
+libinline-perl (0.43-1) unstable; urgency=low
+
+ * Newer upstream release. Closes: #118190
+
+ -- Joey Hess <joeyh at debian.org> Mon, 5 Nov 2001 16:58:30 -0500
+
+libinline-perl (0.41-3) unstable; urgency=low
+
+ * Added missing deps on libdigest-md5-perl and libparse-recdescent-perl,
+ Closes: #100161
+
+ -- Joey Hess <joeyh at debian.org> Fri, 8 Jun 2001 19:33:59 -0400
+
+libinline-perl (0.41-2) unstable; urgency=low
+
+ * Bod thought up a better MakeMaker fix, which I will send upstream.
+
+ -- Joey Hess <joeyh at debian.org> Thu, 7 Jun 2001 23:03:59 -0400
+
+libinline-perl (0.41-1) unstable; urgency=low
+
+ * First release.
+ * Interesting hacking had to be done to C.pm to make it pass PREFIX=.
+ when making pure_install. I susppose this is the result of debian's
+ modified pure_install handling; it was trying to install into
+ /usr/local/share/perl/.
+
+ -- Joey Hess <joeyh at debian.org> Wed, 6 Jun 2001 16:22:20 -0400
Added: trunk/libinline-perl/debian/compat
URL: http://svn.debian.org/wsvn/trunk/libinline-perl/debian/compat?rev=6081&op=file
==============================================================================
--- trunk/libinline-perl/debian/compat (added)
+++ trunk/libinline-perl/debian/compat Mon Jul 30 05:40:05 2007
@@ -1,0 +1,1 @@
+4
Added: trunk/libinline-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libinline-perl/debian/control?rev=6081&op=file
==============================================================================
--- trunk/libinline-perl/debian/control (added)
+++ trunk/libinline-perl/debian/control Mon Jul 30 05:40:05 2007
@@ -1,0 +1,26 @@
+Source: libinline-perl
+Section: perl
+Priority: optional
+Build-Depends-Indep: perl (>= 5.8), libdigest-md5-perl, libparse-recdescent-perl, dpkg-dev (>= 1.9.0)
+Build-Depends: debhelper (>= 4)
+Maintainer: Joey Hess <joeyh at debian.org>
+Standards-Version: 3.6.1.0
+
+Package: libinline-perl
+Architecture: all
+Recommends: gcc | c-compiler
+Depends: ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}, libdigest-md5-perl, libparse-recdescent-perl
+Description: Write Perl subroutines in other programming languages
+ The Inline module allows you to put source code from other
+ programming languages directly "inline" in a Perl script
+ or module. The code is automatically compiled as needed,
+ and then loaded for immediate access from Perl.
+ .
+ Inline saves you from the hassle of having to write and
+ compile your own glue code using facilities like XS or
+ SWIG. Simply type the code where you want it and run your
+ Perl as normal. All the hairy details are handled for you.
+ The compilation and installation of your code chunks all
+ happen transparently; all you will notice is the delay of
+ compilation on the first run.
+
Added: trunk/libinline-perl/debian/copyright
URL: http://svn.debian.org/wsvn/trunk/libinline-perl/debian/copyright?rev=6081&op=file
==============================================================================
--- trunk/libinline-perl/debian/copyright (added)
+++ trunk/libinline-perl/debian/copyright Mon Jul 30 05:40:05 2007
@@ -1,0 +1,14 @@
+This is a Debian prepackaged version of the Inline perl module
+
+This package was put together by Joey Hess <joeyh at debian.org>, using
+sources from CPAN, http://www.cpan.org/
+
+The following copyright applies to this package:
+
+ Copyright (c) 2000, 2001. Brian Ingerson. All rights reserved.
+
+ This program is free software; you can redistribute it and/or modify it
+ under the same terms as Perl itself.
+
+(Those terms are either of the Artistic license or the GPL; both licenses
+can be found in full in /usr/share/common-licenses/)
Added: trunk/libinline-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libinline-perl/debian/rules?rev=6081&op=file
==============================================================================
--- trunk/libinline-perl/debian/rules (added)
+++ trunk/libinline-perl/debian/rules Mon Jul 30 05:40:05 2007
@@ -1,0 +1,45 @@
+#!/usr/bin/make -f
+
+build: build-stamp
+build-stamp:
+ dh_testdir
+ echo y | perl Makefile.PL INSTALLDIRS=vendor
+ $(MAKE)
+ $(MAKE) test
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+ -$(MAKE) realclean
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs usr/lib
+ $(MAKE) install PREFIX=$(PWD)/debian/`dh_listpackages`/usr
+
+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_compress
+ dh_fixperms
+ dh_installdeb
+ dh_perl
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
Propchange: trunk/libinline-perl/debian/rules
------------------------------------------------------------------------------
svn:executable = *
Added: trunk/libinline-perl/debian/watch
URL: http://svn.debian.org/wsvn/trunk/libinline-perl/debian/watch?rev=6081&op=file
==============================================================================
--- trunk/libinline-perl/debian/watch (added)
+++ trunk/libinline-perl/debian/watch Mon Jul 30 05:40:05 2007
@@ -1,0 +1,5 @@
+version=2
+# I use the search form because this finds the most recent version. The
+# author's directory has several versions and it would be hard to match the
+# most current one.
+http://search.cpan.org/search?dist=Inline .*/Inline-(.*).tar.gz
Modified: trunk/libinline-perl/lib/Inline/denter.pm
URL: http://svn.debian.org/wsvn/trunk/libinline-perl/lib/Inline/denter.pm?rev=6081&op=diff
==============================================================================
--- trunk/libinline-perl/lib/Inline/denter.pm (original)
+++ trunk/libinline-perl/lib/Inline/denter.pm Mon Jul 30 05:40:05 2007
@@ -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;
More information about the Pkg-perl-cvs-commits
mailing list