[25315] in Source-Commits
/svn/athena r24896 - trunk/athena/bin/machtype/debian
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Wed Oct 13 20:11:24 2010
Date: Wed, 13 Oct 2010 20:11:18 -0400
From: Geoffrey Thomas <geofft@MIT.EDU>
Message-Id: <201010140011.o9E0BIAW004187@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: geofft
Date: 2010-10-13 20:11:18 -0400 (Wed, 13 Oct 2010)
New Revision: 24896
Modified:
trunk/athena/bin/machtype/debian/changelog
trunk/athena/bin/machtype/debian/rules
Log:
In machtype:
* Support Ubuntu 10.10.
Modified: trunk/athena/bin/machtype/debian/changelog
===================================================================
--- trunk/athena/bin/machtype/debian/changelog 2010-10-13 19:01:37 UTC (rev 24895)
+++ trunk/athena/bin/machtype/debian/changelog 2010-10-14 00:11:18 UTC (rev 24896)
@@ -1,3 +1,9 @@
+debathena-machtype (10.0.2-0debathena3) unstable; urgency=low
+
+ * Support Ubuntu 10.10.
+
+ -- Geoffrey Thomas <geofft@mit.edu> Wed, 13 Oct 2010 20:10:48 -0400
+
debathena-machtype (10.0.2-0debathena2) unstable; urgency=low
* Functionalize logic for determining arch-specific sysnames.
Modified: trunk/athena/bin/machtype/debian/rules
===================================================================
--- trunk/athena/bin/machtype/debian/rules 2010-10-13 19:01:37 UTC (rev 24895)
+++ trunk/athena/bin/machtype/debian/rules 2010-10-14 00:11:18 UTC (rev 24896)
@@ -24,6 +24,10 @@
endif
ifeq ($(DISTRO),Ubuntu)
+ ifeq ($(call compare_ubuntu_version,10.10),y)
+ SYS_COMPAT += $(call arch_sysnames,amd64_ubuntu1010,i386_ubuntu1010)
+ endif
+
ifeq ($(call compare_ubuntu_version,10.04),y)
SYS_COMPAT += $(call arch_sysnames,amd64_ubuntu1004,i386_ubuntu1004)
endif
