From: Joerg Jaspert <joerg@debian.org>
Date: Sat, 3 Jul 2010 17:18:35 +0000 (+0200)
Subject: Merge branch 'master' of http://db.debian.org/git/debian.org
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0f441d4cfdb8d4449a06faaeea768de7050e1a41;hp=43b394ba6934dd5cb2f2ab51729a7c9ff8267955;p=dsa-metapackages.git

Merge branch 'master' of db.debian.org/git/debian.org

* 'master' of http://db.debian.org/git/debian.org:
  Update python-sqlalchemy dependency for ftpmaster metapackage to version > 0.5 << 0.6
  Remove etch from upgrade-porter-chroots
---

diff --git a/debian/changelog b/debian/changelog
index b91dcce..14b1950 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,9 +6,13 @@ debian.org (38) stable; urgency=low
 
 debian.org (37) stable; urgency=low
 
+  [ Martin Zobel-Helas ]
   * add mercurial to -recommended
 
- -- Martin Zobel-Helas <zobel@debian.org>  Sun, 27 Jun 2010 23:56:45 +0200
+  [ Stephen Gran ]
+  * Remove etch from upgrade-porter-chroots
+
+ -- Stephen Gran <sgran@debian.org>  Thu, 01 Jul 2010 23:59:13 +0100
 
 debian.org (36) stable; urgency=low
 
diff --git a/debian/control b/debian/control
index 337d0cd..4f5a382 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: debian.org
 Section: local/admin
 Priority: required
 Maintainer: Debian sysadmin Team <debian-admin@debian.org>
-Uploaders: Peter Palfrader <weasel@debian.org>, Martin Zobel-Helas <zobel@debian.org>
+Uploaders: Peter Palfrader <weasel@debian.org>, Martin Zobel-Helas <zobel@debian.org>, Stephen Gran <sgran@debian.org>
 Build-Depends: debhelper (>= 7)
 Standards-Version: 3.8.1
 
diff --git a/upgrade-porter-chroots b/upgrade-porter-chroots
index d9a8eb7..a8ad21e 100755
--- a/upgrade-porter-chroots
+++ b/upgrade-porter-chroots
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-for d in etch lenny squeeze sid \
-         etch_i386 lenny_i386 squeeze_i386 sid_i386 \
-         etch_amd64 lenny_amd64 squeeze_amd64 sid_amd64 \
+for d in lenny squeeze sid \
+         lenny_i386 squeeze_i386 sid_i386 \
+         lenny_amd64 squeeze_amd64 sid_amd64 \
 	; do
 	[ -d /chroot/$d ] || continue;
 	echo; echo $d; echo