diff -Nru debmirror-20070123ubuntu1/debian/changelog debmirror-20070123ubuntu2/debian/changelog --- debmirror-20070123ubuntu1/debian/changelog 2007-11-13 08:41:33.000000000 +1030 +++ debmirror-20070123ubuntu2/debian/changelog 2008-07-19 01:09:38.000000000 +0930 @@ -1,3 +1,13 @@ +debmirror (20070123ubuntu2) intrepid; urgency=low + + * Changed defaults to download Ubuntu not Debian + * Corrected minor problems in documentation + * Ubuntufied the Documentation + - Replaced most instances of Debian with Ubuntu in the documentation + - Changed examples to be more Ubuntu relevent + + -- Karl Goetz Sat, 19 Jul 2008 00:40:06 +0930 + debmirror (20070123ubuntu1) hardy; urgency=low * Patched to handle changes to Compress::Zlib gzreadline symantics diff -Nru /tmp/sjsCLAvF9O/debmirror-20070123ubuntu1/debmirror /tmp/DtKkuZM8vP/debmirror-20070123ubuntu2/debmirror --- debmirror-20070123ubuntu1/debmirror 2007-11-13 08:51:04.000000000 +1030 +++ debmirror-20070123ubuntu2/debmirror 2008-07-19 01:06:58.000000000 +0930 @@ -9,7 +9,7 @@ =head1 NAME debmirror - Debian partial mirror script, with ftp, http, hftp or -rsync and package pool support +rsync and package pool support. =head1 SYNOPSIS @@ -17,7 +17,7 @@ =head1 DESCRIPTION -This program downloads and maintains a partial local Debian mirror. It can +This program downloads and maintains a partial local Ubuntu mirror. It can mirror any combination of architectures, distributions, and sections. Files are transferred by ftp, and package pools are fully supported. It also does locking and updates trace files. @@ -28,7 +28,7 @@ =item 1. download Packages and Sources files -First it downloads all Packages and Sources files for the subset of Debian it +First it downloads all Packages and Sources files for the subset of Ubuntu it was instructed to get. =item 2. clean up unknown files @@ -82,8 +82,8 @@ This required parameter specifies where the local mirror directory is. If the directory does not exist, it will be created. Be careful; telling this -program that your home directory is the mirrordir is guaranteed to replace -your home directory with a Debian mirror! +program that your home directory as the mirrordir is guaranteed to replace +your home directory with an Ubuntu mirror! =item --debug @@ -117,7 +117,7 @@ =item --host=remotehost -h -Specify the remote host to mirror from. Defaults to ftp.debian.org, +Specify the remote host to mirror from. Defaults to archive.ubuntu.com, you are strongly encouraged to find a closer mirror. =item --user=remoteusername -u @@ -149,22 +149,21 @@ =item --root=directory -r directory -Specifies the directory on the remote host that is the root of the Debian -archive. Defaults to "/debian", which will work for most mirrors. The root +Specifies the directory on the remote host that is the root of the Ubuntu +archive. Defaults to "/ubuntu", which will work for most mirrors. The root directory has a dists/ subdirectory. =item --dist=foo[,bar,..] -d foo -Specify the distribution (sarge, etch, lenny, sid) of Debian to +Specify the distribution (dapper,gutsy,hardy,intrepid) of Ubuntu to mirror. This switch may be used multiple times, and multiple distributions may be specified at once, separated by commas. Using the -links (stable, testing, unstable) does not have the expected results -but you may add those links manually. Defaults to mirroring sid. +links (stable, testing, unstable) does not have the expected results. =item --section=foo[,bar,..] -s foo -Specify the section of Debian to mirror. Defaults to -main,contrib,non-free,main/debian-installer. +Specify the section of Ubuntu to mirror. Defaults to +main,main/debian-installer,universe,restricted,multiverse =item --arch=foo[,bar,..] -a foo @@ -216,7 +215,7 @@ Also download Packages and Sources files from the specified directory on the remote host (the directory is relative to the root of the -Debian archive). If you used this option for "--adddir +Ubuntu archive). If you used this option for "--adddir dists/proposed-updates" in the past use "--dist -proposed-updates" now. This feature is now obsolete and will be removed soon. @@ -283,54 +282,20 @@ =back -=head1 ARCHIVE SIZE - -Mirror size for a singe arch and binary only (in MiB): - - | sarge | etch | sid | all ----------+-------+------+-------+------- -main | 8816 | 9126 | 10777 | 20577 -contrib | 126 | 118 | 291 | 363 -non-free | 282 | 345 | 464 | 666 -d-i | 44 | 28 | 31 | 78 -all | 9187 | 9536 | 11476 | 21502 - -Mirror size per arch (in MiB): - - | sarge | etch | sid | all ----------+-------+------+-------+------- -source | 9339 | 9419 | 11495 | 17521 -all | 4478 | 5047 | 6160 | 10459 -alpha | 4256 | 3906 | 4732 | 9708 -amd64 | 3644 | 3635 | 4877 | 9152 -arm | 3445 | 3193 | 3933 | 7845 -hppa | 4112 | 3713 | 4541 | 9167 -i386 | 4422 | 3979 | 5005 | 10477 -ia64 | 4709 | 4489 | 5316 | 11043 -m68k | 3372 | 3072 | 3664 | 7139 -mips | 3631 | 3364 | 4099 | 8237 -mipsel | 3560 | 3319 | 4049 | 8106 -powerpc | 4208 | 3967 | 4742 | 9915 -s390 | 3673 | 3452 | 4144 | 8489 -sparc | 3761 | 3585 | 4390 | 8893 - -All numbers reflect the state of 2005 Dec 9th and do not include any -filesystem overhead (which adds 1-2GB for ext2/3). - =head1 EXAMPLES - debmirror /mirror/debian + debmirror /mirror/ubuntu -Simply make a mirror in /mirror/debian, using all defaults. +Simply make a mirror in $HOME/mirror/ubuntu, using all defaults. - debmirror -a i386,sparc -s main -h ftp.kernel.org \ - -d sid -d etch /home/me/debian/mirror --nosource \ + debmirror -a i386,amd64 -s main,universe -h archive.ubuntu.com \ + -d hardy -d intrepid $HOME/debian/mirror --nosource \ --progress -Make a mirror of i386 and sparc binaries, main only, and include both unstable -and testing versions of Debian. Download from ftp.kernel.org. +Make a mirror of i386 and amd64 binaries, main and universe only, and include +both LTS and latest versions of Ubuntu. Download from archive.ubuntu.com. - debmirror -e rsync -r :debian /home/me/debian/mirror + debmirror -e rsync -r :debian $HOME/debian/mirror Make a mirror using rsync. rsync server is ftp.debian.org::debian. @@ -344,15 +309,15 @@ used. To add the right key to this keyring you can import it from the - debian keyring (in case of the debian archive) using: + ubuntu keyring (in case of the Ubuntu archive) using: - gpg --keyring /usr/share/keyrings/debian-archive-keyring.gpg --export \ + gpg --keyring /usr/share/keyrings/ubuntu-archive-keyring.gpg --export \ | gpg --no-default-keyring --keyring trustedkeys.gpg --import or download the key from a keyserver: gpg --no-default-keyring --keyring trustedkeys.gpg \ - --keyserver keyring.debian.org --recv-keys + --keyserver keyserver.ubuntu.com --recv-keys The can be found in the gpgv error message in debmirror: gpgv: Signature made Tue Jan 23 09:07:53 2007 CET using DSA key ID 2D230C5F @@ -381,10 +346,10 @@ our $post_cleanup=1; our $no_cleanup=0; our $do_source=1; -our $host="ftp.debian.org"; +our $host="archive.ubuntu.com"; our $user="anonymous"; our $passwd="anonymous@"; -our $remoteroot="/debian"; +our $remoteroot="/ubuntu"; our $download_method="ftp"; our $timeout=300; our $max_batch=0; @@ -475,9 +440,9 @@ # Post-process arrays. Allow commas to seperate values the user entered. # If the user entered nothing, provide defaults. @dists=split(/,/,join(',',@dists)); -@dists=qw(sid) unless @dists; +@dists=qw(intrepid) unless @dists; @sections=split(/,/,join(',',@sections)); -@sections=qw(main contrib non-free main/debian-installer) unless @sections; +@sections=qw(main main/debian-installer universe restricted multiverse) unless @sections; @arches=split(/,/,join(',',@arches)); @arches=qw(i386) unless @arches; @arches=() if (join(',',@arches) eq "none"); @@ -1630,7 +1595,7 @@ . The author disclaims any responsibility for any mangling of your system, -unexpected bandwidth usage bills, meltdown of the Debian mirror network, +unexpected bandwidth usage bills, meltdown of the Ubuntu mirror network, etc, that this script may cause. See NO WARRANTY section of GPL. =head1 AUTHOR diff -Nru /tmp/sjsCLAvF9O/debmirror-20070123ubuntu1/debmirror.conf /tmp/DtKkuZM8vP/debmirror-20070123ubuntu2/debmirror.conf --- debmirror-20070123ubuntu1/debmirror.conf 2006-09-07 22:10:16.000000000 +0930 +++ debmirror-20070123ubuntu2/debmirror.conf 2008-07-19 01:06:58.000000000 +0930 @@ -15,13 +15,13 @@ $debug=0; # Download options -$host="ftp.debian.org"; +$host="archive.ubuntu.com"; $user="anonymous"; $passwd="anonymous@"; -$remoteroot="/debian"; +$remoteroot="/ubuntu"; $download_method="ftp"; -@dists="sid"; -@sections="main,main/debian-installer,contrib,non-free"; +@dists="intrepid"; +@sections="main,main/debian-installer,universe,restricted,multiverse"; @arches="i386"; # @extra_dirs=""; # @ignores="";