r21533 - in /trunk/perlindex/debian: changelog control patches/00list patches/conffile.dpatch patches/conffile.patch patches/series patches/testsuite.dpatch patches/testsuite.patch rules watch
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Sun Jun 15 15:52:20 UTC 2008
Author: gregoa
Date: Sun Jun 15 15:52:19 2008
New Revision: 21533
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=21533
Log:
takeover
Added:
trunk/perlindex/debian/patches/conffile.patch
trunk/perlindex/debian/patches/series
trunk/perlindex/debian/patches/testsuite.patch
Removed:
trunk/perlindex/debian/patches/00list
trunk/perlindex/debian/patches/conffile.dpatch
trunk/perlindex/debian/patches/testsuite.dpatch
Modified:
trunk/perlindex/debian/changelog
trunk/perlindex/debian/control
trunk/perlindex/debian/rules
trunk/perlindex/debian/watch
Modified: trunk/perlindex/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/perlindex/debian/changelog?rev=21533&op=diff
==============================================================================
--- trunk/perlindex/debian/changelog (original)
+++ trunk/perlindex/debian/changelog Sun Jun 15 15:52:19 2008
@@ -1,3 +1,18 @@
+perlindex (1.502-2.2) UNRELEASED; urgency=low
+
+ * Take over for the Debian Perl Group with maintainer's permission (cf.
+ http://lists.debian.org/debian-perl/2008/06/msg00039.htm)
+ * debian/control: Added: Vcs-Svn field (source stanza); Vcs-Browser
+ field (source stanza); Homepage field (source stanza). Changed:
+ Maintainer set to Debian Perl Group <pkg-perl-
+ maintainers at lists.alioth.debian.org> (was: Florian Ragwitz
+ <rafl at debian.org>); Florian Ragwitz <rafl at debian.org> moved to
+ Uploaders.
+ * debian/watch: use dist-based URL.
+ * Change patch system from dpatch to quilt.
+
+ -- gregor herrmann <gregoa at debian.org> Sun, 15 Jun 2008 17:48:26 +0200
+
perlindex (1.502-2.1) unstable; urgency=high
* Non-maintainer upload during BSP.
Modified: trunk/perlindex/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/perlindex/debian/control?rev=21533&op=diff
==============================================================================
--- trunk/perlindex/debian/control (original)
+++ trunk/perlindex/debian/control Sun Jun 15 15:52:19 2008
@@ -1,10 +1,14 @@
Source: perlindex
Section: perl
Priority: optional
-Maintainer: Florian Ragwitz <rafl at debian.org>
-Build-Depends: debhelper (>= 5.0.0), dpatch
+Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
+Uploaders: Florian Ragwitz <rafl at debian.org>
+Build-Depends: debhelper (>= 5.0.0), quilt (>= 0.40)
Build-Depends-Indep: perl (>= 5.6.0-16)
Standards-Version: 3.7.2
+Homepage: http://search.cpan.org/dist/perlindex/
+Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/perlindex/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/perlindex/
Package: libtext-english-perl
Architecture: all
Added: trunk/perlindex/debian/patches/conffile.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/perlindex/debian/patches/conffile.patch?rev=21533&op=file
==============================================================================
--- trunk/perlindex/debian/patches/conffile.patch (added)
+++ trunk/perlindex/debian/patches/conffile.patch Sun Jun 15 15:52:19 2008
@@ -1,0 +1,66 @@
+Author: Florian Ragwitz <rafl at debian.org>
+Description: Use a config file instead of hardcoded paths to determine @perllib
+--- perlindex.orig/perlindex.PL
++++ perlindex/perlindex.PL
+@@ -82,6 +82,7 @@
+ $index_dir = $Config{'man1direxp'};
+ $index_dir =~ s:/[^/]*$::;
+ $index_dir = $ENV{'INDEXDIR'} if $ENV{'INDEXDIR'};
++$conffile = $ENV{'CONFFILE'} || '/etc/perlindex/config';
+
+ print OUT <<"EOC";
+ \$nroff = \'$Config{'nroff'}\' || \'nroff\';
+@@ -89,6 +90,7 @@
+ \$man3direxp = \'$Config{'man3direxp'}\';
+ \$IDIR = \'$index_dir\';
+ \$prefix = \'$Config{'prefix'}\';
++\$conffile = \'$conffile\';
+ EOC
+ ;
+
+@@ -139,8 +141,13 @@
+ 'verbose',
+ 'dict:i',
+ 'idir=s',
++ 'conf=s',
+ ) || die "Usage: $0 [-index] [words ...]\n";
+
++if (defined $opt_conf) {
++ $conffile = $opt_conf;
++}
++
+ if (defined $opt_idir) {
+ $IDIR = $opt_idir; # avoid to many changes below.
+ }
+@@ -180,10 +187,15 @@
+
+ require "find.pl";
+
++ open (CONFIG, "<$conffile") || die "Can't open config file $conffile: $!";
++ my @config_perllib = <CONFIG>;
++ chomp @config_perllib;
++
+ unless (@ARGV) { # breaks compatibility :-(
+ my %seen;
+ my @perllib = grep(length && -d && !$seen{$_}++,
+- @Config{qw(installprivlib installarchlib installsitelib installvendorlib installscript installsitearch)});
++ @Config{qw(installprivlib installarchlib installsitelib installvendorlib installscript installsitearch)}),
++ @config_perllib;
+
+ for $dir (@perllib) {
+ print "Scanning $dir ... \n";
+@@ -539,6 +551,14 @@
+ Generates additional information which query words have been not found
+ in the database and which words of the query are stopwords.
+
++=item B<-conf>
++
++!NO!SUBS!
++
++print OUT "Use another config than the default config ($conffile).\n";
++
++print OUT <<'!NO!SUBS!';
++
+ =back
+
+ =head1 EXAMPLE
Added: trunk/perlindex/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/perlindex/debian/patches/series?rev=21533&op=file
==============================================================================
--- trunk/perlindex/debian/patches/series (added)
+++ trunk/perlindex/debian/patches/series Sun Jun 15 15:52:19 2008
@@ -1,0 +1,2 @@
+conffile.patch
+testsuite.patch
Added: trunk/perlindex/debian/patches/testsuite.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/perlindex/debian/patches/testsuite.patch?rev=21533&op=file
==============================================================================
--- trunk/perlindex/debian/patches/testsuite.patch (added)
+++ trunk/perlindex/debian/patches/testsuite.patch Sun Jun 15 15:52:19 2008
@@ -1,0 +1,20 @@
+Author: Florian Ragwitz <rafl at debian.org>
+Description: Use the config file in the test suite
+--- perlindex.orig/t/basic.t
++++ perlindex/t/basic.t
+@@ -40,13 +40,13 @@
+
+ ok(
+ run(
+- "-Mblib ./perlindex -idir $tmp --index README MANIFEST perlindex.PL",
++ "-Mblib ./perlindex -conf debian/configfile -idir $tmp --index README MANIFEST perlindex.PL",
+ sub { print "[[$_[0]]]\n"; $_[0] =~ /MANIFEST/ }
+ )
+ );
+ ok(
+ run(
+- "-Mblib ./perlindex -idir $tmp --nomenu index",
++ "-Mblib ./perlindex -conf debian/configfile -idir $tmp --nomenu index",
+ sub { print "[[$_[0]]]\n"; $_[0] =~ /perlindex.PL/ }
+ )
+ );
Modified: trunk/perlindex/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/perlindex/debian/rules?rev=21533&op=diff
==============================================================================
--- trunk/perlindex/debian/rules (original)
+++ trunk/perlindex/debian/rules Sun Jun 15 15:52:19 2008
@@ -52,14 +52,14 @@
dh_md5sums
dh_builddeb
-patch: patch-stamp
-patch-stamp:
+patch: $(QUILT_STAMPFN)
+$(QUILT_STAMPFN):
dpatch apply-all
- touch patch-stamp
+ touch $(QUILT_STAMPFN)
unpatch:
dpatch deapply-all
- rm -rf patch-stamp debian/patched
+ rm -rf $(QUILT_STAMPFN) debian/patched
# Build architecture-dependent files here.
binary-arch: build install
Modified: trunk/perlindex/debian/watch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/perlindex/debian/watch?rev=21533&op=diff
==============================================================================
--- trunk/perlindex/debian/watch (original)
+++ trunk/perlindex/debian/watch Sun Jun 15 15:52:19 2008
@@ -1,2 +1,2 @@
-version=2
-http://search.cpan.org/CPAN/authors/id/U/UL/ULPFR/perlindex-(.*).tar.gz
+version=3
+http://search.cpan.org/dist/perlindex/ .*/perlindex-v?(\d[\d_.]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)
More information about the Pkg-perl-cvs-commits
mailing list