[26762] in Source-Commits
/svn/athena r25739 - trunk/athena/bin/machtype/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Fri Aug 17 15:57:37 2012
Date: Fri, 17 Aug 2012 15:57:36 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201208171957.q7HJva7Q015901@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-08-17 15:57:36 -0400 (Fri, 17 Aug 2012)
New Revision: 25739
Modified:
trunk/athena/bin/machtype/debian/changelog
trunk/athena/bin/machtype/debian/rules
Log:
In machtype:
* Support Quantal and Wheezy
Modified: trunk/athena/bin/machtype/debian/changelog
===================================================================
--- trunk/athena/bin/machtype/debian/changelog 2012-08-17 18:48:58 UTC (rev 25738)
+++ trunk/athena/bin/machtype/debian/changelog 2012-08-17 19:57:36 UTC (rev 25739)
@@ -1,3 +1,9 @@
+debathena-machtype (10.1) unstable; urgency=low
+
+ * Support Quantal and Wheezy
+
+ -- Jonathan Reed <jdreed@mit.edu> Fri, 17 Aug 2012 15:57:27 -0400
+
debathena-machtype (10.0.2-0debathena7) unstable; urgency=low
* hostname -f can fail and grep -Fqxi '' can return true
Modified: trunk/athena/bin/machtype/debian/rules
===================================================================
--- trunk/athena/bin/machtype/debian/rules 2012-08-17 18:48:58 UTC (rev 25738)
+++ trunk/athena/bin/machtype/debian/rules 2012-08-17 19:57:36 UTC (rev 25739)
@@ -28,7 +28,14 @@
# chronological order, e.g., Debian 6.0 released before Ubuntu 11.04,
# but after its DebianImportFreeze.)
+ifeq ($(call compare_debian_version,7),y)
+ SYS_COMPAT += $(call arch_sysnames,amd64_deb70,i386_deb70)
+endif
+
ifeq ($(DISTRO),Ubuntu)
+ ifeq ($(call compare_ubuntu_version,12.10),y)
+ SYS_COMPAT += $(call arch_sysnames,amd64_ubuntu1210,i386_ubuntu1210)
+ endif
ifeq ($(call compare_ubuntu_version,12.04),y)
SYS_COMPAT += $(call arch_sysnames,amd64_ubuntu1204,i386_ubuntu1204)
endif
