Index: trunk/third/common/invirtificator.sh
===================================================================
--- trunk/third/common/invirtificator.sh	(revision 2296)
+++ trunk/third/common/invirtificator.sh	(revision 2297)
@@ -1,8 +1,6 @@
-# Interface: define variables name, daversionappend, and function
+# Interface: define variables name, ivversionappend, and function
 # hack_package ().
 
 set -e
-
-: ${DEBATHENA_APT=/mit/debathena/apt}
 
 # Process arguments.
@@ -19,9 +17,7 @@
 dist=$(echo "$dist_arch" | sed 's/^\(.*\)-\([^-]*\)$/\1/')
 arch=$(echo "$dist_arch" | sed 's/^\(.*\)-\([^-]*\)$/\2/')
-: ${section=debathena-system}
-: ${daname=$name}
+: ${section=invirt-system}
+: ${ivname=$name}
 : ${release=-proposed}
-. /mit/debathena/bin/debian-versions.sh
-tag=$(gettag $dist)
 
 # Create a chroot and define functions for using it.
@@ -45,5 +41,5 @@
 	dch "$@"
     else
-	echo | dch -v"${daversion}" -D unstable "$@"
+	echo | dch -v"${ivversion}" -D unstable "$@"
 	dch_done=1
     fi
@@ -58,14 +54,14 @@
 }
 
-add_debathena_provides () {
-    [ "$name" = "$daname" ]
-    perl -0pe 's/^(Package: (.*)\n(?:(?!Provides:).+\n)*)(?:Provides: (.*)\n((?:.+\n)*))?(?=\n|\z)/$1Provides: $3, debathena-$2\n$4/mg or die; s/^Provides: , /Provides: /mg' -i debian/control
-    add_changelog "Provide debathena-$name."
+add_invirt_provides () {
+    [ "$name" = "$ivname" ]
+    perl -0pe 's/^(Package: (.*)\n(?:(?!Provides:).+\n)*)(?:Provides: (.*)\n((?:.+\n)*))?(?=\n|\z)/$1Provides: $3, invirt-$2\n$4/mg or die; s/^Provides: , /Provides: /mg' -i debian/control
+    add_changelog "Provide invirt-$name."
 }
 
 rename_source () {
-    perl -pe "s{^Source: $name\$}{Source: $daname}" -i debian/control
-    add_changelog "Rename package to $daname."
-    perl -0pe "s/^$name/$daname/" -i debian/changelog
+    perl -pe "s{^Source: $name\$}{Source: $ivname}" -i debian/control
+    add_changelog "Rename package to $ivname."
+    perl -0pe "s/^$name/$ivname/" -i debian/changelog
 }
 
@@ -75,5 +71,5 @@
 	return
     fi
-    echo "Building source for $daname-$daversion on $dist_arch" >&2
+    echo "Building source for $ivname-$ivversion on $dist_arch" >&2
     
     if ! [ -e "${name}_$version.dsc" ]; then
@@ -81,7 +77,7 @@
     fi
     
-    if ! [ -e "${daname}_$daversion.dsc" ]; then
+    if ! [ -e "${ivname}_$ivversion.dsc" ]; then
 	(
-	    tmpdir=$(mktemp -td "debathenify.$$.XXXXXXXXXX")
+	    tmpdir=$(mktemp -td "invirtify.$$.XXXXXXXXXX")
 	    trap 'rm -rf "$tmpdir"' EXIT
 	    origversion=$(echo "$version" | sed 's/-[^-]*$//')
@@ -93,18 +89,18 @@
 	    dch_done=
 	    hack_package
-            if [ "$name" != "$daname" ]; then
+            if [ "$name" != "$ivname" ]; then
                 rename_source
-                cp -a "$tmpdir/${name}_$origversion.orig.tar.gz" "$tmpdir/${daname}_$origversion.orig.tar.gz"
-                cp -a "$tmpdir/${daname}_$origversion.orig.tar.gz" "$dscdir"
+                cp -a "$tmpdir/${name}_$origversion.orig.tar.gz" "$tmpdir/${ivname}_$origversion.orig.tar.gz"
+                cp -a "$tmpdir/${ivname}_$origversion.orig.tar.gz" "$dscdir"
             fi
 	    [ -n "$dch_done" ]
 	    schr apt-get -q -y install devscripts pbuilder
 	    schr /usr/lib/pbuilder/pbuilder-satisfydepends
-	    sch debuild -S -sa -us -uc -i -I.svn && cp -a "../${daname}_$daversion"* "$dscdir"
+	    sch debuild -S -sa -us -uc -i -I.svn && cp -a "../${ivname}_$ivversion"* "$dscdir"
 	)
 	[ $? -eq 0 ] || exit 1
 	
-	if [ -n "$DA_CHECK_DIFFS" ]; then
-	    interdiff -z "${name}_$version.diff.gz" "${daname}_$daversion.diff.gz" | \
+	if [ -n "$IV_CHECK_DIFFS" ]; then
+	    interdiff -z "${name}_$version.diff.gz" "${ivname}_$ivversion.diff.gz" | \
 		enscript --color --language=ansi --highlight=diffu --output=- -q | \
 		less -R
@@ -116,5 +112,5 @@
 
 cmd_binary () {
-    sbuildhack "$dist_arch" $a "${daname}_$daversion.dsc"
+    sbuildhack "$dist_arch" $a "${ivname}_$ivversion.dsc"
 }
 
@@ -125,11 +121,8 @@
 
 cmd_upload () {
-    REPREPRO="v reprepro -Vb $DEBATHENA_APT"
-    REPREPROI="$REPREPRO --ignore=wrongdistribution --ignore=missingfield"
-
     if [ "$a" = "-A" ]; then
-	$REPREPROI include "${dist}${release}" "${daname}_${daversion}_source.changes"
+	v reprepro-env include "${dist}${release}" "${ivname}_${ivversion}_source.changes"
     fi
-    $REPREPROI include "${dist}${release}" "${daname}_${daversion}${tag}_${arch}.changes"
+    v reprepro-env include "${dist}${release}" "${ivname}_${ivversion}_${arch}.changes"
 }
 
@@ -139,5 +132,5 @@
 	version='~~~'
 	while read -r newversion; do
-	    if [ $(expr "$newversion" : '.*debathena') = 0 ] && \
+	    if [ $(expr "$newversion" : '.*invirt') = 0 ] && \
 		dpkg --compare-versions "$newversion" '>' "$version"; then
 		version=$newversion
@@ -151,5 +144,5 @@
 	)
     )
-daversion=$version$daversionappend
+ivversion=$version$ivversionappend
 
 # Look for binary packages built from the named package with the right
@@ -158,12 +151,12 @@
 # Source: or a Package: header matching $name since there is no
 # Source: header for a package whose name matches its source.
-pkgfiles="$DEBATHENA_APT/dists/$dist/$section/binary-$arch/Packages.gz $DEBATHENA_APT/dists/${dist}-proposed/$section/binary-$arch/Packages.gz"
-if { zcat $pkgfiles | \
-    dpkg-awk -f - "Package:^$daname\$" "Version:^$(quote "$daversion$tag")\$" -- Architecture;
+pkgfile="/srv/repository/dists/$dist/$section/binary-$arch/Packages.gz"
+if { zcat "$pkgfile" | \
+    dpkg-awk -f - "Package:^$ivname\$" "Version:^$(quote "$ivversion")\$" -- Architecture;
     zcat $pkgfiles | \
-    dpkg-awk -f - "Source:^$daname\$" "Version:^$(quote "$daversion$tag")\$" -- Architecture; } \
+    dpkg-awk -f - "Source:^$ivname\$" "Version:^$(quote "$ivversion")\$" -- Architecture; } \
     | if [ "$a" = "-A" ]; then cat; else fgrep -vx 'Architecture: all'; fi \
     | grep -q .; then
-    echo "$daname $daversion already exists for $dist_arch." >&2
+    echo "$ivname $ivversion already exists for $dist_arch." >&2
     exit 0
 fi