[25578] in Source-Commits
/svn/athena r25096 - trunk/athena/bin/machtype/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Apr 20 18:03:13 2011
Date: Wed, 20 Apr 2011 18:03:06 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201104202203.p3KM36mC025479@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-04-20 18:03:06 -0400 (Wed, 20 Apr 2011)
New Revision: 25096
Modified:
trunk/athena/bin/machtype/debian/changelog
trunk/athena/bin/machtype/debian/rules
Log:
In machtype:
* Support Ubuntu 11.04 (Trac #853)
Modified: trunk/athena/bin/machtype/debian/changelog
===================================================================
--- trunk/athena/bin/machtype/debian/changelog 2011-04-20 19:45:30 UTC (rev 25095)
+++ trunk/athena/bin/machtype/debian/changelog 2011-04-20 22:03:06 UTC (rev 25096)
@@ -1,3 +1,9 @@
+debathena-machtype (10.0.2-0debathena4) unstable; urgency=low
+
+ * Support Ubuntu 11.04 (Trac #853)
+
+ -- Jonathan Reed <jdreed@mit.edu> Wed, 20 Apr 2011 18:02:19 -0400
+
debathena-machtype (10.0.2-0debathena3) unstable; urgency=low
* Support Ubuntu 10.10.
Modified: trunk/athena/bin/machtype/debian/rules
===================================================================
--- trunk/athena/bin/machtype/debian/rules 2011-04-20 19:45:30 UTC (rev 25095)
+++ trunk/athena/bin/machtype/debian/rules 2011-04-20 22:03:06 UTC (rev 25096)
@@ -24,6 +24,10 @@
endif
ifeq ($(DISTRO),Ubuntu)
+ ifeq ($(call compare_ubuntu_version,11.04),y)
+ SYS_COMPAT += $(call arch_sysnames,amd64_ubuntu1104,i386_ubuntu1104)
+ endif
+
ifeq ($(call compare_ubuntu_version,10.10),y)
SYS_COMPAT += $(call arch_sysnames,amd64_ubuntu1010,i386_ubuntu1010)
endif