[SCM] Packaging of Domain::PublicSuffix in Debian branch, master, updated. debian/0.05-1-4-g4213bce

[Daniel Kahn Gillmor]

The following commit has been merged in the master branch:
commit f740a725ea9ef5324c6824445c3d0bcd038f03b2
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Sun Aug 5 16:29:25 2012 -0400

    update debian packaging after 0.06 import

diff --git a/debian/changelog b/debian/changelog
index 9c25b65..de483b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdomain-publicsuffix-perl (0.06-1) unstable; urgency=low
+
+  * New upstream release.
+  * Dropped all patches (incorporated upstream).
+
+ -- Daniel Kahn Gillmor <dkg at fifthhorseman.net>  Sun, 05 Aug 2012 16:28:41 -0400
+
 libdomain-publicsuffix-perl (0.05-1) unstable; urgency=low
 
   * Initial Release. (Closes: #683948)
diff --git a/debian/copyright b/debian/copyright
index 4d9bb6d..d7f7748 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -18,7 +18,6 @@ Copyright: 2010-2012 Daniel Veditz,
    Ruben Arakelyan,
    Simone Carletti
 License: MPL-2.0
-Comment: the notes in Default.pm for 0.05 are out-of-date/incorrect with respect to the latest version; this will updated upstream in 0.06
 
 Files: debian/*
 Copyright: 2012, Daniel Kahn Gillmor <dkg at fifthhorseman.net>
diff --git a/debian/patches/add-usr-share-publicsuffix.patch b/debian/patches/add-usr-share-publicsuffix.patch
deleted file mode 100644
index 851cdb1..0000000
--- a/debian/patches/add-usr-share-publicsuffix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/lib/Domain/PublicSuffix.pm b/lib/Domain/PublicSuffix.pm
-index 25d7f39..904c290 100755
---- a/lib/Domain/PublicSuffix.pm
-+++ b/lib/Domain/PublicSuffix.pm
-@@ -45,7 +45,7 @@ The Mozilla PublicSuffix file is an open source, fully documented format that
- shows absolute root TLDs, primarily for Mozilla's browser products to be able
- to determine how far a cookie's security boundaries go.
- 
--This module will attempt to search etc directories in /usr, /usr/local, and
-+This module will attempt to search etc directories in /usr/share/publicsuffix, /usr, /usr/local, and
- /opt/local for the effective_tld_names.dat file. If a file is not found, a
- default file is loaded from Domain::PublicSuffix::Default, which is current at
- the time of the module's release. You can override the data file path by
-@@ -237,6 +237,7 @@ sub _parse_data_file {
- 		
- 	} else {
- 		my @paths = (
-+			File::Spec->catdir(File::Spec->rootdir, qw/ usr share publicsuffix /),
- 			File::Spec->catdir(File::Spec->rootdir, qw/ etc /),
- 			File::Spec->catdir(File::Spec->rootdir, qw/ usr etc /),
- 			File::Spec->catdir(File::Spec->rootdir, qw/ usr local etc /),
-@@ -409,4 +410,4 @@ under the same terms as Perl itself.
- 
- =cut
- 
--1;
-\ No newline at end of file
-+1;
diff --git a/debian/patches/document-get-root-domain.patch b/debian/patches/document-get-root-domain.patch
deleted file mode 100644
index d52bc99..0000000
--- a/debian/patches/document-get-root-domain.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff --git a/bin/get_root_domain b/bin/get_root_domain
-index e62e51c..ee2c0c1 100755
---- a/bin/get_root_domain
-+++ b/bin/get_root_domain
-@@ -4,6 +4,47 @@ use warnings;
- 
- use Domain::PublicSuffix;
- 
-+=head1 NAME
-+
-+get_root_domain - Parse a domain down to root
-+
-+=head1 SYNOPSIS
-+
-+$ get_root_domain foo.bar.example.org.uk
-+      Domain: foo.bar.example.org.uk
-+ Root Domain: example.org.uk
-+      Suffix: org.uk
-+         TLD: uk
-+$
-+
-+=head1 DESCRIPTION
-+
-+Displays the root domain, the public suffix, and literal TLD of a given domain.
-+
-+=head1 RETURN VALUES
-+
-+Returns 0 if a successful lookup is done, non-zero otherwise.
-+
-+=head1 SEE ALSO
-+
-+Domain::PublicSuffix(3pm), L<http://publicsuffix.org/>
-+
-+=head1 BUGS
-+
-+Please report any bugs or feature requests to C<bug-domain-publicsuffix at rt.cpan.org>,
-+or through the web interface at L<http://rt.cpan.org/NoAuth/ReportBug.html?Queue=Domain-PublicSuffix>.
-+I will be notified, and then you'll automatically be notified of progress on
-+your bug as I make changes.
-+
-+=head1 COPYRIGHT & LICENSE
-+
-+Copyright 2008-12 Nicholas Melnick, C<nick at abstractwankery.com>.
-+
-+This program is free software; you can redistribute it and/or modify it
-+under the same terms as Perl itself.
-+
-+=cut
-+
- my $domain_name = shift(@ARGV);
- usage('Requires a domain name to continue.') unless ( defined $domain_name );
- 
-@@ -14,6 +55,7 @@ my $root_domain = $suffix->get_root_domain($domain_name);
- 
- if ( defined $suffix->error ) {
-     printf( "%12s: %s\n", 'Error',       $suffix->error );
-+    exit(1);
- } else {
-     printf( "%12s: %s\n", 'Root Domain', $root_domain );
-     printf( "%12s: %s\n", 'Suffix',      $suffix->suffix );
-@@ -26,7 +68,7 @@ sub usage {
- 	print "get_root_domain - Domain::PublicSuffix " . $Domain::PublicSuffix::VERSION . "\n";
- 	print "Usage: get_root_domain <domainname>\n";
- 	
--	exit(0);
-+	exit(1);
- }
- 
- 1;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 9ac1efc..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-add-usr-share-publicsuffix.patch
-document-get-root-domain.patch

-- 
Packaging of Domain::PublicSuffix in Debian