[Secure-testing-commits] r24047 - / lib/python

[Thijs Kinkhorst]

Author: thijs
Date: 2013-10-17 07:22:00 +0000 (Thu, 17 Oct 2013)
New Revision: 24047

Modified:
   Makefile
   lib/python/dist_config.py
Log:
remove s390


Modified: Makefile
===================================================================
--- Makefile	2013-10-17 07:13:44 UTC (rev 24046)
+++ Makefile	2013-10-17 07:22:00 UTC (rev 24047)
@@ -8,8 +8,8 @@
 MIRROR = http://cdn.debian.net/debian/
 squeeze_ARCHS = amd64 armel i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64
 wheezy_ARCHS = amd64 armel armhf i386 ia64 mips mipsel powerpc s390 s390x sparc kfreebsd-i386 kfreebsd-amd64
-jessie_ARCHS = amd64 armel armhf i386 ia64 mips mipsel powerpc s390 s390x sparc kfreebsd-i386 kfreebsd-amd64
-sid_ARCHS = amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc s390 s390x sparc
+jessie_ARCHS = amd64 armel armhf i386 ia64 mips mipsel powerpc s390x sparc kfreebsd-i386 kfreebsd-amd64
+sid_ARCHS = amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc s390x sparc
 
 OLDSTABLE = squeeze
 STABLE    = wheezy

Modified: lib/python/dist_config.py
===================================================================
--- lib/python/dist_config.py	2013-10-17 07:13:44 UTC (rev 24046)
+++ lib/python/dist_config.py	2013-10-17 07:22:00 UTC (rev 24047)
@@ -37,8 +37,10 @@
 def apply_config():
     # Invoked at the end of the file.  Edit this to suit your needs.
 
-    squeeze_archs = 'amd64,armel,i386,ia64,kfreebsd-amd64,kfreebsd-i386,mips,mipsel,powerpc,s390,sparc'.split(',')
+    common_archs = 'amd64,armel,i386,ia64,kfreebsd-amd64,kfreebsd-i386,mips,mipsel,powerpc,sparc'.split(',')
+    squeeze_archs = common_archs + ['s390']
     wheezy_archs = squeeze_archs + ['armhf','s390x']
+    jessie_archs = common_archs + ['armhf','s390x']
 
     add_release(name='squeeze',
                 architectures=squeeze_archs,
@@ -49,11 +51,11 @@
                 )
     
     add_release(name='jessie',
-                architectures=wheezy_archs,
+                architectures=jessie_archs,
                 )
 
     add_release(name='sid',
-                architectures=wheezy_archs,
+                architectures=jessie_archs,
                 )
 
 ######################################################################