[23323] in Source-Commits
/svn/athena r22977 - in trunk/debathena/scripts: . build-server/sources.list.d/debian
daemon@ATHENA.MIT.EDU (broder@MIT.EDU)
Thu May 22 20:32:11 2008
Date: Thu, 22 May 2008 20:31:38 -0400 (EDT)
From: broder@MIT.EDU
Message-Id: <200805230031.UAA00980@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2008-05-22 20:31:37 -0400 (Thu, 22 May 2008)
New Revision: 22977
Removed:
trunk/debathena/scripts/build-server/sources.list.d/debian/sarge.list
Modified:
trunk/debathena/scripts/all-schroots
trunk/debathena/scripts/da
trunk/debathena/scripts/daupload-release
trunk/debathena/scripts/debian-versions.sh
Log:
Desupport Sarge - the new version of sbuild doesn't play nice with sarge, and
we don't care enough to fix it
Modified: trunk/debathena/scripts/all-schroots
===================================================================
--- trunk/debathena/scripts/all-schroots 2008-05-18 02:43:53 UTC (rev 22976)
+++ trunk/debathena/scripts/all-schroots 2008-05-23 00:31:37 UTC (rev 22977)
@@ -18,11 +18,7 @@
shift
prog=$1; shift
for code in "$DEBIAN_CODES"; do
- if [ "$code" = "sarge" ]; then
- $prog sarge-i386-sbuild "$@"
- else
- $prog ${code}-amd64-sbuild "$@"
- fi
+ $prog ${code}-amd64-sbuild "$@"
done
else
@@ -30,12 +26,8 @@
prog=$1; shift
for code in "$DEBIAN_CODES"; do
- if [ "$code" = "sarge" ]; then
- $prog sarge-i386-sbuild-source "$@"
- else
- $prog ${code}-i386-sbuild-source "$@"
- $prog ${code}-amd64-sbuild-source "$@"
- fi
+ $prog ${code}-i386-sbuild-source "$@"
+ $prog ${code}-amd64-sbuild-source "$@"
done
fi
Deleted: trunk/debathena/scripts/build-server/sources.list.d/debian/sarge.list
Modified: trunk/debathena/scripts/da
===================================================================
--- trunk/debathena/scripts/da 2008-05-18 02:43:53 UTC (rev 22976)
+++ trunk/debathena/scripts/da 2008-05-23 00:31:37 UTC (rev 22977)
@@ -53,10 +53,6 @@
}
for code in $DEBIAN_CODES; do
- if [ "$code" = "sarge" ]; then
- t sarge-i386 -A "$@"
- continue
- fi
t "$code"-amd64 -A "$@"
[ $A -eq 1 ] || t "$code"-i386 "$@"
done
Modified: trunk/debathena/scripts/daupload-release
===================================================================
--- trunk/debathena/scripts/daupload-release 2008-05-18 02:43:53 UTC (rev 22976)
+++ trunk/debathena/scripts/daupload-release 2008-05-23 00:31:37 UTC (rev 22977)
@@ -55,30 +55,18 @@
[ -s "$change" ]
if [ $S -ne 1 ]; then
for code in $DEBIAN_CODES; do
- if [ "$code" = "sarge" ]; then
- check "$base~debian3.1_i386.changes"
- else
- tag=$(gettag "$code")
- check "${base}${tag}_amd64.changes"
- fi
+ tag=$(gettag "$code")
+ check "${base}${tag}_amd64.changes"
done
if [ $A -eq 1 ]; then
for code in $DEBIAN_CODES; do
- if [ "$code" = "sarge" ]; then
- true;
- else
- tag=$(gettag "$code")
- uncheck "${base}${tag}_i386.changes"
- fi
+ tag=$(gettag "$code")
+ uncheck "${base}${tag}_i386.changes"
done
else
for code in $DEBIAN_CODES; do
- if [ "$code" = "sarge" ]; then
- true;
- else
- tag=$(gettag "$code")
- check "${base}${tag}_i386.changes"
- fi
+ tag=$(gettag "$code")
+ check "${base}${tag}_i386.changes"
done
fi
fi
@@ -99,25 +87,17 @@
if [ $S -ne 1 ]; then
for code in $DEBIAN_CODES; do
- if [ "$code" = "sarge" ]; then
- $REPREPRO include sarge "$base~debian3.1_i386.changes"
- else
- tag=$(gettag "$code")
- [ $A -eq 1 ] || $REPREPRO include "$code" "${base}${tag}_i386.changes"
- $REPREPRO include "$code" "${base}${tag}_amd64.changes"
- fi
+ tag=$(gettag "$code")
+ [ $A -eq 1 ] || $REPREPRO include "$code" "${base}${tag}_i386.changes"
+ $REPREPRO include "$code" "${base}${tag}_amd64.changes"
done
fi
changes=$change
for code in $DEBIAN_CODES; do
- if [ "$code" = "sarge" ]; then
- changes=$changes\ $base~debian3.1_i386.changes
- else
- tag=$(gettag "$code")
- [ $A -eq 1 ] || changes=$changes\ "${base}${tag}"_i386.changes
- changes=$changes\ "${base}${tag}"_amd64.changes
- fi
+ tag=$(gettag "$code")
+ [ $A -eq 1 ] || changes=$changes\ "${base}${tag}"_i386.changes
+ changes=$changes\ "${base}${tag}"_amd64.changes
done
files=${change%.changes}.build\ $changes
Modified: trunk/debathena/scripts/debian-versions.sh
===================================================================
--- trunk/debathena/scripts/debian-versions.sh 2008-05-18 02:43:53 UTC (rev 22976)
+++ trunk/debathena/scripts/debian-versions.sh 2008-05-23 00:31:37 UTC (rev 22977)
@@ -1,10 +1,7 @@
#!/bin/sh
-DEBIAN_CODES="sarge etch lenny dapper edgy feisty gutsy hardy"
+DEBIAN_CODES="etch lenny dapper edgy feisty gutsy hardy"
gettag() {
case "$1" in
- sarge)
- echo "~debian3.1"
- ;;
etch)
echo "~debian4.0"
;;
