[debian-edu-commits] r80099 - trunk/src/archive/archivestatus/bin

holger at alioth.debian.org holger at alioth.debian.org
Fri May 17 15:51:20 UTC 2013


Author: holger
Date: 2013-05-17 15:51:20 +0000 (Fri, 17 May 2013)
New Revision: 80099

Modified:
   trunk/src/archive/archivestatus/bin/needs_love
Log:
s#ETCH#STABLE#g - obvious quote: This code is horrible. READ AT YOUR OWN RISK

Modified: trunk/src/archive/archivestatus/bin/needs_love
===================================================================
--- trunk/src/archive/archivestatus/bin/needs_love	2013-05-17 10:35:33 UTC (rev 80098)
+++ trunk/src/archive/archivestatus/bin/needs_love	2013-05-17 15:51:20 UTC (rev 80099)
@@ -45,6 +45,8 @@
 # - ignore powerpc for wheezy
 # 2013-01-02, version 0.7.4
 # - claim 100% success if there is no diff to Debian
+# 2013-05-17, version 0.8
+# - s#ETCH#STABLE#g
 
 #################
 #################	 	This code is horrible. READ AT YOUR OWN RISK! 
@@ -77,22 +79,22 @@
 				print_td "`dak ls $i -s $4 |cut -d'|' -f2`"
 				if [ "$5" = "debian" ] ; then 
 					NR=0
-					while [ $NR -le ${#DEBIAN_ETCH_P[*]} ] ; do
-						if [ "${DEBIAN_ETCH_P[$NR]}" = $i ] ; then 
+					while [ $NR -le ${#DEBIAN_STABLE_P[*]} ] ; do
+						if [ "${DEBIAN_STABLE_P[$NR]}" = $i ] ; then 
 							break 
 						fi
 						let "NR += 1"
 					done
-					print_td ${DEBIAN_ETCH_S[$NR]}
+					print_td ${DEBIAN_STABLE_S[$NR]}
 				elif [ "$5" = "security" ] ; then 
 					NR=0
-					while [ $NR -le ${#SECURITY_ETCH_P[*]} ] ; do
-						if [ "${SECURITY_ETCH_P[$NR]}" = $i ] ; then 
+					while [ $NR -le ${#SECURITY_STABLE_P[*]} ] ; do
+						if [ "${SECURITY_STABLE_P[$NR]}" = $i ] ; then 
 							break 
 						fi
 						let "NR += 1"
 					done
-					print_td ${SECURITY_ETCH_S[$NR]}
+					print_td ${SECURITY_STABLE_S[$NR]}
 				elif [ "$5" = "powerpc" ] || [ "$5" = "amd64" ] || [ "$5" = "i386" ] ; then 
 					print_td "`dak ls -S -a $5 -s $4 $i |head -1|cut -d'|' -f2`"
 				elif [ -n "$5" ] ; then 
@@ -180,8 +182,8 @@
   PACKAGE=`echo $i|cut -d' ' -f1`
   for j in $EDU_PACKAGES ; do
 	if [ "$j" = "$PACKAGE" ] ; then
-		DEBIAN_ETCH_P[$NR]=$PACKAGE
-		DEBIAN_ETCH_S[$NR]=`echo $i|cut -d' ' -f2`
+		DEBIAN_STABLE_P[$NR]=$PACKAGE
+		DEBIAN_STABLE_S[$NR]=`echo $i|cut -d' ' -f2`
 		let "NR += 1"
     	fi
   done
@@ -190,9 +192,9 @@
 done
 IFS=$' \n\t'
 rm -f Sources.gz Sources
-#echo ${DEBIAN_ETCH_P[@]}
-#for i in `seq 0 ${#DEBIAN_ETCH_P[*]}` ; do echo $i ; 
-#                echo "<p> ${DEBIAN_ETCH_P[$i]} ${DEBIAN_ETCH_S[$i]}</p>"
+#echo ${DEBIAN_STABLE_P[@]}
+#for i in `seq 0 ${#DEBIAN_STABLE_P[*]}` ; do echo $i ; 
+#                echo "<p> ${DEBIAN_STABLE_P[$i]} ${DEBIAN_STABLE_S[$i]}</p>"
 #  done
 #exit 0
 
@@ -210,8 +212,8 @@
   PACKAGE=`echo $i|cut -d' ' -f1`
   for j in $EDU_PACKAGES ; do
 	if [ "$j" = "$PACKAGE" ] ; then
-		SECURITY_ETCH_P[$NR]=$PACKAGE
-		SECURITY_ETCH_S[$NR]=`echo $i|cut -d' ' -f2`
+		SECURITY_STABLE_P[$NR]=$PACKAGE
+		SECURITY_STABLE_S[$NR]=`echo $i|cut -d' ' -f2`
 		let "NR += 1"
     	fi
   done
@@ -228,8 +230,8 @@
 
   NOTINDEBIAN=true
   DNR=0
-  while [ $DNR -le ${#DEBIAN_ETCH_P[*]} ] ; do
-    if [ "${DEBIAN_ETCH_P[$DNR]}" = $i ] ; then 
+  while [ $DNR -le ${#DEBIAN_STABLE_P[*]} ] ; do
+    if [ "${DEBIAN_STABLE_P[$DNR]}" = $i ] ; then 
 	unset NOTINDEBIAN
 	break 
     fi
@@ -238,22 +240,22 @@
 
   NOTINSECURITY=true
   SNR=0
-  while [ $SNR -le ${#SECURITY_ETCH_P[*]} ] ; do
-    if [ "${SECURITY_ETCH_P[$SNR]}" = $i ] ; then 
+  while [ $SNR -le ${#SECURITY_STABLE_P[*]} ] ; do
+    if [ "${SECURITY_STABLE_P[$SNR]}" = $i ] ; then 
 	unset NOTINSECURITY
 	break 
     fi
     let "SNR += 1"
   done
 
-  ETCH_SOURCE=`dak ls -s $SUITE $i |grep source| cut -d'|' -f2|xargs`
-  ETCH_TEST_SOURCE=`dak ls -s ${SUITE}-test $i |grep source|cut -d'|' -f2|xargs`
+  STABLE_SOURCE=`dak ls -s $SUITE $i |grep source| cut -d'|' -f2|xargs`
+  STABLE_TEST_SOURCE=`dak ls -s ${SUITE}-test $i |grep source|cut -d'|' -f2|xargs`
 
-  if [ -z "$ETCH_SOURCE" ] ; then
-  	NOT_IN_ETCH="$NOT_IN_ETCH $i"
-  elif [ -z "$ETCH_TEST_SOURCE" ] ; then
-  	NOT_IN_ETCH_TEST="$NOT_IN_ETCH_TEST $i"
-  elif [ "$ETCH_SOURCE" != "$ETCH_TEST_SOURCE" ] ; then
+  if [ -z "$STABLE_SOURCE" ] ; then
+  	NOT_IN_STABLE="$NOT_IN_STABLE $i"
+  elif [ -z "$STABLE_TEST_SOURCE" ] ; then
+  	NOT_IN_STABLE_TEST="$NOT_IN_STABLE_TEST $i"
+  elif [ "$STABLE_SOURCE" != "$STABLE_TEST_SOURCE" ] ; then
 	NEEDS_KATHA="$NEEDS_KATHA $i"
   fi
 
@@ -261,57 +263,57 @@
   if [ -n "`dak ls -s $SUITE $i`" ] ; then let "SUITENR += 1" ; fi
   if [ -n "`dak ls -s ${SUITE}-test $i`" ] ; then let "SUITETESTNR += 1" ; fi
 
-  ETCH_POWERPC=`dak ls -S -s $SUITE -a powerpc,all $i|grep powerpc|head -1 |cut -d'|' -f2|xargs`
-  ETCH_AMD64=`dak ls -S -s $SUITE -a amd64,all $i|grep amd64|head -1 |cut -d'|' -f2|xargs`
-  ETCH_I386=`dak ls -S -s $SUITE -a i386,all $i|grep i386|head -1 |cut -d'|' -f2|xargs`
-  ETCH_ARCHS=`dak ls -S -s $SUITE $i|egrep  'powerpc|i386|amd64'|head -1 |cut -d'|' -f4`		# if this is empty, the package is arch all (only)
+  STABLE_POWERPC=`dak ls -S -s $SUITE -a powerpc,all $i|grep powerpc|head -1 |cut -d'|' -f2|xargs`
+  STABLE_AMD64=`dak ls -S -s $SUITE -a amd64,all $i|grep amd64|head -1 |cut -d'|' -f2|xargs`
+  STABLE_I386=`dak ls -S -s $SUITE -a i386,all $i|grep i386|head -1 |cut -d'|' -f2|xargs`
+  STABLE_ARCHS=`dak ls -S -s $SUITE $i|egrep  'powerpc|i386|amd64'|head -1 |cut -d'|' -f4`		# if this is empty, the package is arch all (only)
 
-  ETCH_TEST_POWERPC=`dak ls -S -s $SUITE-test -a powerpc,all $i|grep powerpc|head -1 |cut -d'|' -f2|xargs`
-  ETCH_TEST_AMD64=`dak ls -S -s $SUITE-test -a amd64,all $i|grep amd64|head -1 |cut -d'|' -f2|xargs`
-  ETCH_TEST_I386=`dak ls -S -s $SUITE-test -a i386,all $i|grep i386|head -1 |cut -d'|' -f2|xargs`
-  ETCH_TEST_ARCHS=`dak ls -S -s $SUITE-test $i|egrep  'powerpc|i386|amd64'|head -1 |cut -d'|' -f4`
+  STABLE_TEST_POWERPC=`dak ls -S -s $SUITE-test -a powerpc,all $i|grep powerpc|head -1 |cut -d'|' -f2|xargs`
+  STABLE_TEST_AMD64=`dak ls -S -s $SUITE-test -a amd64,all $i|grep amd64|head -1 |cut -d'|' -f2|xargs`
+  STABLE_TEST_I386=`dak ls -S -s $SUITE-test -a i386,all $i|grep i386|head -1 |cut -d'|' -f2|xargs`
+  STABLE_TEST_ARCHS=`dak ls -S -s $SUITE-test $i|egrep  'powerpc|i386|amd64'|head -1 |cut -d'|' -f4`
 
-  if [ -n "$ETCH_ARCHS" ] ; then {
+  if [ -n "$STABLE_ARCHS" ] ; then {
 	  I_ARCHS=`zcat /org/ftp.skolelinux.org/ftp/dists/${SUITE}/local/source/Sources.gz | grep-dctrl -F Package --eq $i -s Architecture`
-	  if [ -n "$ETCH_SOURCE" ] ; then
-		dpkg --compare-versions $ETCH_SOURCE eq $ETCH_POWERPC > /dev/null 2>&1 || if `echo $I_ARCHS|egrep -q 'any|powerpc'` ; then NEEDS_POWERPC_ETCH="$NEEDS_POWERPC_ETCH $i" ; fi
+	  if [ -n "$STABLE_SOURCE" ] ; then
+		dpkg --compare-versions $STABLE_SOURCE eq $STABLE_POWERPC > /dev/null 2>&1 || if `echo $I_ARCHS|egrep -q 'any|powerpc'` ; then NEEDS_POWERPC_STABLE="$NEEDS_POWERPC_STABLE $i" ; fi
 	  fi
-	  if [ -n "$ETCH_SOURCE" ] ; then
-		dpkg --compare-versions $ETCH_SOURCE eq $ETCH_AMD64 > /dev/null 2>&1 || if `echo $I_ARCHS|egrep -q 'any|amd64'` ; then NEEDS_AMD64_ETCH="$NEEDS_AMD64_ETCH $i" ; fi
+	  if [ -n "$STABLE_SOURCE" ] ; then
+		dpkg --compare-versions $STABLE_SOURCE eq $STABLE_AMD64 > /dev/null 2>&1 || if `echo $I_ARCHS|egrep -q 'any|amd64'` ; then NEEDS_AMD64_STABLE="$NEEDS_AMD64_STABLE $i" ; fi
 	  fi
-	  if [ -n "$ETCH_SOURCE" ] ; then 
-		dpkg --compare-versions $ETCH_SOURCE eq $ETCH_I386 > /dev/null 2>&1 || if `echo $I_ARCHS|egrep -q 'any|i386'` ; then NEEDS_I386_ETCH="$NEEDS_I386_ETCH $i" ; fi
+	  if [ -n "$STABLE_SOURCE" ] ; then 
+		dpkg --compare-versions $STABLE_SOURCE eq $STABLE_I386 > /dev/null 2>&1 || if `echo $I_ARCHS|egrep -q 'any|i386'` ; then NEEDS_I386_STABLE="$NEEDS_I386_STABLE $i" ; fi
 	  fi
   } fi
-  if [ -n "$ETCH_TEST_ARCHS" ] ; then {
+  if [ -n "$STABLE_TEST_ARCHS" ] ; then {
           I_ARCHS=`zcat /org/ftp.skolelinux.org/ftp/dists/${SUITE}-test/local/source/Sources.gz | grep-dctrl -F Package --eq $i -s Architecture`
-	  if [ -n "$ETCH_TEST_SOURCE" ] ; then
-		dpkg --compare-versions $ETCH_TEST_SOURCE eq $ETCH_TEST_POWERPC > /dev/null 2>&1 ||  if `echo $I_ARCHS|egrep -q 'any|powerpc'` ; then NEEDS_POWERPC_ETCH_TEST="$NEEDS_POWERPC_ETCH_TEST $i" ; fi
+	  if [ -n "$STABLE_TEST_SOURCE" ] ; then
+		dpkg --compare-versions $STABLE_TEST_SOURCE eq $STABLE_TEST_POWERPC > /dev/null 2>&1 ||  if `echo $I_ARCHS|egrep -q 'any|powerpc'` ; then NEEDS_POWERPC_STABLE_TEST="$NEEDS_POWERPC_STABLE_TEST $i" ; fi
 	  fi
-	  if [ -n "$ETCH_TEST_SOURCE" ] ; then
-		dpkg --compare-versions $ETCH_TEST_SOURCE eq $ETCH_TEST_AMD64 > /dev/null 2>&1 ||  if `echo $I_ARCHS|egrep -q 'any|amd64'` ; then NEEDS_AMD64_ETCH_TEST="$NEEDS_AMD64_ETCH_TEST $i" ; fi
+	  if [ -n "$STABLE_TEST_SOURCE" ] ; then
+		dpkg --compare-versions $STABLE_TEST_SOURCE eq $STABLE_TEST_AMD64 > /dev/null 2>&1 ||  if `echo $I_ARCHS|egrep -q 'any|amd64'` ; then NEEDS_AMD64_STABLE_TEST="$NEEDS_AMD64_STABLE_TEST $i" ; fi
 	  fi
-	  if [ -n "$ETCH_TEST_SOURCE" ] ; then
-		dpkg --compare-versions $ETCH_TEST_SOURCE eq $ETCH_TEST_I386 > /dev/null 2>&1 ||  if `echo $I_ARCHS|egrep -q 'any|i386'` ; then NEEDS_I386_ETCH_TEST="$NEEDS_I386_ETCH_TEST $i" ; fi
+	  if [ -n "$STABLE_TEST_SOURCE" ] ; then
+		dpkg --compare-versions $STABLE_TEST_SOURCE eq $STABLE_TEST_I386 > /dev/null 2>&1 ||  if `echo $I_ARCHS|egrep -q 'any|i386'` ; then NEEDS_I386_STABLE_TEST="$NEEDS_I386_STABLE_TEST $i" ; fi
 	  fi
   } fi
-  if [ ! "$NOTINDEBIAN" ] && [ -n "$ETCH_SOURCE" ] ; then
-  	dpkg --compare-versions ${DEBIAN_ETCH_S[$DNR]} ge $ETCH_SOURCE > /dev/null 2>&1 && REMOVE_ETCH="$REMOVE_ETCH $i"
-  	dpkg --compare-versions ${DEBIAN_ETCH_S[$DNR]} ge $ETCH_SOURCE > /dev/null 2>&1 || ETCH_NEWER="$ETCH_NEWER $i"
+  if [ ! "$NOTINDEBIAN" ] && [ -n "$STABLE_SOURCE" ] ; then
+  	dpkg --compare-versions ${DEBIAN_STABLE_S[$DNR]} ge $STABLE_SOURCE > /dev/null 2>&1 && REMOVE_STABLE="$REMOVE_STABLE $i"
+  	dpkg --compare-versions ${DEBIAN_STABLE_S[$DNR]} ge $STABLE_SOURCE > /dev/null 2>&1 || STABLE_NEWER="$STABLE_NEWER $i"
   fi
-  if [ ! "$NOTINDEBIAN" ] && [ -n "$ETCH_TEST_SOURCE" ] ; then
-  	dpkg --compare-versions ${DEBIAN_ETCH_S[$DNR]} ge $ETCH_TEST_SOURCE > /dev/null 2>&1 && REMOVE_ETCH_TEST="$REMOVE_ETCH_TEST $i"
-  	dpkg --compare-versions ${DEBIAN_ETCH_S[$DNR]} ge $ETCH_TEST_SOURCE > /dev/null 2>&1 || ETCH_TEST_NEWER="$ETCH_TEST_NEWER $i"
+  if [ ! "$NOTINDEBIAN" ] && [ -n "$STABLE_TEST_SOURCE" ] ; then
+  	dpkg --compare-versions ${DEBIAN_STABLE_S[$DNR]} ge $STABLE_TEST_SOURCE > /dev/null 2>&1 && REMOVE_STABLE_TEST="$REMOVE_STABLE_TEST $i"
+  	dpkg --compare-versions ${DEBIAN_STABLE_S[$DNR]} ge $STABLE_TEST_SOURCE > /dev/null 2>&1 || STABLE_TEST_NEWER="$STABLE_TEST_NEWER $i"
   fi
   [ ! "$NOTINDEBIAN" ] || NOT_IN_DEBIAN="$NOT_IN_DEBIAN $i"
 
-  if [ ! "$NOTINSECURITY" ] && [ -n "$ETCH_SOURCE" ] ; then
-  	dpkg --compare-versions ${SECURITY_ETCH_S[$SNR]} ge $ETCH_SOURCE > /dev/null 2>&1 && SECURITY_NEWER_THAN_ETCH="$SECURITY_NEWER_THAN_ETCH $i"
-  	dpkg --compare-versions ${SECURITY_ETCH_S[$SNR]} ge $ETCH_SOURCE > /dev/null 2>&1 || ETCH_NEWER_THAN_SECURITY="$ETCH_NEWER_THAN_SECURITY $i"
+  if [ ! "$NOTINSECURITY" ] && [ -n "$STABLE_SOURCE" ] ; then
+  	dpkg --compare-versions ${SECURITY_STABLE_S[$SNR]} ge $STABLE_SOURCE > /dev/null 2>&1 && SECURITY_NEWER_THAN_STABLE="$SECURITY_NEWER_THAN_STABLE $i"
+  	dpkg --compare-versions ${SECURITY_STABLE_S[$SNR]} ge $STABLE_SOURCE > /dev/null 2>&1 || STABLE_NEWER_THAN_SECURITY="$STABLE_NEWER_THAN_SECURITY $i"
   fi
-  if [ ! "$NOTINSECURITY" ] && [ -n "$ETCH_TEST_SOURCE" ] ; then
-  	dpkg --compare-versions ${SECURITY_ETCH_S[$SNR]} ge $ETCH_TEST_SOURCE > /dev/null 2>&1 && SECURITY_NEWER_THAN_ETCH_TEST="$SECURITY_NEWER_THAN_ETCH_TEST $i"
-  	dpkg --compare-versions ${SECURITY_ETCH_S[$SNR]} ge $ETCH_TEST_SOURCE > /dev/null 2>&1 || ETCH_TEST_NEWER_THAN_SECURITY="$ETCH_TEST_NEWER_THAN_SECURITY $i"
+  if [ ! "$NOTINSECURITY" ] && [ -n "$STABLE_TEST_SOURCE" ] ; then
+  	dpkg --compare-versions ${SECURITY_STABLE_S[$SNR]} ge $STABLE_TEST_SOURCE > /dev/null 2>&1 && SECURITY_NEWER_THAN_STABLE_TEST="$SECURITY_NEWER_THAN_STABLE_TEST $i"
+  	dpkg --compare-versions ${SECURITY_STABLE_S[$SNR]} ge $STABLE_TEST_SOURCE > /dev/null 2>&1 || STABLE_TEST_NEWER_THAN_SECURITY="$STABLE_TEST_NEWER_THAN_SECURITY $i"
   fi
 done
 
@@ -321,20 +323,20 @@
 NONFREE_ON_TEST_SOURCE_DVD=$(for i in `egrep 'non-free|nonfree' ~builder/src/debian-edu/src/build/CD-administrator/filelist-${SUITE}-test-dvd-source.txt 2>/dev/null|grep dsc|cut -d '_' -f 1|cut -d '/' -f 2-` ; do basename $i ; done)
 
 echo "Scroll down to read some explaination about this page."
-if [ "$NEEDS_KATHA" ] || [ "$NOT_IN_ETCH" ] || [ "$NOT_IN_ETCH_TEST" ] ; then
+if [ "$NEEDS_KATHA" ] || [ "$NOT_IN_STABLE" ] || [ "$NOT_IN_STABLE_TEST" ] ; then
 	echo "<h2>Packages in our archive in our ${SUITE}-test distribution compared to our ${SUITE} distribution</h2>"
 	print_table "Packages newer in debian-edu/${SUITE}-test than in debian-edu/${SUITE}" NEEDS_KATHA package ${SUITE}-test ${SUITE}
-	print_table "Packages in debian-edu/${SUITE}-test but not in debian-edu/${SUITE}" NOT_IN_ETCH package ${SUITE}-test
-	print_table "Packages in debian-edu/${SUITE} but not in debian-edu/${SUITE}-test" NOT_IN_ETCH_TEST package ${SUITE}
+	print_table "Packages in debian-edu/${SUITE}-test but not in debian-edu/${SUITE}" NOT_IN_STABLE package ${SUITE}-test
+	print_table "Packages in debian-edu/${SUITE} but not in debian-edu/${SUITE}-test" NOT_IN_STABLE_TEST package ${SUITE}
 	echo "<hr />"
 fi
-if [ "$REMOVE_ETCH" ] || [ "$REMOVE_ETCH_TEST" ] || [ "$ETCH_NEWER" ] || [ "$ETCH_TEST_NEWER" ] || [ "$NOT_IN_DEBIAN" ] ; then
+if [ "$REMOVE_STABLE" ] || [ "$REMOVE_STABLE_TEST" ] || [ "$STABLE_NEWER" ] || [ "$STABLE_TEST_NEWER" ] || [ "$NOT_IN_DEBIAN" ] ; then
 	echo "<h2>Packages in our archive compared to the Debian archive</h2>"
-	print_table "Packages newer in debian-edu/${SUITE} than in debian/${SUITE}" ETCH_NEWER package ${SUITE} debian
-	print_table "Packages newer in debian-edu/${SUITE}-test than in debian/${SUITE}" ETCH_TEST_NEWER package ${SUITE}-test debian
+	print_table "Packages newer in debian-edu/${SUITE} than in debian/${SUITE}" STABLE_NEWER package ${SUITE} debian
+	print_table "Packages newer in debian-edu/${SUITE}-test than in debian/${SUITE}" STABLE_TEST_NEWER package ${SUITE}-test debian
 	print_table "Packages not in debian-${SUITE} main" NOT_IN_DEBIAN package ${SUITE} ${SUITE}-test
-       	print_table "Packages which can be removed from debian-edu/${SUITE}" REMOVE_ETCH package ${SUITE} debian
-	print_table "Packages which can be removed from debian-edu/${SUITE}-test" REMOVE_ETCH_TEST package ${SUITE}-test debian
+       	print_table "Packages which can be removed from debian-edu/${SUITE}" REMOVE_STABLE package ${SUITE} debian
+	print_table "Packages which can be removed from debian-edu/${SUITE}-test" REMOVE_STABLE_TEST package ${SUITE}-test debian
 	echo "<p>Source packages in Debian $SUITE main: $MAINNR<br>"
         echo -n "Source packages in Debian Edu $SUITE local: $SUITENR, number of identical packages in percent: " 
 	echo "scale=5 ; ( $MAINNR - $SUITENR ) / $MAINNR * 100 "|bc
@@ -344,25 +346,25 @@
 	echo "</p>"
 	echo "<hr />"
 fi
-if [ "$SECURITY_NEWER_THAN_ETCH" ] || [ "$ETCH_NEWER_THAN_SECURITY" ] || [ "$SECURITY_NEWER_THAN_ETCH_TEST" ] || [ "$ETCH_TEST_NEWER_THAN_SECURITY" ] ; then
+if [ "$SECURITY_NEWER_THAN_STABLE" ] || [ "$STABLE_NEWER_THAN_SECURITY" ] || [ "$SECURITY_NEWER_THAN_STABLE_TEST" ] || [ "$STABLE_TEST_NEWER_THAN_SECURITY" ] ; then
 	echo "<h2>Packages in our archive compared to the Debian security archive</h2>"
-	print_table "Packages which need to be updated in debian-edu/${SUITE}" SECURITY_NEWER_THAN_ETCH package ${SUITE} security
-	print_table "Packages which are newer in our debian-edu/${SUITE}" ETCH_NEWER_THAN_SECURITY package ${SUITE} security
-	print_table "Packages which need to be updated in debian-edu/${SUITE}-test"  SECURITY_NEWER_THAN_ETCH_TEST package ${SUITE}-test security
-	print_table "Packages which are newer in our debian-edu/${SUITE}-test" ETCH_TEST_NEWER_THAN_SECURITY package ${SUITE}-test security
+	print_table "Packages which need to be updated in debian-edu/${SUITE}" SECURITY_NEWER_THAN_STABLE package ${SUITE} security
+	print_table "Packages which are newer in our debian-edu/${SUITE}" STABLE_NEWER_THAN_SECURITY package ${SUITE} security
+	print_table "Packages which need to be updated in debian-edu/${SUITE}-test"  SECURITY_NEWER_THAN_STABLE_TEST package ${SUITE}-test security
+	print_table "Packages which are newer in our debian-edu/${SUITE}-test" STABLE_TEST_NEWER_THAN_SECURITY package ${SUITE}-test security
 	echo "<hr />"
 fi
-if [ "$NEEDS_POWERPC_ETCH_TEST" ] || [ "$NEEDS_POWERPC_ETCH" ] || [ "$NEEDS_AMD64_ETCH_TEST" ] || [ "$NEEDS_AMD64_ETCH" ] || [ "$NEEDS_I386_ETCH_TEST" ] || [ "$NEEDS_I386_ETCH" ]  ; then
+if [ "$NEEDS_POWERPC_STABLE_TEST" ] || [ "$NEEDS_POWERPC_STABLE" ] || [ "$NEEDS_AMD64_STABLE_TEST" ] || [ "$NEEDS_AMD64_STABLE" ] || [ "$NEEDS_I386_STABLE_TEST" ] || [ "$NEEDS_I386_STABLE" ]  ; then
 	echo "<h2>Architecture specific issues</h2>"
 	# ignore powerpc issues on wheezy
 	if [ "$SUITE" != wheezy ] ; then
-		print_table "Packages which needs build on debian-edu/${SUITE}-test/powerpc" NEEDS_POWERPC_ETCH_TEST package ${SUITE}-test powerpc
-		print_table "Packages which needs build on debian-edu/${SUITE}/powerpc" NEEDS_POWERPC_ETCH package ${SUITE} powerpc
+		print_table "Packages which needs build on debian-edu/${SUITE}-test/powerpc" NEEDS_POWERPC_STABLE_TEST package ${SUITE}-test powerpc
+		print_table "Packages which needs build on debian-edu/${SUITE}/powerpc" NEEDS_POWERPC_STABLE package ${SUITE} powerpc
 	fi
-	print_table "Packages which needs build on debian-edu/${SUITE}-test/amd64" NEEDS_AMD64_ETCH_TEST package ${SUITE}-test amd64
-	print_table "Packages which needs build on debian-edu/${SUITE}/amd64" NEEDS_AMD64_ETCH package ${SUITE} amd64
-	print_table "Packages which needs build on debian-edu/${SUITE}-test/i386" NEEDS_I386_ETCH_TEST package ${SUITE}-test i386
-	print_table "Packages which needs build on debian-edu/${SUITE}/i386" NEEDS_I386_ETCH package ${SUITE} i386
+	print_table "Packages which needs build on debian-edu/${SUITE}-test/amd64" NEEDS_AMD64_STABLE_TEST package ${SUITE}-test amd64
+	print_table "Packages which needs build on debian-edu/${SUITE}/amd64" NEEDS_AMD64_STABLE package ${SUITE} amd64
+	print_table "Packages which needs build on debian-edu/${SUITE}-test/i386" NEEDS_I386_STABLE_TEST package ${SUITE}-test i386
+	print_table "Packages which needs build on debian-edu/${SUITE}/i386" NEEDS_I386_STABLE package ${SUITE} i386
 	echo 'Examine <a href="https://buildd.debian.org/pkg.cgi?pkg=debian-edu&maint=&dist='${SUITE}'-edu">packages build status</a> here.'
 	echo "<hr />"
 fi
@@ -375,7 +377,7 @@
 	print_table "source ${SUITE}-test DVD" NONFREE_ON_TEST_SOURCE_DVD "non-free sources" 
 	echo "<hr />"
 fi
-if [ -z "$NEEDS_KATHA" ] && [ -z "$NOT_IN_ETCH" ] && [ -z "$NOT_IN_ETCH_TEST" ] && [ -z "$REMOVE_ETCH" ] && [ -z "$REMOVE_ETCH_TEST" ] && [ -z "$ETCH_NEWER" ] && [ -z "$ETCH_TEST_NEWER" ] && [ -z "$NOT_IN_DEBIAN" ] && [ -z "$SECURITY_NEWER_THAN_ETCH" ] && [ -z "$ETCH_NEWER_THAN_SECURITY" ] && [ -z "$SECURITY_NEWER_THAN_ETCH_TEST" ] && [ -z "$ETCH_TEST_NEWER_THAN_SECURITY" ] && [ -z "$NEEDS_POWERPC_ETCH_TEST" ] && [ -z "$NEEDS_POWERPC_ETCH" ] && [ -z "$NEEDS_AMD64_ETCH_TEST" ] && [ -z "$NEEDS_AMD64_ETCH" ] && [ -z "$NEEDS_I386_ETCH_TEST" ] && [ -z "$NEEDS_I386_ETCH" ] && [ -z "$NONFREE_ON_DVD" ] && [ -z "$NONFREE_ON_SOURCE_DVD" ] && [ -z "$NONFREE_ON_TEST_DVD" ] && [ -z "$NONFREE_ON_TEST_SOURCE_DVD" ] ; then 
+if [ -z "$NEEDS_KATHA" ] && [ -z "$NOT_IN_STABLE" ] && [ -z "$NOT_IN_STABLE_TEST" ] && [ -z "$REMOVE_STABLE" ] && [ -z "$REMOVE_STABLE_TEST" ] && [ -z "$STABLE_NEWER" ] && [ -z "$STABLE_TEST_NEWER" ] && [ -z "$NOT_IN_DEBIAN" ] && [ -z "$SECURITY_NEWER_THAN_STABLE" ] && [ -z "$STABLE_NEWER_THAN_SECURITY" ] && [ -z "$SECURITY_NEWER_THAN_STABLE_TEST" ] && [ -z "$STABLE_TEST_NEWER_THAN_SECURITY" ] && [ -z "$NEEDS_POWERPC_STABLE_TEST" ] && [ -z "$NEEDS_POWERPC_STABLE" ] && [ -z "$NEEDS_AMD64_STABLE_TEST" ] && [ -z "$NEEDS_AMD64_STABLE" ] && [ -z "$NEEDS_I386_STABLE_TEST" ] && [ -z "$NEEDS_I386_STABLE" ] && [ -z "$NONFREE_ON_DVD" ] && [ -z "$NONFREE_ON_SOURCE_DVD" ] && [ -z "$NONFREE_ON_TEST_DVD" ] && [ -z "$NONFREE_ON_TEST_SOURCE_DVD" ] ; then 
 	echo "<h2>Debian Edu ${SUITE} is 100% Debian ${SUITE}</h2>"
         echo "<p>Congratulations, now if only Debian ${SUITE} were released today and Debian Edu ${SUITE} were ready... ;-)</p>"
 	echo "<hr />"




More information about the debian-edu-commits mailing list