Merge branch 'master' of http://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 b91dcce91623e9c05832ced94d09320adcc740cc..14b19508722c60ca0e806638f333631e9d1688dc 100644 (file)
--- 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 337d0cd8ef7861013154cc3e5736f3008c8c1104..4f5a38212c89afe2b4308ccb1aa9dd00396a8c58 100644 (file)
--- 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 d9a8eb74f8cc3999ca5c5d168205cc15aba96efb..a8ad21eb84ce1a58edb3fce5c647cf63d7ddaaf2 100755 (executable)
--- 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