diff -Nru apt-mirror-0.4.8/debian/changelog apt-mirror-0.4.8/debian/changelog --- apt-mirror-0.4.8/debian/changelog 2012-01-28 14:31:14.000000000 +0100 +++ apt-mirror-0.4.8/debian/changelog 2013-05-02 22:38:36.000000000 +0200 @@ -1,3 +1,10 @@ +apt-mirror (0.4.8-5ubuntu0.1) precise-proposed; urgency=low + + * Fix regex problem: arm overrides armhf. Thanks to hawken. + (Closes: #682395, LP: #977278) + + -- Benjamin Drung Fri, 27 Jul 2012 00:51:30 +0200 + apt-mirror (0.4.8-5) unstable; urgency=low * Improve lock file handling to avoid false "apt-mirror is already running" diff -Nru apt-mirror-0.4.8/debian/control apt-mirror-0.4.8/debian/control --- apt-mirror-0.4.8/debian/control 2011-07-25 08:29:56.000000000 +0200 +++ apt-mirror-0.4.8/debian/control 2013-05-02 22:38:45.000000000 +0200 @@ -1,7 +1,8 @@ Source: apt-mirror Section: net Priority: optional -Maintainer: Brandon Holtsclaw +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Brandon Holtsclaw Uploaders: Jeremy T. Bouse , Benjamin Drung Dm-Upload-Allowed: yes diff -Nru apt-mirror-0.4.8/debian/patches/architecture-match.patch apt-mirror-0.4.8/debian/patches/architecture-match.patch --- apt-mirror-0.4.8/debian/patches/architecture-match.patch 1970-01-01 01:00:00.000000000 +0100 +++ apt-mirror-0.4.8/debian/patches/architecture-match.patch 2013-05-02 22:37:35.000000000 +0200 @@ -0,0 +1,15 @@ +Description: Fix regex problem: arm overrides armhf. +Author: hawken +Bug-Debian: http://bugs.debian.org/682395 + +--- a/apt-mirror ++++ b/apt-mirror +@@ -253,7 +253,7 @@ + next; + } + +- if($config_line =~ /deb-(alpha|amd64|armel|arm|armhf|hppa|hurd-i386|i386|ia64|kfreebsd-i386|kfreebsd-amd64|lpia|m68k|mipsel|mips|powerpc|s390|s390x|sh|sparc)/) { ++ if($config_line =~ /^deb-(alpha|amd64|armel|arm|armhf|hppa|hurd-i386|i386|ia64|kfreebsd-i386|kfreebsd-amd64|lpia|m68k|mipsel|mips|powerpc|s390|s390x|sh|sparc)$/) { + push @config_binaries, [$1, @config_line]; + next; + } diff -Nru apt-mirror-0.4.8/debian/patches/series apt-mirror-0.4.8/debian/patches/series --- apt-mirror-0.4.8/debian/patches/series 2012-01-28 14:24:19.000000000 +0100 +++ apt-mirror-0.4.8/debian/patches/series 2013-05-02 22:37:43.000000000 +0200 @@ -2,3 +2,4 @@ additional_archs.patch create_dirs.patch lock.patch +architecture-match.patch