[SCM] Debian packaging of Geo-IP CPAN distribution branch, master, updated. debian/1.31-1-18-gc92146d
Nicholas Bamber
nicholas at periapt.co.uk
Tue Feb 7 09:26:49 UTC 2012
The following commit has been merged in the master branch:
commit c92146de6c5405b705acca20e05bb99a10070c73
Author: Nicholas Bamber <nicholas at periapt.co.uk>
Date: Tue Feb 7 09:26:31 2012 +0000
* Taking over package for Debian Perl Group as per email
http://lists.debian.org/debian-perl/2012/02/msg00024.html
* New upstream release (Closes: #656148)
* Raised standards version to 3.9.2 and compat level to 8
* Added debian/source/format file and refreshed debian/rules
diff --git a/debian/changelog b/debian/changelog
index 1d35d14..6dc7acb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libgeo-ip-perl (1.40-1) UNRELEASED; urgency=low
+
+ * Taking over package for Debian Perl Group as per email
+ http://lists.debian.org/debian-perl/2012/02/msg00024.html
+ * New upstream release (Closes: #656148)
+ * Raised standards version to 3.9.2 and compat level to 8
+ * Added debian/source/format file and refreshed debian/rules
+
+ -- Nicholas Bamber <nicholas at periapt.co.uk> Mon, 06 Feb 2012 16:06:00 +0000
+
libgeo-ip-perl (1.38-1) unstable; urgency=low
* New Upstream Version.
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+8
diff --git a/debian/control b/debian/control
index ac11291..f0a1184 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,17 @@
Source: libgeo-ip-perl
-Maintainer: Nikita V. Youshchenko <yoush at debian.org>
-Priority: optional
Section: perl
-Standards-Version: 3.8.2
-Build-Depends: debhelper (>= 5), perl (>= 5.6.0-16), libgeoip-dev (>= 1.4.5), geoip-database
+Priority: optional
+Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
+Uploaders: Nicholas Bamber <nicholas at periapt.co.uk>
+Build-Depends: debhelper (>= 8), geoip-database, libgeoip-dev (>= 1.4.5), perl
+Standards-Version: 3.9.2
+Homepage: http://search.cpan.org/dist/Geo-IP/
+Vcs-Git: git://git.debian.org/pkg-perl/packages/libgeo-ip-perl.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/libgeo-ip-perl.git
Package: libgeo-ip-perl
-Priority: optional
Architecture: any
-Depends: ${perl:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
Description: Perl bindings for GeoIP library
Geo::IP is a Perl external module which provides an interface to
GeoIP library.
diff --git a/debian/copyright b/debian/copyright
index 3db4f89..753b194 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,25 +1,36 @@
-This is Debian GNU/Linux's prepackaged version of Geo::IP
-(renamed to be libgeo-ip-perl), the Perl bindings to GeoIP library.
-
-Geo::IP is available in CPAN. Visit http://www.perl.com/CPAN/
-to find a CPAN site near you.
-
-Debian package was created by Nikita Youshchenko <yoush at debian.org> on
-Mar 2, 2007.
-
-
-The Geo::IP copyright is:
-
-Copyright (c) 2005, MaxMind LLC
-
-All rights reserved. This package is free software; you can redistribute it
-and/or modify it under the same terms as Perl itself.
-
-MaxMind site is at http://www.maxmind.com/.
-
-
-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'.
-
+Format-Specification: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=markup&pathrev=135
+Maintainer: unknown
+Source: http://search.cpan.org/dist/Geo-IP/
+Name: Geo-IP
+
+Files: *
+Copyright: 2004-2011, MaxMind LLC <support at maxmind.com>
+License: Artistic or GPL-1+
+
+Files: debian/*
+Copyright:
+ 2007-2009, Nikita V. Youshchenko <yoush at debian.org>
+ 2012, Nicholas Bamber <nicholas at periapt.co.uk>
+License: Artistic or GPL-1+
+
+Files: ppport.h
+Copyright: 2004-2010, Marcus Holland-Moritz <mhx-cpan at gmx.net>
+ 2001, Paul Marquess <pmqs at cpan.org> (Version 2.x)
+ 1999, Kenneth Albanowski <kjahds at kjahds.com> (Version 1.x)
+License: Artistic or GPL-1+
+
+License: Artistic
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the Artistic License, which comes with Perl.
+ .
+ On Debian systems, the complete text of the Artistic License can be
+ found in `/usr/share/common-licenses/Artistic'.
+
+License: GPL-1+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 1, or (at your option)
+ any later version.
+ .
+ On Debian systems, the complete text of version 1 of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-1'.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5299247
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+spelling.patch
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
new file mode 100644
index 0000000..d50295d
--- /dev/null
+++ b/debian/patches/spelling.patch
@@ -0,0 +1,43 @@
+Author: Nicholas Bamber <nicholas at periapt.co.uk>
+Subject: Spelling
+Forwarded: no
+Last-Update: 2012-02-06
+--- a/lib/Geo/IP.pm
++++ b/lib/Geo/IP.pm
+@@ -5748,11 +5748,11 @@
+
+ Returns a Geo::IP::Record object containing city location for a hostname.
+
+-=item $org = $gi->org_by_addr( $ipaddr ); B<depreciated> use C<name_by_addr> instead.
++=item $org = $gi->org_by_addr( $ipaddr ); B<deprecated> use C<name_by_addr> instead.
+
+ Returns the Organization, ISP name or Domain Name for an IP address.
+
+-=item $org = $gi->org_by_name( $hostname ); B<depreciated> use C<name_by_name> instead.
++=item $org = $gi->org_by_name( $hostname ); B<deprecated> use C<name_by_name> instead.
+
+ Returns the Organization, ISP name or Domain Name for a hostname.
+
+@@ -5790,7 +5790,7 @@
+
+ =item my ( $from, $to ) = $gi->range_by_ip('24.24.24.24');
+
+-Returns the start and end of the current network block. The method tries to join several continous netblocks.
++Returns the start and end of the current network block. The method tries to join several continuous netblocks.
+
+ =item $api = $gi->api or $api = Geo::IP->api
+
+@@ -5881,11 +5881,11 @@
+
+ Returns the Organization, ISP name or Domain Name for a hostname.
+
+-=item org_by_addr_v6 B<depreciated> use C<name_by_addr_v6>
++=item org_by_addr_v6 B<deprecated> use C<name_by_addr_v6>
+
+ Returns the Organization, ISP name or Domain Name for an IPv6 address.
+
+-=item org_by_name_v6 B<depreciated> use C<name_by_name_v6>
++=item org_by_name_v6 B<deprecated> use C<name_by_name_v6>
+
+ Returns the Organization, ISP name or Domain Name for a hostname.
+
diff --git a/debian/rules b/debian/rules
index 1a00826..2d33f6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,73 +1,4 @@
#!/usr/bin/make -f
-PERL ?= /usr/bin/perl
-
-CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-CFLAGS += -O0
-else
-CFLAGS += -O2
-endif
-
-d := $(shell pwd)/debian/libgeo-ip-perl
-
-arrange: arrange-stamp
-arrange-stamp: install
- dh_testdir
- touch arrange-stamp
-
-config: config-stamp
-config-stamp:
- dh_testdir
- $(PERL) Makefile.PL INSTALLDIRS=vendor
- touch config-stamp
-
-build: build-stamp
-build-stamp: config
- dh_testdir
- $(MAKE) OPTIMIZE="$(CFLAGS)"
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
- $(MAKE) test || true
-endif
- touch build-stamp
-
-install: install-stamp
-install-stamp: build
- dh_testdir
- $(MAKE) install PREFIX=$(d)/usr
- touch install-stamp
-
-binary: binary-stamp
-binary-stamp: binary-indep binary-arch
- dh_testdir
- touch binary-stamp
-
-binary-arch: binary-arch-stamp
-binary-arch-stamp: arrange
- dh_testdir
- dh_testroot
- dh_installdocs README
- dh_installchangelogs Changes
- dh_compress
- dh_fixperms
- dh_strip
- dh_installdeb
- dh_perl
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
- touch binary-arch-stamp
-
-binary-indep: binary-indep-stamp
-binary-indep-stamp: arrange
- dh_testdir
- touch binary-indep-stamp
-
-clean:
- dh_testdir
- dh_testroot
- if [ -e Makefile ]; then $(MAKE) -i distclean; fi
- dh_clean arrange-stamp binary-stamp binary-arch-stamp binary-indep-stamp build-stamp config-stamp install-stamp `find -name '*.bak'`
-
-.PHONY: arrange binary binary-arch binary-indep build clean config install
+%:
+ dh $@
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..7210c5a
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,3 @@
+# Debian Perl Group policy is that the copyright format be kept at
+# this version until the standard is finalized.
+libgeo-ip-perl source: out-of-date-copyright-format-uri http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=markup&pathrev=135
--
Debian packaging of Geo-IP CPAN distribution
More information about the Pkg-perl-cvs-commits
mailing list