[libgeo-ip-perl] 02/06: New upstream release: Remove/refresh patches

Axel Beckert abe at deuxchevaux.org
Sat Oct 11 01:32:52 UTC 2014


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

abe pushed a commit to branch master
in repository libgeo-ip-perl.

commit 18355aade58a60413f0f0ed549c626d75be64969
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Sat Oct 11 03:29:33 2014 +0200

    New upstream release: Remove/refresh patches
---
 debian/changelog              |  9 +++++++--
 debian/patches/no-dns.patch   | 23 -----------------------
 debian/patches/series         |  1 -
 debian/patches/spelling.patch |  8 +++++---
 4 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8048b9f..7bd54c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libgeo-ip-perl (1.43-2) UNRELEASED; urgency=medium
+libgeo-ip-perl (1.45-1) UNRELEASED; urgency=medium
 
   [ gregor herrmann ]
   * debian/control: remove Nicholas Bamber from Uploaders on request of
@@ -8,7 +8,12 @@ libgeo-ip-perl (1.43-2) UNRELEASED; urgency=medium
   [ Salvatore Bonaccorso ]
   * Update Vcs-Browser URL to cgit web frontend
 
- -- gregor herrmann <gregoa at debian.org>  Sat, 15 Feb 2014 20:26:33 +0100
+  [ Axel Beckert ]
+  * Import new upstream release
+    + Drop no-dns.patch, no more needed (test has been moved to xt/.)
+    + Refreshed remaining patch.
+
+ -- Axel Beckert <abe at debian.org>  Sat, 11 Oct 2014 03:19:41 +0200
 
 libgeo-ip-perl (1.43-1) unstable; urgency=medium
 
diff --git a/debian/patches/no-dns.patch b/debian/patches/no-dns.patch
deleted file mode 100644
index 4a8512b..0000000
--- a/debian/patches/no-dns.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: skip test that needs network access / DNS
-Origin: vendor
-Bug-Debian: http://bugs.debian.org/683904
-Forwarded: not-needed
-Author: gregor herrmann <gregoa at debian.org>
-Last-Update: 2012-08-05
-
---- a/t/2_namelookup.t
-+++ b/t/2_namelookup.t
-@@ -5,7 +5,7 @@
- 
- $^W = 1;
- 
--BEGIN { plan tests => 11 }
-+BEGIN { plan tests => 10 }
- 
- use Geo::IP;
- 
-@@ -29,4 +29,3 @@
- 194.244.83.2	IT
- 203.15.106.23	AU
- 196.31.1.1	ZA
--yahoo.com	US
diff --git a/debian/patches/series b/debian/patches/series
index b010301..5299247 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 spelling.patch
-no-dns.patch
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
index 40de1d5..7cb6e5c 100644
--- a/debian/patches/spelling.patch
+++ b/debian/patches/spelling.patch
@@ -5,9 +5,11 @@ Author: Nicholas Bamber <nicholas at periapt.co.uk>
 Reviewed-by: gregor herrmann <gregoa at debian.org>
 Last-Update: 2013-12-07
 
---- a/lib/Geo/IP.pm
-+++ b/lib/Geo/IP.pm
-@@ -5860,7 +5860,7 @@
+Index: libgeo-ip-perl/lib/Geo/IP.pm
+===================================================================
+--- libgeo-ip-perl.orig/lib/Geo/IP.pm	2014-10-11 03:23:25.401729794 +0200
++++ libgeo-ip-perl/lib/Geo/IP.pm	2014-10-11 03:23:25.401729794 +0200
+@@ -5911,7 +5911,7 @@
  
  =item my ( $from, $to ) = $gi->range_by_ip('24.24.24.24');
  

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



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