r20847 - in /trunk/libcoy-perl: debian/changelog debian/control debian/patches/ debian/patches/hashbang.patch debian/patches/series debian/rules demo/demo.pl lib/Lingua/EN/Inflect.pm
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Sat Jun 7 20:45:57 UTC 2008
Author: gregoa
Date: Sat Jun 7 20:45:57 2008
New Revision: 20847
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=20847
Log:
* Move changes to demo/demo.pl intp a quilt patch; revert changes to
lib/Lingua/EN/Inflect.pm which is removed in debian/rules anyway.
* Refresh debian/rules, no functional changes.
Added:
trunk/libcoy-perl/debian/patches/
trunk/libcoy-perl/debian/patches/hashbang.patch
trunk/libcoy-perl/debian/patches/series
Modified:
trunk/libcoy-perl/debian/changelog
trunk/libcoy-perl/debian/control
trunk/libcoy-perl/debian/rules
trunk/libcoy-perl/demo/demo.pl
trunk/libcoy-perl/lib/Lingua/EN/Inflect.pm
Modified: trunk/libcoy-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoy-perl/debian/changelog?rev=20847&op=diff
==============================================================================
--- trunk/libcoy-perl/debian/changelog (original)
+++ trunk/libcoy-perl/debian/changelog Sat Jun 7 20:45:57 2008
@@ -16,6 +16,11 @@
[ Joey Hess ]
* Remove .pm chmod code, debhelper has fixed their permissions for years.
+
+ [ gregor herrmann ]
+ * Move changes to demo/demo.pl intp a quilt patch; revert changes to
+ lib/Lingua/EN/Inflect.pm which is removed in debian/rules anyway.
+ * Refresh debian/rules, no functional changes.
-- gregor herrmann <gregor+debian at comodo.priv.at> Tue, 09 Oct 2007 22:28:21 +0200
Modified: trunk/libcoy-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoy-perl/debian/control?rev=20847&op=diff
==============================================================================
--- trunk/libcoy-perl/debian/control (original)
+++ trunk/libcoy-perl/debian/control Sat Jun 7 20:45:57 2008
@@ -1,7 +1,7 @@
Source: libcoy-perl
Section: perl
Priority: optional
-Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.9.0)
+Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.9.0), quilt (>= 0.40)
Build-Depends-Indep: perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Standards-Version: 3.7.2
Added: trunk/libcoy-perl/debian/patches/hashbang.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoy-perl/debian/patches/hashbang.patch?rev=20847&op=file
==============================================================================
--- trunk/libcoy-perl/debian/patches/hashbang.patch (added)
+++ trunk/libcoy-perl/debian/patches/hashbang.patch Sat Jun 7 20:45:57 2008
@@ -1,0 +1,8 @@
+--- libcoy-perl-0.06.orig/demo/demo.pl
++++ libcoy-perl-0.06/demo/demo.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -ws
++#!/usr/bin/perl -ws
+
+ use Coy;
+
Added: trunk/libcoy-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoy-perl/debian/patches/series?rev=20847&op=file
==============================================================================
--- trunk/libcoy-perl/debian/patches/series (added)
+++ trunk/libcoy-perl/debian/patches/series Sat Jun 7 20:45:57 2008
@@ -1,0 +1,1 @@
+hashbang.patch
Modified: trunk/libcoy-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoy-perl/debian/rules?rev=20847&op=diff
==============================================================================
--- trunk/libcoy-perl/debian/rules (original)
+++ trunk/libcoy-perl/debian/rules Sat Jun 7 20:45:57 2008
@@ -1,43 +1,61 @@
#!/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
- perl Makefile.PL INSTALLDIRS=vendor
+ $(PERL) Makefile.PL INSTALLDIRS=vendor
$(MAKE)
- touch build-stamp
+ $(MAKE) test
+ 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
- $(MAKE) install PREFIX=$(CURDIR)/debian/libcoy-perl/usr
- rm -f debian/libcoy-perl/usr/share/perl5/Lingua/EN/Inflect.pm
- [ ! -d $(CURDIR)/debian/libcoy-perl/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(CURDIR)/debian/libcoy-perl/usr/lib/perl5
+ $(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+ $(RM) $(TMP)/usr/share/perl5/Lingua/EN/Inflect.pm
+ [ ! -d $(TMP)/usr/lib/perl5 ] || \
+ rmdir --ignore-fail-on-non-empty --parents --verbose \
+ $(TMP)/usr/lib/perl5
+ touch $@
-binary-arch: build install
+binary-arch:
+# We have nothing to do here for an architecture-independent package
binary-indep: build install
dh_testdir
dh_testroot
- dh_installdocs README ToDo
dh_installexamples demo/demo.pl
+ dh_installdocs ToDo README
dh_installchangelogs Changes
- dh_installman blib/man3/*.3pm
- dh_link
+ dh_perl
dh_compress
dh_fixperms
dh_installdeb
- dh_perl
- dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
Modified: trunk/libcoy-perl/demo/demo.pl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoy-perl/demo/demo.pl?rev=20847&op=diff
==============================================================================
--- trunk/libcoy-perl/demo/demo.pl (original)
+++ trunk/libcoy-perl/demo/demo.pl Sat Jun 7 20:45:57 2008
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -ws
+#!/usr/local/bin/perl -ws
use Coy;
Modified: trunk/libcoy-perl/lib/Lingua/EN/Inflect.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoy-perl/lib/Lingua/EN/Inflect.pm?rev=20847&op=diff
==============================================================================
--- trunk/libcoy-perl/lib/Lingua/EN/Inflect.pm (original)
+++ trunk/libcoy-perl/lib/Lingua/EN/Inflect.pm Sat Jun 7 20:45:57 2008
@@ -64,6 +64,7 @@
}
return '';
}
+
# 0. PERFORM GENERAL INFLECTIONS IN A STRING
@@ -859,12 +860,12 @@
$word =~ /^(?:$PL_sb_general)$/i
and $value = $2
- and return &_PL_noun($1,2,"$1s")
+ and return _PL_noun($1,2,"$1s")
. $value;
$word =~ /^(?:$PL_sb_prep_compound)$/i
and $value = $2
- and return &_PL_noun($1,2)
+ and return _PL_noun($1,2)
. $value;
# OTHERWISE JUST ADD ...s
More information about the Pkg-perl-cvs-commits
mailing list