diff -Nru /tmp/IxKRVPkrxo/apt-setup-0.10ubuntu2/debian/apt-setup-udeb.templates /tmp/mZ10eNWpDV/apt-setup-0.10ubuntu2umncsit1/debian/apt-setup-udeb.templates --- /tmp/IxKRVPkrxo/apt-setup-0.10ubuntu2/debian/apt-setup-udeb.templates 2006-04-25 11:49:35.000000000 -0500 +++ /tmp/mZ10eNWpDV/apt-setup-0.10ubuntu2umncsit1/debian/apt-setup-udeb.templates 2006-06-30 15:30:06.000000000 -0500 @@ -28,6 +28,12 @@ Default: security.ubuntu.com Description: host to use for security updates (internal use) +Template: apt-setup/security_path +Type: string +# Not translatable, for overriding by derivers. +Default: /ubuntu +Description: path to use for security updates (internal use) + Template: apt-setup/security-updates-failed Type: error _Description: Cannot access security updates diff -Nru /tmp/IxKRVPkrxo/apt-setup-0.10ubuntu2/debian/changelog /tmp/mZ10eNWpDV/apt-setup-0.10ubuntu2umncsit1/debian/changelog --- /tmp/IxKRVPkrxo/apt-setup-0.10ubuntu2/debian/changelog 2006-05-17 18:15:36.000000000 -0500 +++ /tmp/mZ10eNWpDV/apt-setup-0.10ubuntu2umncsit1/debian/changelog 2006-06-30 15:31:36.000000000 -0500 @@ -1,3 +1,9 @@ +apt-setup (1:0.10ubuntu2umncsit1) dapper; urgency=low + + * Added configurable option for security path. + + -- Scott M. Dier Fri, 30 Jun 2006 15:31:11 -0500 + apt-setup (1:0.10ubuntu2) dapper; urgency=low * Backport from trunk: diff -Nru /tmp/IxKRVPkrxo/apt-setup-0.10ubuntu2/generators/90security /tmp/mZ10eNWpDV/apt-setup-0.10ubuntu2umncsit1/generators/90security --- /tmp/IxKRVPkrxo/apt-setup-0.10ubuntu2/generators/90security 2006-05-17 18:14:05.000000000 -0500 +++ /tmp/mZ10eNWpDV/apt-setup-0.10ubuntu2umncsit1/generators/90security 2006-06-30 15:31:03.000000000 -0500 @@ -10,7 +10,12 @@ if [ -z "$host" ]; then exit fi -directory=/ubuntu + +db_get apt-setup/security_path +directory="$RET" +if [ -z "$directory" ]; then + exit +fi db_get mirror/protocol protocol="$RET"