[liburi-find-perl] 05/09: Imported Debian patch 20090319-1

gregor herrmann gregoa at debian.org
Sat Jul 25 17:30:50 UTC 2015


This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository liburi-find-perl.

commit 596f2856abf78b59ef960e848b644aa1e816bd03
Merge: d80576f ee75fc9
Author: Dominic Hargreaves <dom at earth.li>
Date:   Sun Jun 21 18:41:45 2009 +0100

    Imported Debian patch 20090319-1

 Build.PL                   |  38 +++++++
 Changes                    |  58 ++++++++--
 INSTALL                    |  24 +++-
 MANIFEST                   |  18 +--
 MANIFEST.SKIP              |  37 ++++++-
 META.yml                   |  42 +++++--
 Makefile.PL                |  47 --------
 README                     |  87 ++++++++++++---
 SIGNATURE                  |  38 +++++++
 TODO                       |   6 +-
 debian/changelog           |  10 ++
 debian/compat              |   2 +-
 debian/control             |   6 +-
 debian/copyright           |   2 +-
 debian/rules               |  63 +++--------
 lib/URI/Find.pm            | 267 ++++++++++++++++++++++++++++-----------------
 lib/URI/Find/Schemeless.pm |  62 ++++++-----
 t/Find.t                   | 197 +++++++++++++--------------------
 t/filter.t                 |  39 +++++++
 t/is_schemed.t             |  17 +++
 t/load-schemeless.t        |  17 +--
 t/rfc3986_appendix_c.t     |  34 ++++++
 22 files changed, 702 insertions(+), 409 deletions(-)

diff --cc debian/changelog
index 1dd9208,0000000..a9528f3
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,79 -1,0 +1,89 @@@
++liburi-find-perl (20090319-1) unstable; urgency=low
++
++  * New upstream release
++    - Refresh debian rules file for Module::Build support
++  * Bump debhelper compat version
++  * Update Standards-Version (no changes)
++  * Fix POD error in URI::Find::Schemeless (CPAN RT #47215)
++
++ -- Dominic Hargreaves <dom at earth.li>  Sun, 21 Jun 2009 18:41:45 +0100
++
 +liburi-find-perl (0.16-2) unstable; urgency=low
 +
 +  * Fix debian/rules rmdir bug (closes: #467926)
 +  * Update Standards-Version (no changes)
 +  * Standardize debian/watch format
 +  * debian/control: add Homepage field
 +  * Fix make distclean lintian warning
 +
 + -- Dominic Hargreaves <dom at earth.li>  Sun,  2 Mar 2008 18:31:17 +0000
 +
 +liburi-find-perl (0.16-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * Update Standards-Version (no changes).
 +
 + -- Dominic Hargreaves <dom at earth.li>  Thu,  1 Sep 2005 19:29:02 +0100
 +
 +liburi-find-perl (0.15-2) unstable; urgency=low
 +
 +  * Correct error in Description.
 +
 + -- Dominic Hargreaves <dom at earth.li>  Mon,  4 Apr 2005 01:32:48 +0100
 +
 +liburi-find-perl (0.15-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * Add watch file.
 +
 + -- Dominic Hargreaves <dom at earth.li>  Sat, 26 Mar 2005 02:07:34 +0000
 +
 +liburi-find-perl (0.14-3) unstable; urgency=low
 +
 +  * Add missing dependency on liburi-perl.
 +
 + -- Dominic Hargreaves <dom at earth.li>  Mon, 15 Nov 2004 00:21:47 +0000
 +
 +liburi-find-perl (0.14-2) unstable; urgency=low
 +
 +  * Further clarify debian/copyright.
 +
 + -- Dominic Hargreaves <dom at earth.li>  Fri, 12 Nov 2004 18:36:37 +0000
 +
 +liburi-find-perl (0.14-1) unstable; urgency=low
 +
 +  * New upstream release (clarifies licence)
 +
 + -- Dominic Hargreaves <dom at earth.li>  Mon, 11 Oct 2004 22:32:31 +0100
 +
 +liburi-find-perl (0.13-5) unstable; urgency=low
 +
 +  * Clarify licence in debian/copyright.
 +
 + -- Dominic Hargreaves <dom at earth.li>  Sun, 10 Oct 2004 23:01:03 +0100
 +
 +liburi-find-perl (0.13-4) unstable; urgency=low
 +
 +  * Make linda happy.
 +
 + -- Dominic Hargreaves <dom at earth.li>  Sat,  2 Oct 2004 20:02:57 +0100
 +
 +liburi-find-perl (0.13-3) unstable; urgency=low
 +
 +  * Remove auto-generation comment in description and fix minor bug in
 +    control file
 +
 + -- Dominic Hargreaves <dom at earth.li>  Wed, 22 Sep 2004 00:25:33 +0100
 +
 +liburi-find-perl (0.13-2) unstable; urgency=low
 +
 +  * Enable test suite
 +
 + -- Dominic Hargreaves <dom at earth.li>  Tue, 21 Sep 2004 19:35:10 +0100
 +
 +liburi-find-perl (0.13-1) unstable; urgency=low
 +
 +  * Initial Release.
 +
 + -- Dominic Hargreaves <dom at earth.li>  Mon, 20 Sep 2004 00:52:54 +0100
 +
diff --cc debian/compat
index b8626c4,0000000..7ed6ff8
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 4
++5
diff --cc debian/control
index 54c1eb3,0000000..998ddca
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,18 -1,0 +1,18 @@@
 +Source: liburi-find-perl
 +Section: perl
 +Priority: optional
- Build-Depends: debhelper (>= 4.0.2)
- Build-Depends-Indep: perl (>= 5.8.0-7), liburi-perl
++Build-Depends: debhelper (>= 5)
++Build-Depends-Indep: perl (>= 5.8.0-7), liburi-perl, perl-modules (>= 5.10.0) | libmodule-build-perl (>= 0.30), libtest-simple-perl (>= 0.82)
 +Maintainer: Dominic Hargreaves <dom at earth.li>
- Standards-Version: 3.7.3
++Standards-Version: 3.8.2
 +Homepage: http://search.cpan.org/dist/URI-Find/
 +
 +Package: liburi-find-perl
 +Architecture: all
 +Depends: ${perl:Depends}, ${misc:Depends}, liburi-perl
 +Description:  Find URIs in arbitrary text
 + This module does one thing: Finds URIs and URLs in plain text.  It finds
 + them quickly and it finds them all (or what URI::URL considers a URI
 + to be.)  It only finds URIs which include a scheme (http:// or the
 + like); for something a bit less strict have a look at
 + URI::Find::Schemeless.
diff --cc debian/copyright
index f58d3a1,0000000..3c997c4
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,20 -1,0 +1,20 @@@
 +This package was debianized by Dominic Hargreaves <dom at earth.li> on
 +Mon, 20 Sep 2004 00:52:54 +0100.
 +
 +It was downloaded from CPAN <http://search.cpan.org/dist/URI-Find/>.
 +
 +The upstream author is: 
 +
 +Michael G Schwern <schwern at pobox.com> with insight from Uri Gutman,
 +Greg Bacon, Jeff Pinyan, Roderick Schertler and others.
 +
 +Currently maintained by Roderick Schertler <roderick at argon.org>.
 +
- Copyright (c) 2000 Michael G. Schwern.  All rights reserved.  This
++Copyright (c) 2000, 2009 Michael G. Schwern.  All rights reserved.  This
 +program is free software; you can redistribute it and/or modify it
 +under the same terms as Perl itself.
 +
 +Perl is distributed under your choice of the GNU General Public License or
 +the Artistic License.  On Debian GNU/Linux systems, the complete text of the
 +GNU General Public License can be found in `/usr/share/common-licenses/GPL'
 +and the Artistic Licence in `/usr/share/common-licenses/Artistic'.
diff --cc debian/rules
index 33a3655,0000000..b76425d
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,90 -1,0 +1,63 @@@
 +#!/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.
++#
++# It was later modified by Jason Kohles <email at jasonkohles.com>
++# http://www.jasonkohles.com/ to support Module::Build installed modules
 +
 +# 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
 +
- PACKAGE=$(shell dh_listpackages)
- 
- ifndef PERL
- PERL = /usr/bin/perl
- endif
- 
- TMP     =$(CURDIR)/debian/$(PACKAGE)
- 
- # Allow disabling build optimation by setting noopt in
- # $DEB_BUILD_OPTIONS
- CFLAGS = -Wall -g
- ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-         CFLAGS += -O0
- else
-         CFLAGS += -O2
- endif
++PERL   ?= /usr/bin/perl
++PACKAGE = $(shell dh_listpackages)
++TMP     = $(CURDIR)/debian/$(PACKAGE)
 +
 +build: build-stamp
 +build-stamp:
 +	dh_testdir
- 
 +	# Add commands to compile the package here
- 	$(PERL) Makefile.PL INSTALLDIRS=vendor
- 	$(MAKE) OPTIMIZE="$(CFLAGS)"
- 	
- 	touch build-stamp
++	$(PERL) Build.PL installdirs=vendor
++	$(PERL) Build
++	$(PERL) Build test
++	touch $@
 +
 +clean:
 +	dh_testdir
 +	dh_testroot
- 
- 	# Add commands to clean up after the build process here
- 	[ ! -f Makefile ] || $(MAKE) distclean
- 	
 +	dh_clean build-stamp install-stamp
++	# Add commands to clean up after the build process here
++	[ ! -f Build ] || $(PERL) Build --allow_mb_mismatch 1 distclean
 +
 +install: install-stamp
 +install-stamp: build-stamp
 +	dh_testdir
 +	dh_testroot
 +	dh_clean -k
- 
- 	$(MAKE) test
- 	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
- 	
- 	# As this is a architecture independent package, we are not supposed to install
- 	# stuff to /usr/lib. MakeMaker creates the dirs, we delete them from the deb:
- 	[ ! -d $(TMP)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/lib/perl5
- 
- 	touch install-stamp
++	# Add commands to install the package into $(TMP) here
++	$(PERL) Build install destdir=$(TMP) create_packlist=0
++	touch $@
 +
 +binary-arch:
- # We have nothing to do by default.
++# We have nothing to do here for an architecture-independent package
 +
 +binary-indep: build install
 +	dh_testdir
 +	dh_testroot
- #	dh_installcron
- #	dh_installmenu
- #	dh_installexamples
- 	dh_installdocs README
++	dh_installdocs README TODO
 +	dh_installchangelogs Changes
 +	dh_perl
- 	dh_link
- 	dh_strip
 +	dh_compress
 +	dh_fixperms
 +	dh_installdeb
 +	dh_gencontrol
 +	dh_md5sums
 +	dh_builddeb
 +
- source diff:                                                                  
- 	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
- 
 +binary: binary-indep binary-arch
- .PHONY: build clean binary-indep binary-arch binary
++.PHONY: build clean binary-indep binary-arch binary install
diff --cc lib/URI/Find/Schemeless.pm
index 65c0cb7,bf2dd9b..e6042b5
--- a/lib/URI/Find/Schemeless.pm
+++ b/lib/URI/Find/Schemeless.pm
@@@ -75,6 -73,6 +73,8 @@@ sub schemeless_uri_re 
             }x;
  }
  
++=over
++
  =item B<top_level_domain_re>
  
    my $tld_re = $self->top_level_domain_re;
@@@ -89,26 -87,34 +89,36 @@@ sub top_level_domain_re 
      @_ == 1 || __PACKAGE__->badinvo;
      my($self) = shift;
  
+     # Updated from http://www.iana.org/domains/root/db/
      my $plain = join '|', qw(
- 	aero
- 	biz
- 	com
- 	coop
- 	edu
- 	gov
- 	info
- 	int
- 	mil
- 	museum
- 	name
- 	net
- 	org
- 	pro
+         AERO
+         ARPA
+         ASIA
+         BIZ
+         CAT
+         COM
+         COOP
+         EDU
+         GOV
+         INFO
+         INT
+         JOBS
+         MIL
+         MOBI
+         MUSEUM
+         NAME
+         NET
+         ORG
+         PRO
+         TEL
+         TRAVEL
      );
  
-     return qr/(?:[a-z]{2}|$plain)/;
+     return qr/(?:[a-z]{2}|$plain)/i;
  }
  
++=back
++
  =head1 AUTHOR
  
  Original code by Roderick Schertler <roderick at argon.org>, adapted by

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/liburi-find-perl.git



More information about the Pkg-perl-cvs-commits mailing list