[23943] in Source-Commits

home help back first fref pref prev next nref lref last post

/svn/athena r23553 - trunk/debathena/scripts

daemon@ATHENA.MIT.EDU (Evan Broder)
Fri Mar 6 22:56:01 2009

Date: Fri, 6 Mar 2009 22:55:57 -0500
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200903070355.n273tv7F009799@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: broder
Date: 2009-03-06 22:55:57 -0500 (Fri, 06 Mar 2009)
New Revision: 23553

Added:
   trunk/debathena/scripts/daupload-dev
   trunk/debathena/scripts/daupload-proposed
Removed:
   trunk/debathena/scripts/daupload-beta
Modified:
   trunk/debathena/scripts/daupload-release
Log:
Remove daupload-beta and replace it with daupload-proposed and
daupload-dev.

Teach those scripts to upload into the newly formed -proposed and -dev
releases, instead of the separate apt-beta repository.


Deleted: trunk/debathena/scripts/daupload-beta

Added: trunk/debathena/scripts/daupload-dev
===================================================================
--- trunk/debathena/scripts/daupload-dev	2009-03-07 03:25:16 UTC (rev 23552)
+++ trunk/debathena/scripts/daupload-dev	2009-03-07 03:55:57 UTC (rev 23553)
@@ -0,0 +1 @@
+link daupload-release
\ No newline at end of file


Property changes on: trunk/debathena/scripts/daupload-dev
___________________________________________________________________
Name: svn:special
   + *

Added: trunk/debathena/scripts/daupload-proposed
===================================================================
--- trunk/debathena/scripts/daupload-proposed	2009-03-07 03:25:16 UTC (rev 23552)
+++ trunk/debathena/scripts/daupload-proposed	2009-03-07 03:55:57 UTC (rev 23553)
@@ -0,0 +1 @@
+link daupload-release
\ No newline at end of file


Property changes on: trunk/debathena/scripts/daupload-proposed
___________________________________________________________________
Name: svn:special
   + *

Modified: trunk/debathena/scripts/daupload-release
===================================================================
--- trunk/debathena/scripts/daupload-release	2009-03-07 03:25:16 UTC (rev 23552)
+++ trunk/debathena/scripts/daupload-release	2009-03-07 03:55:57 UTC (rev 23553)
@@ -2,13 +2,15 @@
 set -e
 
 # Usage: daupload-release [-A] [-S] CHANGESFILE
-#        daupload-beta [-A] [-S] CHANGESFILE
+#        daupload-proposed [-A] [-S] CHANGESFILE
+#        daupload-dev [-A] [-S] CHANGESFILE
 
 # After a package has been built for all Debian/Ubuntu versions and
 # platforms (typically using "da sbuildhack DSCFILE"), this script
-# uploads the package into the release or beta apt repository.  If -A
-# is specified, only one architecture per Debian/Ubuntu version is
-# uploaded.  If -S is specified, only the source package is uploaded.
+# uploads the package into the release, proposed, or beta apt
+# repository.  If -A is specified, only one architecture per
+# Debian/Ubuntu version is uploaded.  If -S is specified, only the
+# source package is uploaded.
 
 # Upon completion, moves all of the generated files into the "built"
 # subdirectory.
@@ -20,13 +22,16 @@
 
 case "$(basename "$0")" in
     daupload-release)
-	repo=$DEBATHENA_APT
+	release=""
 	;;
-    daupload-beta)
-	repo=${DEBATHENA_APT}-beta
+    daupload-proposed)
+        release="-proposed"
 	;;
+    daupload-dev)
+        release="-dev"
+        ;;
     *)
-	echo "Unknown repo." >&2
+	echo "Unknown release." >&2
 	exit 1
 	;;
 esac
@@ -91,18 +96,18 @@
     [ "$a" = "y" ]
 fi
 
-REPREPRO="v reprepro -Vb $repo"
+REPREPRO="v reprepro -Vb $DEBATHENA_APT"
 REPREPROI="$REPREPRO --ignore=wrongdistribution"
 
 for code in $DEBIAN_CODES; do
-    $REPREPROI include "$code" "$change"
+    $REPREPROI include "${code}${release}" "$change"
 done
 
 if [ $S -ne 1 ]; then
     for code in $DEBIAN_CODES; do
 	tag=$(gettag "$code")
-	[ $A -eq 1 ] || $REPREPRO include "$code" "${base}${tag}_i386.changes"
-	$REPREPRO include "$code" "${base}${tag}_amd64.changes"
+	[ $A -eq 1 ] || $REPREPROI include "${code}${release}" "${base}${tag}_i386.changes"
+	$REPREPROI include "${code}${release}" "${base}${tag}_amd64.changes"
     done
 fi
 


home help back first fref pref prev next nref lref last post