merge from workstation

diff --git a/ubuntu-mirror b/ubuntu-mirror
index 9de6a6a4d3f1cb021ec208278a810aed140013fb..6e775690b1366d8cd0e4d6a86458245eabd03d70 100755 (executable)
--- a/ubuntu-mirror
+++ b/ubuntu-mirror
@@ -1,8 +1,5 @@
 #!/bin/sh -e
 
-# source
-debmirror --dist breezy,breezy-updates,breezy-security,dapper,dapper-updates,dapper-security --section main,restricted --arch none --source --progress --nocleanup --method http --ignore-release-gpg --host archive.ubuntu.com --exclude-deb-section translation --exclude 'openoffice.*amd.*tar.gz' --exclude 'ia32-libs*' --root ubuntu /mirror
-
 # dapper binaries
 debmirror --dist dapper,dapper-updates,dapper-security --section main,restricted --arch i386,amd64 --no-source --progress --nocleanup --method http --ignore-release-gpg --host security.ubuntu.com --exclude-deb-section translation --exclude 'linux-(tree|source|patch|doc)[^/]*\.deb' --exclude 'linux.*(386|k7|k8|xeon|server)' --exclude 'linux.*(9\.23|23\.39|25\.43|26\.47)' --exclude 'ia32-libs*' --exclude '-dbg_.*\.deb' --root ubuntu /mirror
 

diff --git a/update-chroots b/update-chroots
index 5c20ecb874092bd63d8b29d31963776f6c202fea..c126d1ddd3b837931fae6d7aa7c9dd2cea9fd51d 100755 (executable)
--- a/update-chroots
+++ b/update-chroots
@@ -1,4 +1,3 @@
 #!/bin/sh
 dchroot -a -- 'apt-get update'
-dchroot -d -c breezy -- 'apt-get -u -y dist-upgrade'
-dchroot -d -c dapper -- 'apt-get -u -y dist-upgrade'
+dchroot -a -- 'apt-get -u -y dist-upgrade'