[26172] in Source-Commits
/svn/athena r25436 - trunk/athena/bin/machtype/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Fri Oct 28 17:31:45 2011
Date: Fri, 28 Oct 2011 17:31:43 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201110282131.p9SLVh7o004004@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-10-28 17:31:43 -0400 (Fri, 28 Oct 2011)
New Revision: 25436
Modified:
trunk/athena/bin/machtype/debian/changelog
trunk/athena/bin/machtype/debian/rules
Log:
In machtype:
* Support Ubuntu 12.04.
Modified: trunk/athena/bin/machtype/debian/changelog
===================================================================
--- trunk/athena/bin/machtype/debian/changelog 2011-10-28 20:59:00 UTC (rev 25435)
+++ trunk/athena/bin/machtype/debian/changelog 2011-10-28 21:31:43 UTC (rev 25436)
@@ -1,3 +1,9 @@
+debathena-machtype (10.0.2-0debathena6) unstable; urgency=low
+
+ * Support Ubuntu 12.04.
+
+ -- Jonathan Reed <jdreed@mit.edu> Fri, 28 Oct 2011 17:31:33 -0400
+
debathena-machtype (10.0.2-0debathena5) unstable; urgency=low
* Support Debian 6.0 and Ubuntu 11.10.
Modified: trunk/athena/bin/machtype/debian/rules
===================================================================
--- trunk/athena/bin/machtype/debian/rules 2011-10-28 20:59:00 UTC (rev 25435)
+++ trunk/athena/bin/machtype/debian/rules 2011-10-28 21:31:43 UTC (rev 25436)
@@ -29,6 +29,9 @@
# but after its DebianImportFreeze.)
ifeq ($(DISTRO),Ubuntu)
+ ifeq ($(call compare_ubuntu_version,12.04),y)
+ SYS_COMPAT += $(call arch_sysnames,amd64_ubuntu1204,i386_ubuntu1204)
+ endif
ifeq ($(call compare_ubuntu_version,11.10),y)
SYS_COMPAT += $(call arch_sysnames,amd64_ubuntu1110,i386_ubuntu1110)
endif
