[23467] in Source-Commits
/svn/athena r23116 - trunk/debathena/scripts
daemon@ATHENA.MIT.EDU (ghudson@MIT.EDU)
Tue Jul 29 13:44:19 2008
Date: Tue, 29 Jul 2008 13:43:47 -0400 (EDT)
From: ghudson@MIT.EDU
Message-Id: <200807291743.NAA18788@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: ghudson
Date: 2008-07-29 13:43:46 -0400 (Tue, 29 Jul 2008)
New Revision: 23116
Modified:
trunk/debathena/scripts/gen-packages
Log:
Special-case gdm-config in gen-packages to handle the SIPB/Athena10
fork.
Modified: trunk/debathena/scripts/gen-packages
===================================================================
--- trunk/debathena/scripts/gen-packages 2008-07-29 16:33:33 UTC (rev 23115)
+++ trunk/debathena/scripts/gen-packages 2008-07-29 17:43:46 UTC (rev 23116)
@@ -68,7 +68,20 @@
done
fi
+# Athena 10 uses a different version of gdm-config from SIPB. Using
+# DEBATHENA_APT to distinguish between the two is a little hackish,
+# but it's what we've got. We're setting $gdm to the location we want
+# to filter out, not the path we want to keep.
+case $DEBATHENA_APT in
+*athena10*)
+ gdm=' debathena/config/gdm-config$'
+ ;;
+*)
+ gdm=' debathena/config/gdm-config-athena10$'
+ ;;
+esac
+
# cyrus-sasl2-mit has a debian dir but is really a debathenify package.
# config-package dev has some example packages we want to filter out.
-sort packages.unsorted | egrep -v 'cyrus-sasl2-mit|/examples/' > packages
+sort packages.unsorted | egrep -v "cyrus-sasl2-mit|/examples/|$gdm" > packages
rm -f packages.unsorted
