diff -Nru apt-mirror-0.4.6/apt-mirror apt-mirror-0.4.7/apt-mirror --- apt-mirror-0.4.6/apt-mirror 2009-05-01 06:40:20.000000000 +0100 +++ apt-mirror-0.4.7/apt-mirror 2010-04-17 22:32:54.000000000 +0100 @@ -23,7 +23,7 @@ * It can automatically remove unneeded files * It works well on overloaded channel to internet * It never produces an inconsistent mirror including while mirroring - * It works on all POSIX complied systems with perl and wget + * It works on all POSIX compliant systems with perl and wget =head1 COMMENTS @@ -237,6 +237,14 @@ print "\nEnd time: " . localtime() . "\n\n"; } +###################################################################################### +## Create the 3 needed directories if they don't exist yet +my @needed_directories = (get_variable("mirror_path"), get_variable("skel_path"), get_variable("var_path")); +foreach my $needed_directory (@needed_directories) { + unless (-d $needed_directory) { + mkdir($needed_directory) or die("apt-mirror: can't create $needed_directory directory"); + } +} ###################################################################################### ## Parse config @@ -291,6 +299,11 @@ die("Please explicitly specify 'defaultarch' in mirror.list") unless get_variable("defaultarch"); check_lock(); + +$SIG{INT} = "unlock_aptmirror"; +$SIG{HUP} = "unlock_aptmirror"; +$SIG{TERM} = "unlock_aptmirror"; + lock_aptmirror(); @@ -325,9 +338,11 @@ foreach (@components) { add_url_to_download($url . $_ . "/source/Release"); add_url_to_download($url . $_ . "/source/Sources.gz"); + add_url_to_download($url . $_ . "/source/Sources.bz2"); } } else { add_url_to_download($uri . "/$distribution/Sources.gz"); + add_url_to_download($uri . "/$distribution/Sources.bz2"); } } @@ -339,13 +354,18 @@ add_url_to_download($url . "Release"); add_url_to_download($url . "Release.gpg"); - add_url_to_download($url . "Contents-" . $arch . ".gz") if get_variable("_contents"); + if (get_variable("_contents")) { + add_url_to_download($url . "Contents-" . $arch . ".gz"); + add_url_to_download($url . "Contents-" . $arch . ".bz2"); + } foreach (@components) { add_url_to_download($url . $_ . "/binary-" . $arch . "/Release"); add_url_to_download($url . $_ . "/binary-" . $arch . "/Packages.gz"); + add_url_to_download($url . $_ . "/binary-" . $arch . "/Packages.bz2"); } } else { add_url_to_download($uri . "/$distribution/Packages.gz"); + add_url_to_download($uri . "/$distribution/Packages.bz2"); } } @@ -358,6 +378,7 @@ s[~][%7E]g if get_variable("_tilde"); $skipclean{$_} = 1; $skipclean{$_} = 1 if s[\.gz$][]; + $skipclean{$_} = 1 if s[\.bz2$][]; } ###################################################################################### @@ -536,6 +557,7 @@ die("apt-mirror: invalid url in index_urls") unless s[^(\w+)://][]; copy_file(get_variable("skel_path") . "/" . sanitise_uri("$_"), get_variable("mirror_path") . "/" . sanitise_uri("$_")); copy_file(get_variable("skel_path") . "/" . sanitise_uri("$_"), get_variable("mirror_path") . "/" . sanitise_uri("$_")) if(s/\.gz$//); + copy_file(get_variable("skel_path") . "/" . sanitise_uri("$_"), get_variable("mirror_path") . "/" . sanitise_uri("$_")) if(s/\.bz2$//); } @@ -563,14 +585,14 @@ my $dir = shift; my $is_needed = 0; return 1 if $skipclean{$dir}; - opendir(DIR, $dir) or die "apt-mirror: can't opendir $dir: $!"; - foreach (grep { !/^\.$/ && !/^\.\.$/ } readdir(DIR)) { + opendir(my $dir_h, $dir) or die "apt-mirror: can't opendir $dir: $!"; + foreach (grep { !/^\.$/ && !/^\.\.$/ } readdir($dir_h)) { my $item = $dir . "/". $_; $is_needed |= process_directory($item) if -d $item && ! -l $item; $is_needed |= process_file($item) if -f $item; $is_needed |= process_symlink($item) if -l $item; } - closedir DIR; + closedir $dir_h; push @rm_dirs, $dir unless $is_needed; return $is_needed; } diff -Nru apt-mirror-0.4.6/CHANGELOG apt-mirror-0.4.7/CHANGELOG --- apt-mirror-0.4.6/CHANGELOG 2009-05-01 05:42:54.000000000 +0100 +++ apt-mirror-0.4.7/CHANGELOG 2010-04-17 22:44:17.000000000 +0100 @@ -1,3 +1,10 @@ +0.4.7 + * Lots of typos fixed + * apt-mirror will now try to create needed directorys if they do not exist + * applied patch for closedir() errors + * added mirroring examples of multiple architectures to the debian mirror.list + * fixed manpage description of mirror.list + 0.4.6 * minor cleanup to the documentation diff -Nru apt-mirror-0.4.6/debian/changelog apt-mirror-0.4.7/debian/changelog --- apt-mirror-0.4.6/debian/changelog 2010-04-20 18:36:23.000000000 +0100 +++ apt-mirror-0.4.7/debian/changelog 2010-04-20 18:18:54.000000000 +0100 @@ -1,3 +1,25 @@ +apt-mirror (0.4.7-0ubuntu1) lucid; urgency=low + + [ Brandon Holtsclaw ] + * New Upstream Release + * all patches applied upstream and fixes the following Debian bugs + (Closes: #457714, #484876, #387595, #483100, #570629, #576141, #570632) + * Updated debian/watch file + + [ Jeremy T. Bouse ] + * Add git-buildpackage config file + * Initial run to clean existing lintian warnings + + [ Benjamin Drung ] + * Drop cdbs and switch to dh 7. + * Switch to dpkg-source 3.0 (quilt) format. + * Add missing ${perl:Depends}. + * Add myself to uploaders. + * Restructure debian/postinst. + * Set codename on compile time. + + -- Brandon Holtsclaw Tue, 20 Apr 2010 14:48:15 -0400 + apt-mirror (0.4.6-0ubuntu4) lucid; urgency=low * Add 03-clean-lock-file.patch to delete the lock file on every exit @@ -178,4 +200,3 @@ * Initial public release. -- Dmitry N. Hramtsov Sat, 27 Jul 2002 12:44:33 +0700 - diff -Nru apt-mirror-0.4.6/debian/compat apt-mirror-0.4.7/debian/compat --- apt-mirror-0.4.6/debian/compat 2010-04-20 18:36:23.000000000 +0100 +++ apt-mirror-0.4.7/debian/compat 2010-04-20 09:58:59.000000000 +0100 @@ -1 +1 @@ -5 +7 diff -Nru apt-mirror-0.4.6/debian/control apt-mirror-0.4.7/debian/control --- apt-mirror-0.4.6/debian/control 2010-04-20 18:36:23.000000000 +0100 +++ apt-mirror-0.4.7/debian/control 2010-04-20 18:23:24.000000000 +0100 @@ -1,18 +1,23 @@ Source: apt-mirror Section: net Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Brandon Holtsclaw +Maintainer: Brandon Holtsclaw +Uploaders: Jeremy T. Bouse , + Benjamin Drung Dm-Upload-Allowed: yes -Uploaders: Rudy Godoy Homepage: http://apt-mirror.sourceforge.net/ -Build-Depends: cdbs, debhelper (>= 5) -Build-Depends-Indep: lsb-release -Standards-Version: 3.8.3 +Build-Depends: debhelper (>= 7.0.50~), lsb-release +Standards-Version: 3.8.4 +Vcs-Browser: http://git.debian.org/?p=collab-maint/apt-mirror.git +Vcs-Git: git://git.debian.org/collab-maint/apt-mirror.git Package: apt-mirror Architecture: all -Depends: wget, perl, perl-modules, adduser, ${misc:Depends} +Depends: adduser, + perl-modules, + wget, + ${misc:Depends}, + ${perl:Depends} Description: APT sources mirroring tool A small and efficient tool that lets you mirror a part of or the whole Debian GNU/Linux distribution or any other apt sources. @@ -25,5 +30,4 @@ * It can automatically remove unneeded files * It works well on overloaded channel to internet * It never produces an inconsistent mirror including while mirroring - * It works on all POSIX complied systems with perl and wget - + * It works on all POSIX compliant systems with perl and wget diff -Nru apt-mirror-0.4.6/debian/copyright apt-mirror-0.4.7/debian/copyright --- apt-mirror-0.4.6/debian/copyright 2010-04-20 18:36:23.000000000 +0100 +++ apt-mirror-0.4.7/debian/copyright 2010-04-20 18:16:22.000000000 +0100 @@ -6,11 +6,11 @@ It was downloaded from http://apt-mirror.sourceforge.net/ Copyright 2005,2006,2007 Dmitry N. Hramstov -Copyright 2007 Brandon Holtsclaw +Copyright 2007,2008,2009,2010 Brandon Holtsclaw -Upstream Authors: +Upstream Authors: Dmitry N. Hramtsov - Brandon Holtsclaw + Brandon Holtsclaw License: diff -Nru apt-mirror-0.4.6/debian/Debian-mirror.list apt-mirror-0.4.7/debian/Debian-mirror.list --- apt-mirror-0.4.6/debian/Debian-mirror.list 2010-04-20 18:36:23.000000000 +0100 +++ apt-mirror-0.4.7/debian/Debian-mirror.list 2010-04-20 09:58:59.000000000 +0100 @@ -2,8 +2,6 @@ # # set base_path /var/spool/apt-mirror # -# if you change the base path you must create the directories below with write privileges -# # set mirror_path $base_path/mirror # set skel_path $base_path/skel # set var_path $base_path/var @@ -19,5 +17,18 @@ deb http://ftp.us.debian.org/debian unstable main contrib non-free deb-src http://ftp.us.debian.org/debian unstable main contrib non-free -clean http://ftp.us.debian.org/debian +# mirror additional architectures +#deb-alpha http://ftp.us.debian.org/debian unstable main contrib non-free +#deb-amd64 http://ftp.us.debian.org/debian unstable main contrib non-free +#deb-armel http://ftp.us.debian.org/debian unstable main contrib non-free +#deb-hppa http://ftp.us.debian.org/debian unstable main contrib non-free +#deb-i386 http://ftp.us.debian.org/debian unstable main contrib non-free +#deb-ia64 http://ftp.us.debian.org/debian unstable main contrib non-free +#deb-m68k http://ftp.us.debian.org/debian unstable main contrib non-free +#deb-mips http://ftp.us.debian.org/debian unstable main contrib non-free +#deb-mipsel http://ftp.us.debian.org/debian unstable main contrib non-free +#deb-powerpc http://ftp.us.debian.org/debian unstable main contrib non-free +#deb-s390 http://ftp.us.debian.org/debian unstable main contrib non-free +#deb-sparc http://ftp.us.debian.org/debian unstable main contrib non-free +clean http://ftp.us.debian.org/debian diff -Nru apt-mirror-0.4.6/debian/dirs apt-mirror-0.4.7/debian/dirs --- apt-mirror-0.4.6/debian/dirs 2010-04-20 18:36:23.000000000 +0100 +++ apt-mirror-0.4.7/debian/dirs 2010-04-20 09:58:59.000000000 +0100 @@ -1,6 +1,5 @@ etc/apt -usr/bin -var/spool/apt-mirror +usr/share/man/man1 var/spool/apt-mirror/mirror var/spool/apt-mirror/skel var/spool/apt-mirror/var diff -Nru apt-mirror-0.4.6/debian/gbp.conf apt-mirror-0.4.7/debian/gbp.conf --- apt-mirror-0.4.6/debian/gbp.conf 1970-01-01 01:00:00.000000000 +0100 +++ apt-mirror-0.4.7/debian/gbp.conf 2010-04-20 09:58:59.000000000 +0100 @@ -0,0 +1,15 @@ +[DEFAULT] +# use pristine-tar: +pristine-tar = True + +[git-buildpackage] +# run lintian against package after build +postbuild = lintian $GBP_CHANGES_FILE +# sign release tags +sign-tags = True + +[git-dch] +# parse meta tags for Closes: and Thanks: +meta = True +# use git user.email and user.name +git-author = True diff -Nru apt-mirror-0.4.6/debian/install apt-mirror-0.4.7/debian/install --- apt-mirror-0.4.6/debian/install 1970-01-01 01:00:00.000000000 +0100 +++ apt-mirror-0.4.7/debian/install 2010-04-20 09:58:59.000000000 +0100 @@ -0,0 +1 @@ +apt-mirror usr/bin diff -Nru apt-mirror-0.4.6/debian/patches/01-ubuntu-mirror-bz2.patch apt-mirror-0.4.7/debian/patches/01-ubuntu-mirror-bz2.patch --- apt-mirror-0.4.6/debian/patches/01-ubuntu-mirror-bz2.patch 2010-04-20 18:36:23.000000000 +0100 +++ apt-mirror-0.4.7/debian/patches/01-ubuntu-mirror-bz2.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,56 +0,0 @@ -Description: Should also mirror bz2 files even though they are not used -Author: Bradley M. Kuhn -Bug-Ubuntu: https://launchpad.net/bugs/184063 -Last-Update: 2009-10-16 - -diff -pruN a/apt-mirror b/apt-mirror ---- a/apt-mirror 2009-05-01 07:40:20.000000000 +0200 -+++ b/apt-mirror 2009-10-16 15:15:00.446520044 +0200 -@@ -325,9 +325,11 @@ foreach (@config_sources) { - foreach (@components) { - add_url_to_download($url . $_ . "/source/Release"); - add_url_to_download($url . $_ . "/source/Sources.gz"); -+ add_url_to_download($url . $_ . "/source/Sources.bz2"); - } - } else { - add_url_to_download($uri . "/$distribution/Sources.gz"); -+ add_url_to_download($uri . "/$distribution/Sources.bz2"); - } - } - -@@ -339,13 +341,18 @@ foreach (@config_binaries) { - - add_url_to_download($url . "Release"); - add_url_to_download($url . "Release.gpg"); -- add_url_to_download($url . "Contents-" . $arch . ".gz") if get_variable("_contents"); -+ if (get_variable("_contents")) { -+ add_url_to_download($url . "Contents-" . $arch . ".gz"); -+ add_url_to_download($url . "Contents-" . $arch . ".bz2"); -+ } - foreach (@components) { - add_url_to_download($url . $_ . "/binary-" . $arch . "/Release"); - add_url_to_download($url . $_ . "/binary-" . $arch . "/Packages.gz"); -+ add_url_to_download($url . $_ . "/binary-" . $arch . "/Packages.bz2"); - } - } else { - add_url_to_download($uri . "/$distribution/Packages.gz"); -+ add_url_to_download($uri . "/$distribution/Packages.bz2"); - } - } - -@@ -358,6 +365,7 @@ foreach (keys %urls_to_download) { - s[~][%7E]g if get_variable("_tilde"); - $skipclean{$_} = 1; - $skipclean{$_} = 1 if s[\.gz$][]; -+ $skipclean{$_} = 1 if s[\.bz2$][]; - } - - ###################################################################################### -@@ -536,6 +544,7 @@ foreach (@index_urls) { - die("apt-mirror: invalid url in index_urls") unless s[^(\w+)://][]; - copy_file(get_variable("skel_path") . "/" . sanitise_uri("$_"), get_variable("mirror_path") . "/" . sanitise_uri("$_")); - copy_file(get_variable("skel_path") . "/" . sanitise_uri("$_"), get_variable("mirror_path") . "/" . sanitise_uri("$_")) if(s/\.gz$//); -+ copy_file(get_variable("skel_path") . "/" . sanitise_uri("$_"), get_variable("mirror_path") . "/" . sanitise_uri("$_")) if(s/\.bz2$//); - } - - diff -Nru apt-mirror-0.4.6/debian/patches/02-fix-invalid-dirhandle.patch apt-mirror-0.4.7/debian/patches/02-fix-invalid-dirhandle.patch --- apt-mirror-0.4.6/debian/patches/02-fix-invalid-dirhandle.patch 2010-04-20 18:36:23.000000000 +0100 +++ apt-mirror-0.4.7/debian/patches/02-fix-invalid-dirhandle.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,26 +0,0 @@ -Description: Fix invalid dirhandle -Author: Benjamin Drung -Bug-Ubuntu: https://launchpad.net/bugs/244613 -Last-Update: 2009-10-16 - -diff -pruN a/apt-mirror b/apt-mirror ---- a/apt-mirror 2009-10-16 15:15:00.446520044 +0200 -+++ b/apt-mirror 2009-10-16 15:52:48.804499647 +0200 -@@ -572,14 +572,14 @@ sub process_directory { - my $dir = shift; - my $is_needed = 0; - return 1 if $skipclean{$dir}; -- opendir(DIR, $dir) or die "apt-mirror: can't opendir $dir: $!"; -- foreach (grep { !/^\.$/ && !/^\.\.$/ } readdir(DIR)) { -+ opendir(my $dir_h, $dir) or die "apt-mirror: can't opendir $dir: $!"; -+ foreach (grep { !/^\.$/ && !/^\.\.$/ } readdir($dir_h)) { - my $item = $dir . "/". $_; - $is_needed |= process_directory($item) if -d $item && ! -l $item; - $is_needed |= process_file($item) if -f $item; - $is_needed |= process_symlink($item) if -l $item; - } -- closedir DIR; -+ closedir $dir_h; - push @rm_dirs, $dir unless $is_needed; - return $is_needed; - } diff -Nru apt-mirror-0.4.6/debian/patches/03-clean-lock-file.patch apt-mirror-0.4.7/debian/patches/03-clean-lock-file.patch --- apt-mirror-0.4.6/debian/patches/03-clean-lock-file.patch 2010-04-20 18:36:23.000000000 +0100 +++ apt-mirror-0.4.7/debian/patches/03-clean-lock-file.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -Description: Delete lock-file on exit -Author: Benjamin Drung -Bug-Ubuntu: https://launchpad.net/bugs/424462 - ---- a/apt-mirror 2007-12-27 01:55:18 +0000 -+++ b/apt-mirror 2010-04-15 21:00:10 +0000 -@@ -291,6 +291,11 @@ - die("Please explicitly specify 'defaultarch' in mirror.list") unless get_variable("defaultarch"); - - check_lock(); -+ -+$SIG{INT} = "unlock_aptmirror"; -+$SIG{HUP} = "unlock_aptmirror"; -+$SIG{TERM} = "unlock_aptmirror"; -+ - lock_aptmirror(); - - - diff -Nru apt-mirror-0.4.6/debian/postinst apt-mirror-0.4.7/debian/postinst --- apt-mirror-0.4.6/debian/postinst 2010-04-20 18:36:23.000000000 +0100 +++ apt-mirror-0.4.7/debian/postinst 2010-04-20 09:58:59.000000000 +0100 @@ -1,19 +1,9 @@ #!/bin/sh set -e -#DEBHELPER# - -action="$1" -oldversion="$2" - -if [ "$action" != configure ] -then - exit 0 -fi - setup_aptmirror_user() { - if ! id apt-mirror > /dev/null 2>&1 ; then - adduser --quiet --system --group --no-create-home --home /var/spool/apt-mirror --shell /bin/sh apt-mirror + if ! id apt-mirror > /dev/null 2>&1; then + adduser --quiet --system --group --no-create-home --home /var/spool/apt-mirror --shell /bin/sh apt-mirror fi } @@ -23,7 +13,6 @@ chmod +x /var/spool/apt-mirror/var/clean.sh } - set_aptmirror_owner() { chown apt-mirror:apt-mirror /var/spool/apt-mirror chown apt-mirror:apt-mirror /var/spool/apt-mirror/mirror @@ -33,8 +22,10 @@ chown apt-mirror:apt-mirror /var/spool/apt-mirror/var/postmirror.sh } -setup_aptmirror_user -setup_aptmirror_clean -#setup_postmirror_script -set_aptmirror_owner +if test "$1" = "configure"; then + setup_aptmirror_user + setup_aptmirror_clean + set_aptmirror_owner +fi +#DEBHELPER# diff -Nru apt-mirror-0.4.6/debian/rules apt-mirror-0.4.7/debian/rules --- apt-mirror-0.4.6/debian/rules 2010-04-20 18:36:23.000000000 +0100 +++ apt-mirror-0.4.7/debian/rules 2010-04-20 09:58:59.000000000 +0100 @@ -1,16 +1,11 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +DIST ?= $(shell lsb_release -si) +CODENAME ?= $(shell lsb_release -sc) -builddist := $(shell lsb_release -si) +%: + dh $@ -install/apt-mirror:: - install -g root -o root -m 755 \ - apt-mirror debian/apt-mirror/usr/bin/apt-mirror - install -g root -o root -m 644 \ - debian/${builddist}-mirror.list debian/apt-mirror/etc/apt/mirror.list - install -d -g root -o root -m 0755 debian/apt-mirror/usr/share/man/man1 - pod2man apt-mirror | gzip -9 -c > debian/apt-mirror/usr/share/man/man1/apt-mirror.1.gz - mkdir -p $(DEB_DESTDIR)usr/share/doc/apt-mirror - cp CHANGELOG $(DEB_DESTDIR)usr/share/doc/apt-mirror/changelog +override_dh_auto_install: + sed "s/@CODENAME@/$(CODENAME)/" debian/$(DIST)-mirror.list > debian/apt-mirror/etc/apt/mirror.list + pod2man apt-mirror > debian/apt-mirror/usr/share/man/man1/apt-mirror.1 diff -Nru apt-mirror-0.4.6/debian/source/format apt-mirror-0.4.7/debian/source/format --- apt-mirror-0.4.6/debian/source/format 1970-01-01 01:00:00.000000000 +0100 +++ apt-mirror-0.4.7/debian/source/format 2010-04-20 18:36:23.000000000 +0100 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru apt-mirror-0.4.6/debian/Ubuntu-mirror.list apt-mirror-0.4.7/debian/Ubuntu-mirror.list --- apt-mirror-0.4.6/debian/Ubuntu-mirror.list 2010-04-20 18:36:23.000000000 +0100 +++ apt-mirror-0.4.7/debian/Ubuntu-mirror.list 2010-04-20 09:58:59.000000000 +0100 @@ -2,30 +2,28 @@ # # set base_path /var/spool/apt-mirror # -# if you change the base path you must create the directories below with write privileges -# # set mirror_path $base_path/mirror # set skel_path $base_path/skel # set var_path $base_path/var # set cleanscript $var_path/clean.sh # set defaultarch # set postmirror_script $var_path/postmirror.sh -set run_postmirror 0 +# set run_postmirror 0 set nthreads 20 set _tilde 0 # ############# end config ############## -deb http://archive.ubuntu.com/ubuntu lucid main restricted universe multiverse -deb http://archive.ubuntu.com/ubuntu lucid-security main restricted universe multiverse -deb http://archive.ubuntu.com/ubuntu lucid-updates main restricted universe multiverse -#deb http://archive.ubuntu.com/ubuntu lucid-proposed main restricted universe multiverse -#deb http://archive.ubuntu.com/ubuntu lucid-backports main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu @CODENAME@ main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu @CODENAME@-security main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu @CODENAME@-updates main restricted universe multiverse +#deb http://archive.ubuntu.com/ubuntu @CODENAME@-proposed main restricted universe multiverse +#deb http://archive.ubuntu.com/ubuntu @CODENAME@-backports main restricted universe multiverse -deb-src http://archive.ubuntu.com/ubuntu lucid main restricted universe multiverse -deb-src http://archive.ubuntu.com/ubuntu lucid-security main restricted universe multiverse -deb-src http://archive.ubuntu.com/ubuntu lucid-updates main restricted universe multiverse -#deb-src http://archive.ubuntu.com/ubuntu lucid-proposed main restricted universe multiverse -#deb-src http://archive.ubuntu.com/ubuntu lucid-backports main restricted universe multiverse +deb-src http://archive.ubuntu.com/ubuntu @CODENAME@ main restricted universe multiverse +deb-src http://archive.ubuntu.com/ubuntu @CODENAME@-security main restricted universe multiverse +deb-src http://archive.ubuntu.com/ubuntu @CODENAME@-updates main restricted universe multiverse +#deb-src http://archive.ubuntu.com/ubuntu @CODENAME@-proposed main restricted universe multiverse +#deb-src http://archive.ubuntu.com/ubuntu @CODENAME@-backports main restricted universe multiverse clean http://archive.ubuntu.com/ubuntu diff -Nru apt-mirror-0.4.6/debian/watch apt-mirror-0.4.7/debian/watch --- apt-mirror-0.4.6/debian/watch 2010-04-20 18:36:23.000000000 +0100 +++ apt-mirror-0.4.7/debian/watch 2010-04-20 09:58:59.000000000 +0100 @@ -1,2 +1,2 @@ version=3 -http://sf.net/apt-mirror/apt-mirror_(.*).orig.tar.gz +http://apt-mirror.sf.net/apt-mirror/apt-mirror_(.*)\.orig\.tar\.gz