Merge branch 'ftp-master'

Conflicts:

	britney.conf

Signed-off-by: Release Managers <release@ries.debian.org>

britney.conf

@@ -12,19 +12,19 @@ UPGRADE_OUTPUT    = /srv/ftp.debian.org/testing/output/output.txt
 HEIDI_OUTPUT      = /srv/ftp.debian.org/testing/output/HeidiResult
 
 # List of release architectures
-ARCHITECTURES     = i386 sparc alpha powerpc arm armel hppa ia64 mips mipsel s390 amd64
+ARCHITECTURES     = i386 sparc alpha powerpc arm armel hppa ia64 mips mipsel s390 amd64 kfreebsd-i386 kfreebsd-amd64
 
 # if you're not in this list, arch: all packages are allowed to break on you
 NOBREAKALL_ARCHES = i386
 
 # if you're in this list, your packages may not stay in sync with the source
-FUCKED_ARCHES     = 
+FUCKED_ARCHES     = kfreebsd-i386 kfreebsd-amd64 
 
 # if you're in this list, your uninstallability count may increase
-BREAK_ARCHES      = 
+BREAK_ARCHES      = kfreebsd-i386 kfreebsd-amd64
 
 # if you're in this list, you are a new architecture
-NEW_ARCHES        = 
+NEW_ARCHES        = kfreebsd-i386 kfreebsd-amd64
 
 # priorities and delays
 MINDAYS_LOW       = 10
@@ -38,20 +38,19 @@ DEFAULT_URGENCY   = low
 APPROVERS         = ajt security-team ftpmaster vorlon
 
 # hint permissions
-HINTS_AJT         = ALL
-HINTS_RMURRAY     = ALL
 HINTS_VORLON      = ALL
 HINTS_ABA         = ALL
 HINTS_HE          = ALL
 HINTS_LUK         = ALL
-HINTS_JOEYH       = STANDARD force
-HINTS_ADEODATO    = STANDARD force
+HINTS_ADEODATO    = ALL
 HINTS_ZOBEL       = STANDARD force
-HINTS_PKERN       = STANDARD
+HINTS_PKERN       = STANDARD force
 HINTS_MADCODER    = STANDARD
 HINTS_NEILM       = STANDARD
 HINTS_FREEZE      = block block-all block-udeb
-HINTS_FTPTEAM     = block
+HINTS_ADSB        = easy hint remove block unblock approve 
+HINTS_FAW         = easy hint remove block unblock approve 
+HINTS_JURIJ       = easy hint remove block unblock approve 
 
 # support for old libraries in testing (smooth update)
 # use ALL to enable smooth updates for all the sections

lib/update_out.py

@@ -25,8 +25,8 @@ testingupdatesdir = sys.argv[3]
 
 # Configuration information
 
-expected_arches = 12
-allarches = [ 'i386', 'sparc', 'alpha', 'powerpc', 'arm', 'm68k', 'hppa', 'ia64', 'mips', 'mipsel', 's390', 'amd64' ]
+expected_arches = 13
+allarches = [ 'i386', 'sparc', 'alpha', 'powerpc', 'armel', 'hppa', 'ia64', 'mips', 'mipsel', 's390', 'amd64' , 'kfreebsd-i386', 'kfreebsd-amd64']
 
 mindays = { "low" : 10, "medium" : 5, "high" : 2, "critical" : 0, 
 	    "emergency" : 0 }
@@ -35,11 +35,11 @@ defaulturgency = "low"
 # if you're not in this list, arch: all packages are allowed to break on you
 nobreakarchallarches = ['i386']
 # if you're in this list, your packages may not stay in sync with the source
-fuckedarches = ['m68k', 'sparc']
+fuckedarches = ['kfreebsd-i386','kfreebsd-amd64']
 # if you're in this list, your uninstallability count may increase
-breakarches = ['m68k', 'sparc']
+breakarches = ['kfreebsd-i386','kfreebsd-amd64']
 # new architectures
-newarches = []
+newarches = ['kfreebsd-i386','kfreebsd-amd64']
 
 allarches.sort()
 arches = [ x for x in allarches if x in nobreakarchallarches ]