r14761 - in /trunk/libterm-readline-gnu-perl: ./ Gnu/ debian/ debian/patches/
tincho-guest at users.alioth.debian.org
tincho-guest at users.alioth.debian.org
Mon Feb 11 13:38:07 UTC 2008
Author: tincho-guest
Date: Mon Feb 11 13:38:06 2008
New Revision: 14761
URL: http://svn.debian.org/wsvn/?sc=1&rev=14761
Log:
* New upstream release.
* debian/control:
- Added myself to Uploaders.
- Bumped Standards-Version (no changes).
- s/dpatch/quilt/.
* debian/watch: upgraded version, change to dist/ URL.
* debian/rules:
- remove unused dh_*
- use quilt (and properly depend on it)
- use debhelper instead of manually handling various things
- removed shebang corrections (moved to patch)
- always use -g in CFLAGS and honour noopt
- use DESTDIR in make
- use install-stamp
- fix various dependencies.
* debian/patches/*: converted to quilt.
Added:
trunk/libterm-readline-gnu-perl/debian/patches/10term.patch
trunk/libterm-readline-gnu-perl/debian/patches/20new.patch
trunk/libterm-readline-gnu-perl/debian/patches/30outstream.patch
trunk/libterm-readline-gnu-perl/debian/patches/fix_shebang.patch
trunk/libterm-readline-gnu-perl/debian/patches/series
Removed:
trunk/libterm-readline-gnu-perl/Gnu/euc_jp.pm
trunk/libterm-readline-gnu-perl/debian/patches/00list
trunk/libterm-readline-gnu-perl/debian/patches/10term.dpatch
trunk/libterm-readline-gnu-perl/debian/patches/20new.dpatch
trunk/libterm-readline-gnu-perl/debian/patches/30outstream.dpatch
Modified:
trunk/libterm-readline-gnu-perl/Gnu.pm
trunk/libterm-readline-gnu-perl/Gnu.xs
trunk/libterm-readline-gnu-perl/Gnu/XS.pm
trunk/libterm-readline-gnu-perl/MANIFEST
trunk/libterm-readline-gnu-perl/META.yml
trunk/libterm-readline-gnu-perl/Makefile.PL
trunk/libterm-readline-gnu-perl/README
trunk/libterm-readline-gnu-perl/debian/changelog
trunk/libterm-readline-gnu-perl/debian/control
trunk/libterm-readline-gnu-perl/debian/rules
trunk/libterm-readline-gnu-perl/debian/watch
Modified: trunk/libterm-readline-gnu-perl/Gnu.pm
URL: http://svn.debian.org/wsvn/trunk/libterm-readline-gnu-perl/Gnu.pm?rev=14761&op=diff
==============================================================================
--- trunk/libterm-readline-gnu-perl/Gnu.pm (original)
+++ trunk/libterm-readline-gnu-perl/Gnu.pm Mon Feb 11 13:38:06 2008
@@ -1,9 +1,9 @@
#
# Gnu.pm --- The GNU Readline/History Library wrapper module
#
-# $Id: Gnu.pm,v 1.96 2006-04-02 01:59:53+09 hiroo Exp $
+# $Id: Gnu.pm,v 1.97 2008-02-07 23:12:23+09 hiroo Exp $
#
-# Copyright (c) 2006 Hiroo Hayashi. All rights reserved.
+# Copyright (c) 2008 Hiroo Hayashi. All rights reserved.
#
# This program is free software; you can redistribute it and/or
# modify it under the same terms as Perl itself.
@@ -73,7 +73,7 @@
use DynaLoader;
use vars qw($VERSION @ISA @EXPORT_OK);
- $VERSION = '1.16';
+ $VERSION = '1.17';
# Term::ReadLine::Gnu::AU makes a function in
# `Term::ReadLine::Gnu::XS' as a method.
Modified: trunk/libterm-readline-gnu-perl/Gnu.xs
URL: http://svn.debian.org/wsvn/trunk/libterm-readline-gnu-perl/Gnu.xs?rev=14761&op=diff
==============================================================================
--- trunk/libterm-readline-gnu-perl/Gnu.xs (original)
+++ trunk/libterm-readline-gnu-perl/Gnu.xs Mon Feb 11 13:38:06 2008
@@ -1,9 +1,9 @@
/*
* Gnu.xs --- GNU Readline wrapper module
*
- * $Id: Gnu.xs,v 1.110 2006-04-02 01:53:29+09 hiroo Exp $
+ * $Id: Gnu.xs,v 1.111 2008-02-06 23:48:59+09 hiroo Exp $
*
- * Copyright (c) 2006 Hiroo Hayashi. All rights reserved.
+ * Copyright (c) 2008 Hiroo Hayashi. All rights reserved.
*
* This program is free software; you can redistribute it and/or
* modify it under the same terms as Perl itself.
@@ -2665,14 +2665,18 @@
{
switch (id) {
case 0:
+#if 0 /* PerlIO_releaseFILE must be called only before closing FILE *. */
if (instreamPIO != NULL)
PerlIO_releaseFILE(instreamPIO, rl_instream);
+#endif
rl_instream = PerlIO_findFILE(stream);
RETVAL = instreamPIO = stream;
break;
case 1:
+#if 0 /* PerlIO_releaseFILE must be called only before closing FILE *. */
if (outstreamPIO != NULL)
PerlIO_releaseFILE(outstreamPIO, rl_outstream);
+#endif
rl_outstream = PerlIO_findFILE(stream);
RETVAL = outstreamPIO = stream;
#ifdef __CYGWIN__
@@ -2694,6 +2698,8 @@
XSRETURN_UNDEF;
break;
}
+ PerlIO_debug("TRG:store_iostream id %d fd %d\n",
+ id, PerlIO_fileno(RETVAL));
}
OUTPUT:
RETVAL
@@ -2722,6 +2728,8 @@
XSRETURN_UNDEF;
break;
}
+ PerlIO_debug("TRG:fetch_iostream id %d fd %d\n",
+ id, PerlIO_fileno(RETVAL));
}
OUTPUT:
RETVAL
Modified: trunk/libterm-readline-gnu-perl/Gnu/XS.pm
URL: http://svn.debian.org/wsvn/trunk/libterm-readline-gnu-perl/Gnu/XS.pm?rev=14761&op=diff
==============================================================================
--- trunk/libterm-readline-gnu-perl/Gnu/XS.pm (original)
+++ trunk/libterm-readline-gnu-perl/Gnu/XS.pm Mon Feb 11 13:38:06 2008
@@ -2,9 +2,9 @@
#
# XS.pm : perl function definition for Term::ReadLine::Gnu
#
-# $Id: XS.pm,v 1.22 2004-10-17 12:02:23-05 hiroo Exp $
-#
-# Copyright (c) 2003 Hiroo Hayashi. All rights reserved.
+# $Id: XS.pm,v 1.23 2008-02-08 00:43:46+09 hiroo Exp $
+#
+# Copyright (c) 2008 Hiroo Hayashi. All rights reserved.
#
# This program is free software; you can redistribute it and/or
# modify it under the same terms as Perl itself.
@@ -14,6 +14,9 @@
use Carp;
use strict;
use AutoLoader 'AUTOLOAD';
+
+use vars qw($VERSION);
+$VERSION='1.17'; # added for CPAN
# make aliases
use vars qw(%Attribs);
Modified: trunk/libterm-readline-gnu-perl/MANIFEST
URL: http://svn.debian.org/wsvn/trunk/libterm-readline-gnu-perl/MANIFEST?rev=14761&op=diff
==============================================================================
--- trunk/libterm-readline-gnu-perl/MANIFEST (original)
+++ trunk/libterm-readline-gnu-perl/MANIFEST Mon Feb 11 13:38:06 2008
@@ -1,7 +1,6 @@
Gnu.pm The GNU Readline extension Perl module
Gnu.xs The GNU Readline extension external subroutines
Gnu/XS.pm
-Gnu/euc_jp.pm
INSTALL Installtion instructions
MANIFEST This list of files
Makefile.PL The GNU Readline extension makefile writer
@@ -22,4 +21,3 @@
t/inputrc A file for t/readline.t
t/readline.t a test script for the GNU Readline extension
typemap The GNU Readline extension interface types
-META.yml Module meta-data (added by MakeMaker)
Modified: trunk/libterm-readline-gnu-perl/META.yml
URL: http://svn.debian.org/wsvn/trunk/libterm-readline-gnu-perl/META.yml?rev=14761&op=diff
==============================================================================
--- trunk/libterm-readline-gnu-perl/META.yml (original)
+++ trunk/libterm-readline-gnu-perl/META.yml Mon Feb 11 13:38:06 2008
@@ -1,10 +1,12 @@
-# http://module-build.sourceforge.net/META-spec.html
-#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX#
-name: Term-ReadLine-Gnu
-version: 1.16
-version_from: Gnu.pm
-installdirs: site
-requires:
-
-distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.17
+--- #YAML:1.0
+name: Term-ReadLine-Gnu
+version: 1.17
+abstract: ~
+license: ~
+author: ~
+generated_by: ExtUtils::MakeMaker version 6.42
+distribution_type: module
+requires:
+meta-spec:
+ url: http://module-build.sourceforge.net/META-spec-v1.3.html
+ version: 1.3
Modified: trunk/libterm-readline-gnu-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/trunk/libterm-readline-gnu-perl/Makefile.PL?rev=14761&op=diff
==============================================================================
--- trunk/libterm-readline-gnu-perl/Makefile.PL (original)
+++ trunk/libterm-readline-gnu-perl/Makefile.PL Mon Feb 11 13:38:06 2008
@@ -1,15 +1,15 @@
#
# Makefile.PL for Term::ReadLine::Gnu
#
-# $Id: Makefile.PL,v 1.28 2005-10-01 10:44:06-05 hiroo Exp $
-#
-# Copyright (c) 2005 Hiroo Hayashi. All rights reserved.
+# $Id: Makefile.PL,v 1.29 2008-02-06 23:50:09+09 hiroo Exp $
+#
+# Copyright (c) 2008 Hiroo Hayashi. All rights reserved.
# <hiroo.hayashi at computer.org>
#
# This program is free software; you can redistribute it and/or
# modify it under the same terms as Perl itself.
#
-# OS/2 support is contributed by Ilya Zakharevich.
+# OS/2 support was contributed by Ilya Zakharevich.
# <ilya at math.ohio-state.edu>
#
# Usage: perl Makefile.PL [--prefix=...] [--includedir=...] [--libdir=...]
@@ -186,6 +186,14 @@
# execute it and get version
my $rlver;
chomp($rlver = `./rlver`);
+ # MacOS X 10.4 has libedit by default.
+ if ($rlver =~ /EditLine/) {
+ die <<EOM;
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+The libreadline you use is libedit library. Use the GNU Readline Library.
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+EOM
+ }
print "It seems that you have the GNU Readline Library version $rlver.\n";
# $rlver may be '8.21-beta3' or '4.2a'
return $rlver =~ /(\d+)\.(\d+)/;
Modified: trunk/libterm-readline-gnu-perl/README
URL: http://svn.debian.org/wsvn/trunk/libterm-readline-gnu-perl/README?rev=14761&op=diff
==============================================================================
--- trunk/libterm-readline-gnu-perl/README (original)
+++ trunk/libterm-readline-gnu-perl/README Mon Feb 11 13:38:06 2008
@@ -1,9 +1,9 @@
-*- Indented-text -*-
-$Id: README,v 1.26 2006-04-02 02:18:19+09 hiroo Exp $
+$Id: README,v 1.27 2008-02-07 23:09:14+09 hiroo Exp $
Term::ReadLine::Gnu --- GNU Readline Library Wrapper Module
- Copyright (c) 2006 Hiroo Hayashi. All rights reserved.
+ Copyright (c) 2008 Hiroo Hayashi. All rights reserved.
This program is free software; you can redistribute it and/or
modify it under the same terms as Perl itself.
@@ -65,6 +65,14 @@
Revision History:
+
+1.17 2008-02-07
+ - Unnecessary PerlIO_releaseFILE() calls are removed. This
+ fix prevents `make test' from failing on Perl 5.10.
+ - Makefile.PL now fails with the EditLine Library on MacOS X.
+ Use the GNU Readline Library.
+ - tested with readline-5.2 (which has no new feature to be
+ supported).
1.16 2006-04-02
- fix Makefile.PL to work with the latest Cygwin.
@@ -118,7 +126,7 @@
terminal, or a terminal with wrong TERM environment variable
setting.
- update documents
- - improve coding style of Gnu.xs. (indentation stype, more
+ - improve coding style of Gnu.xs. (indentation style, more
typemap, etc.)
1.11 2001-10-27
@@ -316,22 +324,17 @@
- support readline-2.2
add rl_unbind_function_in_map() and rl_unbind_command_in_map()
Makefile.PL checks the version of the GNU Readline Library
-
- define rl_save_prompt() and rl_restore_prompt()
-
- document fix
'Changes' file is removed. It is merged into README file.
fix a bug in a sample program of rl_completion_entry_function
1.00 1998-04-15
- the 1st major release
-
- ornaments feature is now on by default as recent
Term::ReadLine and Term::ReadLine::Perl
-
- document fix
remove description related to mymalloc
-
- add ornaments-change function to t/readline.t which
demonstrates rl_message().
Modified: trunk/libterm-readline-gnu-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libterm-readline-gnu-perl/debian/changelog?rev=14761&op=diff
==============================================================================
--- trunk/libterm-readline-gnu-perl/debian/changelog (original)
+++ trunk/libterm-readline-gnu-perl/debian/changelog Mon Feb 11 13:38:06 2008
@@ -1,3 +1,24 @@
+libterm-readline-gnu-perl (1.17a-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control:
+ - Added myself to Uploaders.
+ - Bumped Standards-Version (no changes).
+ - s/dpatch/quilt/.
+ * debian/watch: upgraded version, change to dist/ URL.
+ * debian/rules:
+ - remove unused dh_*
+ - use quilt (and properly depend on it)
+ - use debhelper instead of manually handling various things
+ - removed shebang corrections (moved to patch)
+ - always use -g in CFLAGS and honour noopt
+ - use DESTDIR in make
+ - use install-stamp
+ - fix various dependencies.
+ * debian/patches/*: converted to quilt.
+
+ -- MartÃn Ferrari <martin.ferrari at gmail.com> Mon, 11 Feb 2008 11:31:40 -0200
+
libterm-readline-gnu-perl (1.16-3) UNRELEASED; urgency=low
* debian/control: Added: Vcs-Svn field (source stanza); Vcs-Browser
Modified: trunk/libterm-readline-gnu-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libterm-readline-gnu-perl/debian/control?rev=14761&op=diff
==============================================================================
--- trunk/libterm-readline-gnu-perl/debian/control (original)
+++ trunk/libterm-readline-gnu-perl/debian/control Mon Feb 11 13:38:06 2008
@@ -2,12 +2,15 @@
Section: perl
Priority: optional
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Gunnar Wolf <gwolf at debian.org>, Niko Tyni <ntyni at iki.fi>, Krzysztof Krzyzaniak (eloy) <eloy at debian.org>, Carlo Segre <segre at debian.org>
-Standards-Version: 3.7.2
+Uploaders: Gunnar Wolf <gwolf at debian.org>, Niko Tyni <ntyni at iki.fi>,
+ Krzysztof Krzyzaniak (eloy) <eloy at debian.org>, Carlo Segre <segre at debian.org>,
+ MartÃn Ferrari <martin.ferrari at gmail.com>
+Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 5), perl (>= 5.8), libreadline5-dev,
+ quilt
Homepage: http://search.cpan.org/dist/Term-ReadLine-Gnu/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libterm-readline-gnu-perl/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libterm-readline-gnu-perl/
-Build-Depends: debhelper (>= 5), perl (>= 5.8), libreadline5-dev, dpatch (>= 2.0.9)
Package: libterm-readline-gnu-perl
Architecture: any
Added: trunk/libterm-readline-gnu-perl/debian/patches/10term.patch
URL: http://svn.debian.org/wsvn/trunk/libterm-readline-gnu-perl/debian/patches/10term.patch?rev=14761&op=file
==============================================================================
--- trunk/libterm-readline-gnu-perl/debian/patches/10term.patch (added)
+++ trunk/libterm-readline-gnu-perl/debian/patches/10term.patch Mon Feb 11 13:38:06 2008
@@ -1,0 +1,21 @@
+# 10term.patch by Niko Tyni <ntyni at iki.fi>
+# DP: Fix uninitialized value message
+# DP: (#99843, patch by Nicolas Bertolissio)
+Index: libterm-readline-gnu-perl/Gnu/XS.pm
+===================================================================
+--- libterm-readline-gnu-perl.orig/Gnu/XS.pm
++++ libterm-readline-gnu-perl/Gnu/XS.pm
+@@ -363,11 +363,12 @@ sub get_history_event ( $$;$ ) {
+ use vars qw(%term_no_ue);
+ %term_no_ue = ( kterm => 1 );
+
++
+ sub ornaments {
+ return $rl_term_set unless @_;
+ $rl_term_set = shift;
+ $rl_term_set ||= ',,,';
+- $rl_term_set = $term_no_ue{$ENV{TERM}} ? 'us,me,,' : 'us,ue,,'
++ $rl_term_set = $term_no_ue{defined($ENV{TERM}) ? $ENV{TERM} : ''} ? 'us,me,,' : 'us,ue,,'
+ if $rl_term_set eq '1';
+ my @ts = split /,/, $rl_term_set, 4;
+ my @rl_term_set
Added: trunk/libterm-readline-gnu-perl/debian/patches/20new.patch
URL: http://svn.debian.org/wsvn/trunk/libterm-readline-gnu-perl/debian/patches/20new.patch?rev=14761&op=file
==============================================================================
--- trunk/libterm-readline-gnu-perl/debian/patches/20new.patch (added)
+++ trunk/libterm-readline-gnu-perl/debian/patches/20new.patch Mon Feb 11 13:38:06 2008
@@ -1,0 +1,24 @@
+# 20new.patch by Niko Tyni <ntyni at iki.fi>
+# DP: Fix new() argument checking and documentation.
+# DP: (#204362, patch by Nicolas Bertolissio)
+Index: libterm-readline-gnu-perl/Gnu.pm
+===================================================================
+--- libterm-readline-gnu-perl.orig/Gnu.pm
++++ libterm-readline-gnu-perl/Gnu.pm
+@@ -196,7 +196,7 @@ installed this package, possible value
+
+ sub ReadLine { 'Term::ReadLine::Gnu'; }
+
+-=item C<new(NAME,[IN[,OUT]])>
++=item C<new(NAME,[IN,OUT])>
+
+ returns the handle for subsequent calls to following functions.
+ Argument is the name of the application. Optionally can be followed
+@@ -210,6 +210,7 @@ sub new {
+ my $this = shift; # Package
+ my $class = ref($this) || $this;
+
++ croak "Wrong number of arguments" unless @_==1 or @_==3;
+ my $name = shift;
+
+ my $self = \%Attribs;
Added: trunk/libterm-readline-gnu-perl/debian/patches/30outstream.patch
URL: http://svn.debian.org/wsvn/trunk/libterm-readline-gnu-perl/debian/patches/30outstream.patch?rev=14761&op=file
==============================================================================
--- trunk/libterm-readline-gnu-perl/debian/patches/30outstream.patch (added)
+++ trunk/libterm-readline-gnu-perl/debian/patches/30outstream.patch Mon Feb 11 13:38:06 2008
@@ -1,0 +1,34 @@
+# 30outstream.patch by Niko Tyni <ntyni at iki.fi>
+# DP: Fix SIGSEGV after "|" command. (#236018)
+Index: libterm-readline-gnu-perl/Gnu.pm
+===================================================================
+--- libterm-readline-gnu-perl.orig/Gnu.pm
++++ libterm-readline-gnu-perl/Gnu.pm
+@@ -278,6 +278,10 @@ sub readline { # should be ReadLine
+ my $self = shift;
+ my ($prompt, $preput) = @_;
+
++ # make sure the outstream fd inside the readline library is
++ # in sync (see http://bugs.debian.org/236018)
++ $Attribs{outstream} = $Attribs{outstream};
++
+ # ornament support (now prompt only)
+ $prompt = ${$Attribs{term_set}}[0] . $prompt . ${$Attribs{term_set}}[1];
+
+Index: libterm-readline-gnu-perl/Gnu.xs
+===================================================================
+--- libterm-readline-gnu-perl.orig/Gnu.xs
++++ libterm-readline-gnu-perl/Gnu.xs
+@@ -2678,6 +2678,12 @@ _rl_store_iostream(stream, id)
+ PerlIO_releaseFILE(outstreamPIO, rl_outstream);
+ #endif
+ rl_outstream = PerlIO_findFILE(stream);
++ /*
++ * Debian-specific addition fixing a segfault with "PERLIO=stdio"
++ * see http://bugs.debian.org/350991
++ */
++ if (!rl_outstream)
++ rl_outstream = stdout;
+ RETVAL = outstreamPIO = stream;
+ #ifdef __CYGWIN__
+ {
Added: trunk/libterm-readline-gnu-perl/debian/patches/fix_shebang.patch
URL: http://svn.debian.org/wsvn/trunk/libterm-readline-gnu-perl/debian/patches/fix_shebang.patch?rev=14761&op=file
==============================================================================
--- trunk/libterm-readline-gnu-perl/debian/patches/fix_shebang.patch (added)
+++ trunk/libterm-readline-gnu-perl/debian/patches/fix_shebang.patch Mon Feb 11 13:38:06 2008
@@ -1,0 +1,50 @@
+Index: libterm-readline-gnu-perl/Gnu/XS.pm
+===================================================================
+--- libterm-readline-gnu-perl.orig/Gnu/XS.pm
++++ libterm-readline-gnu-perl/Gnu/XS.pm
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ #
+ # XS.pm : perl function definition for Term::ReadLine::Gnu
+ #
+Index: libterm-readline-gnu-perl/eg/fileman
+===================================================================
+--- libterm-readline-gnu-perl.orig/eg/fileman
++++ libterm-readline-gnu-perl/eg/fileman
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ #
+ # $Id: fileman,v 1.1 1998-02-28 19:01:24+09 hayashi Exp $
+ #
+Index: libterm-readline-gnu-perl/eg/perlsh
+===================================================================
+--- libterm-readline-gnu-perl.orig/eg/perlsh
++++ libterm-readline-gnu-perl/eg/perlsh
+@@ -1,4 +1,4 @@
+-#! /usr/local/bin/perl
++#!/usr/bin/perl
+ #
+ # $Id: perlsh,v 1.24 2001-10-27 22:59:15-05 hayashi Exp $
+ #
+Index: libterm-readline-gnu-perl/eg/pftp
+===================================================================
+--- libterm-readline-gnu-perl.orig/eg/pftp
++++ libterm-readline-gnu-perl/eg/pftp
+@@ -1,4 +1,4 @@
+-#! /usr/local/bin/perl
++#!/usr/bin/perl
+ #
+ # $Id: pftp,v 1.9 1999-03-20 02:46:02+09 hayashi Exp $
+ #
+Index: libterm-readline-gnu-perl/eg/ptksh+
+===================================================================
+--- libterm-readline-gnu-perl.orig/eg/ptksh+
++++ libterm-readline-gnu-perl/eg/ptksh+
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/bin/perl -w
+ #
+ # $Id: ptksh+,v 1.5 1997/04/01 17:15:34 ach Exp ach $
+ #
Added: trunk/libterm-readline-gnu-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/trunk/libterm-readline-gnu-perl/debian/patches/series?rev=14761&op=file
==============================================================================
--- trunk/libterm-readline-gnu-perl/debian/patches/series (added)
+++ trunk/libterm-readline-gnu-perl/debian/patches/series Mon Feb 11 13:38:06 2008
@@ -1,0 +1,4 @@
+fix_shebang.patch
+10term.patch
+20new.patch
+30outstream.patch
Modified: trunk/libterm-readline-gnu-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libterm-readline-gnu-perl/debian/rules?rev=14761&op=diff
==============================================================================
--- trunk/libterm-readline-gnu-perl/debian/rules (original)
+++ trunk/libterm-readline-gnu-perl/debian/rules Mon Feb 11 13:38:06 2008
@@ -2,64 +2,49 @@
#-*- makefile -*-
#export DH_VERBOSE=1
+export PERL_MM_USE_DEFAULT=1
-PACKAGE=$(shell dh_listpackages)
+include /usr/share/quilt/quilt.make
-include /usr/share/dpatch/dpatch.make
+PERL ?= /usr/bin/perl
+PACKAGE = $(shell dh_listpackages)
+TMP = $(CURDIR)/debian/$(PACKAGE)
+DOCDIR = $(TMP)/usr/share/doc/$(PACKAGE)
-ifndef PERL
-PERL = /usr/bin/perl
+CFLAGS = -Wall -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
endif
-ifndef DESTDIR
-DESTDIR=..
-endif
-
-TMP = $(CURDIR)/debian/$(PACKAGE)
-DOCDIR = $(TMP)/usr/share/doc/libterm-readline-gnu-perl
-
-OPTIMIZE = -O2 -Wall
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-OPTIMIZE += -g
-endif
+build: build-stamp
+build-stamp: $(QUILT_STAMPFN)
+ dh_testdir
+ $(PERL) Makefile.PL INSTALLDIRS=vendor
+ $(MAKE) OPTIMIZE="$(CGLAGS)" LD_RUN_PATH="" \
+ LDLOADLIBS="-lreadline -lncurses -lc"
+ $(MAKE) test
+ touch $@
clean: clean-patched unpatch
-
clean-patched:
dh_testdir
dh_testroot
- rm -f build-stamp
+ dh_clean build-stamp install-stamp
[ ! -f Makefile ] || $(MAKE) realclean
- dh_clean
-build: patch build-stamp
-build-stamp:
- dh_testdir
-
- $(PERL) Makefile.PL INSTALLDIRS=vendor
- $(MAKE) all LDLOADLIBS="-lreadline -lncurses -lc" LD_RUN_PATH="" OPTIMIZE="$(OPTIMIZE)"
- touch build-stamp
-
-
-install:
+install: install-stamp
+install-stamp: build-stamp
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
-
- $(MAKE) install PREFIX=$(TMP)/usr
-
- find $(TMP) \( -name '*.pm' -o -name '*.pl' \) -print0 | xargs --null --no-run-if-empty \
- $(PERL) -i -pe '$$_ = "#!/usr/bin/perl$$1\n" if m|^#!.*/perl(.*)$$|;'
-
- install -d $(DOCDIR)/examples
- cp -ra eg/* $(DOCDIR)/examples
- chmod a-x $(DOCDIR)/examples/*
- find $(DOCDIR)/examples -type f -print0 | xargs --null --no-run-if-empty \
- $(PERL) -i -pe '$$_ = "#!/usr/bin/perl$$1\n" if m|^#!.*/perl(.*)$$|;'
- -gzip -9rf $(DOCDIR)/examples
- [ ! -d $(TMP)/usr/share/perl5 ] || rmdir --ignore-fail-on-non-empty --parents $(TMP)/usr/share/perl5
-
+ $(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+ [ ! -d $(TMP)/usr/share/perl5 ] || \
+ rmdir --ignore-fail-on-non-empty --parents \
+ $(TMP)/usr/share/perl5
+ touch $@
# Build architecture-independent files here.
binary-indep: build install
@@ -69,19 +54,19 @@
binary-arch: build install
dh_testdir
dh_testroot
+ dh_installexamples eg/*
+ chmod a-x $(DOCDIR)/examples/*
dh_installdocs README
- dh_installman
- dh_installchangelogs
- dh_link
+ dh_installchangelogs
+ dh_shlibdeps
dh_strip
+ dh_perl
dh_compress
dh_fixperms
dh_installdeb
- dh_perl
- dh_shlibdeps
dh_gencontrol
dh_md5sums
- dh_builddeb --destdir=$(DESTDIR)
+ dh_builddeb
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary
Modified: trunk/libterm-readline-gnu-perl/debian/watch
URL: http://svn.debian.org/wsvn/trunk/libterm-readline-gnu-perl/debian/watch?rev=14761&op=diff
==============================================================================
--- trunk/libterm-readline-gnu-perl/debian/watch (original)
+++ trunk/libterm-readline-gnu-perl/debian/watch Mon Feb 11 13:38:06 2008
@@ -1,6 +1,3 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# Site Directory Pattern Version Script
-version=2
-http://www.cpan.org/modules/by-module/Term/Term-ReadLine-Gnu-(\d.*)\.tar\.gz debian uupdate
+version=3
+http://search.cpan.org/dist/Term-ReadLine-Gnu/ \
+ .*/Term-ReadLine-Gnu-v?(\d.*)\.tar\.gz
More information about the Pkg-perl-cvs-commits
mailing list