r21981 - in /trunk/liblingua-ispell-perl: README debian/changelog debian/control debian/patches/ debian/patches/path.patch debian/patches/series debian/rules lib/Lingua/Ispell.pm spellcheck test.pl
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Fri Jun 20 17:16:44 UTC 2008
Author: gregoa
Date: Fri Jun 20 17:16:44 2008
New Revision: 21981
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=21981
Log:
* Split out the changes that fix the path issue into a proper patch; add
quilt framework.
* Refresh debian/rules, no functional changes, except: enable test suite.
Added:
trunk/liblingua-ispell-perl/debian/patches/
trunk/liblingua-ispell-perl/debian/patches/path.patch
trunk/liblingua-ispell-perl/debian/patches/series
Modified:
trunk/liblingua-ispell-perl/README
trunk/liblingua-ispell-perl/debian/changelog
trunk/liblingua-ispell-perl/debian/control
trunk/liblingua-ispell-perl/debian/rules
trunk/liblingua-ispell-perl/lib/Lingua/Ispell.pm
trunk/liblingua-ispell-perl/spellcheck
trunk/liblingua-ispell-perl/test.pl
Modified: trunk/liblingua-ispell-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblingua-ispell-perl/README?rev=21981&op=diff
==============================================================================
--- trunk/liblingua-ispell-perl/README (original)
+++ trunk/liblingua-ispell-perl/README Fri Jun 20 17:16:44 2008
@@ -161,7 +161,7 @@
The full location of the ispell executable is stored in the
variable $Lingua::Ispell::path. The default value is
- /usr/bin/ispell. If your ispell executable has some
+ /usr/local/bin/ispell. If your ispell executable has some
name other than this, then you must set
$Lingua::Ispell::path accordingly before you call
Lingua::Ispell::spellcheck() (or any other function in the
@@ -263,7 +263,7 @@
Dictionary names are actually file names, and are searched
for according to the following rule: if the name does not
contain a slash, it is looked for in the directory
- containing the default dictionary, typically /usr/lib.
+ containing the default dictionary, typically /usr/local/lib.
Otherwise, it is used as is: if it does not begin with a
slash, it is construed from the current directory.
Modified: trunk/liblingua-ispell-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblingua-ispell-perl/debian/changelog?rev=21981&op=diff
==============================================================================
--- trunk/liblingua-ispell-perl/debian/changelog (original)
+++ trunk/liblingua-ispell-perl/debian/changelog Fri Jun 20 17:16:44 2008
@@ -11,6 +11,9 @@
- remove deletion of .packlist, not created anymore
* debian/rules: delete /usr/lib/perl5 only if it exists.
* debian/watch: use dist-based URL.
+ * Split out the changes that fix the path issue into a proper patch; add
+ quilt framework.
+ * Refresh debian/rules, no functional changes, except: enable test suite.
-- gregor herrmann <gregor+debian at comodo.priv.at> Tue, 09 Oct 2007 22:29:58 +0200
Modified: trunk/liblingua-ispell-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblingua-ispell-perl/debian/control?rev=21981&op=diff
==============================================================================
--- trunk/liblingua-ispell-perl/debian/control (original)
+++ trunk/liblingua-ispell-perl/debian/control Fri Jun 20 17:16:44 2008
@@ -2,7 +2,7 @@
Section: perl
Priority: optional
Build-Depends-Indep: perl (>= 5.6.0-16)
-Build-Depends: debhelper (>= 5.0.0)
+Build-Depends: debhelper (>= 5.0.0), quilt (>= 0.40)
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Gunnar Wolf <gwolf at debian.org>
Standards-Version: 3.7.2
Added: trunk/liblingua-ispell-perl/debian/patches/path.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblingua-ispell-perl/debian/patches/path.patch?rev=21981&op=file
==============================================================================
--- trunk/liblingua-ispell-perl/debian/patches/path.patch (added)
+++ trunk/liblingua-ispell-perl/debian/patches/path.patch Fri Jun 20 17:16:44 2008
@@ -1,0 +1,69 @@
+Author: Brian M. Almeida <bma at debian.org>
+Description: Looks for ispell in /usr/bin now and changed she-bang to /usr/bin/perl,
+Bugs: #68577
+
+--- liblingua-ispell-perl-0.07.orig/README
++++ liblingua-ispell-perl-0.07/README
+@@ -161,7 +161,7 @@
+
+ The full location of the ispell executable is stored in the
+ variable $Lingua::Ispell::path. The default value is
+- /usr/local/bin/ispell. If your ispell executable has some
++ /usr/bin/ispell. If your ispell executable has some
+ name other than this, then you must set
+ $Lingua::Ispell::path accordingly before you call
+ Lingua::Ispell::spellcheck() (or any other function in the
+@@ -263,7 +263,7 @@
+ Dictionary names are actually file names, and are searched
+ for according to the following rule: if the name does not
+ contain a slash, it is looked for in the directory
+- containing the default dictionary, typically /usr/local/lib.
++ containing the default dictionary, typically /usr/lib.
+ Otherwise, it is used as is: if it does not begin with a
+ slash, it is construed from the current directory.
+
+--- liblingua-ispell-perl-0.07.orig/lib/Lingua/Ispell.pm
++++ liblingua-ispell-perl-0.07/lib/Lingua/Ispell.pm
+@@ -173,7 +173,7 @@
+
+ The full location of the ispell executable is stored
+ in the variable C<$Lingua::Ispell::path>. The default
+-value is F</usr/local/bin/ispell>.
++value is F</usr/bin/ispell>.
+ If your ispell executable has some name other than
+ this, then you must set C<$Lingua::Ispell::path> accordingly
+ before you call C<Lingua::Ispell::spellcheck()> (or any other function
+@@ -197,7 +197,7 @@
+ }
+ }
+
+- $Lingua::Ispell::path ||= '/usr/local/bin/ispell';
++ $Lingua::Ispell::path ||= '/usr/bin/ispell';
+
+ $Lingua::Ispell::pid = undef; # so that it's still undef if open2 fails.
+ $Lingua::Ispell::pid = open2( # if open2 fails, it throws, but doesn't return.
+@@ -499,7 +499,7 @@
+ names, and are searched for according to the
+ following rule: if the name does not contain a slash,
+ it is looked for in the directory containing the
+-default dictionary, typically /usr/local/lib.
++default dictionary, typically /usr/lib.
+ Otherwise, it is used as is: if it does not begin
+ with a slash, it is construed from the current
+ directory.
+--- liblingua-ispell-perl-0.07.orig/spellcheck
++++ liblingua-ispell-perl-0.07/spellcheck
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/bin/perl -w
+
+ $| = 1;
+
+--- liblingua-ispell-perl-0.07.orig/test.pl
++++ liblingua-ispell-perl-0.07/test.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/bin/perl -w
+ # Before `make install' is performed this script should be runnable with
+ # `make test'. After `make install' it should work as `perl test.pl'
+
Added: trunk/liblingua-ispell-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblingua-ispell-perl/debian/patches/series?rev=21981&op=file
==============================================================================
--- trunk/liblingua-ispell-perl/debian/patches/series (added)
+++ trunk/liblingua-ispell-perl/debian/patches/series Fri Jun 20 17:16:44 2008
@@ -1,0 +1,1 @@
+path.patch
Modified: trunk/liblingua-ispell-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblingua-ispell-perl/debian/rules?rev=21981&op=diff
==============================================================================
--- trunk/liblingua-ispell-perl/debian/rules (original)
+++ trunk/liblingua-ispell-perl/debian/rules Fri Jun 20 17:16:44 2008
@@ -1,72 +1,60 @@
#!/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
-ifndef PERL
-PERL = /usr/bin/perl
-endif
+# 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
-TMP = $(CURDIR)/debian/liblingua-ispell-perl
-archlib =`$(PERL) -MConfig -e 'print $$Config{installarchlib}'`
+include /usr/share/quilt/quilt.make
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # Add here commands to configure the package.
-
- touch configure-stamp
+PERL ?= /usr/bin/perl
+PACKAGE = $(shell dh_listpackages)
+TMP = $(CURDIR)/debian/$(PACKAGE)
build: build-stamp
-build-stamp: configure-stamp
+build-stamp: $(QUILT_STAMPFN)
dh_testdir
-
- # Add here commands to compile the package.
$(PERL) Makefile.PL INSTALLDIRS=vendor
$(MAKE)
+ $(MAKE) test
+ touch $@
- touch build-stamp
-
-clean:
+clean: unpatch
dh_testdir
dh_testroot
- rm -f build-stamp configure-stamp
+ dh_clean build-stamp install-stamp
+ [ ! -f Makefile ] || $(MAKE) realclean
- # Add here commands to clean up after the build process.
- if [ -e Makefile ]; then $(MAKE) distclean; fi
-
- dh_clean
-
-install: build
+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 $@
- # Add here commands to install the package into debian/liblingua-ispell-perl
- $(MAKE) install PREFIX=$(TMP)/usr
+binary-arch:
+# We have nothing to do here for an architecture-independent package
- [ ! -d $(TMP)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/lib/perl5
-
-# Build architecture-dependent files here.
-binary-arch: build install
-# We have nothing to do by default.
-
-# Build architecture-independent files here.
binary-indep: build install
dh_testdir
dh_testroot
+ dh_installexamples spellcheck
dh_installdocs
- dh_installman
dh_installchangelogs Changes
- dh_installexamples spellcheck
dh_perl
dh_compress
dh_fixperms
dh_installdeb
- dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
Modified: trunk/liblingua-ispell-perl/lib/Lingua/Ispell.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblingua-ispell-perl/lib/Lingua/Ispell.pm?rev=21981&op=diff
==============================================================================
--- trunk/liblingua-ispell-perl/lib/Lingua/Ispell.pm (original)
+++ trunk/liblingua-ispell-perl/lib/Lingua/Ispell.pm Fri Jun 20 17:16:44 2008
@@ -173,7 +173,7 @@
The full location of the ispell executable is stored
in the variable C<$Lingua::Ispell::path>. The default
-value is F</usr/bin/ispell>.
+value is F</usr/local/bin/ispell>.
If your ispell executable has some name other than
this, then you must set C<$Lingua::Ispell::path> accordingly
before you call C<Lingua::Ispell::spellcheck()> (or any other function
@@ -197,7 +197,7 @@
}
}
- $Lingua::Ispell::path ||= '/usr/bin/ispell';
+ $Lingua::Ispell::path ||= '/usr/local/bin/ispell';
$Lingua::Ispell::pid = undef; # so that it's still undef if open2 fails.
$Lingua::Ispell::pid = open2( # if open2 fails, it throws, but doesn't return.
@@ -499,7 +499,7 @@
names, and are searched for according to the
following rule: if the name does not contain a slash,
it is looked for in the directory containing the
-default dictionary, typically /usr/lib.
+default dictionary, typically /usr/local/lib.
Otherwise, it is used as is: if it does not begin
with a slash, it is construed from the current
directory.
Modified: trunk/liblingua-ispell-perl/spellcheck
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblingua-ispell-perl/spellcheck?rev=21981&op=diff
==============================================================================
--- trunk/liblingua-ispell-perl/spellcheck (original)
+++ trunk/liblingua-ispell-perl/spellcheck Fri Jun 20 17:16:44 2008
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/local/bin/perl -w
$| = 1;
Modified: trunk/liblingua-ispell-perl/test.pl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblingua-ispell-perl/test.pl?rev=21981&op=diff
==============================================================================
--- trunk/liblingua-ispell-perl/test.pl (original)
+++ trunk/liblingua-ispell-perl/test.pl Fri Jun 20 17:16:44 2008
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/local/bin/perl -w
# Before `make install' is performed this script should be runnable with
# `make test'. After `make install' it should work as `perl test.pl'
More information about the Pkg-perl-cvs-commits
mailing list