[27046] in Source-Commits
/svn/athena r25912 - trunk/athena/bin/machtype/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Apr 10 14:26:09 2013
Date: Wed, 10 Apr 2013 14:26:02 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201304101826.r3AIQ2a0025874@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2013-04-10 14:26:02 -0400 (Wed, 10 Apr 2013)
New Revision: 25912
Modified:
trunk/athena/bin/machtype/debian/changelog
trunk/athena/bin/machtype/debian/rules
Log:
In machtype:
* Pretend to support Raring.
* Kill i386_linux24 and i386_rhel3 on things that are Wheezy or newer
(Trac: #338)
Modified: trunk/athena/bin/machtype/debian/changelog
===================================================================
--- trunk/athena/bin/machtype/debian/changelog 2013-04-09 23:49:05 UTC (rev 25911)
+++ trunk/athena/bin/machtype/debian/changelog 2013-04-10 18:26:02 UTC (rev 25912)
@@ -1,10 +1,13 @@
-debathena-machtype (10.2) UNRELEASED; urgency=low
+debathena-machtype (10.2) unstable; urgency=low
* Switch from control.in to control (Trac: #561)
* Bump Standards-Version to 3.9.3
* Bump compat level to 7
+ * Pretend to support Raring.
+ * Kill i386_linux24 and i386_rhel3 on things that are Wheezy or newer
+ (Trac: #338)
- -- Jonathan Reed <jdreed@mit.edu> Wed, 03 Apr 2013 13:59:51 -0400
+ -- Jonathan Reed <jdreed@mit.edu> Wed, 10 Apr 2013 14:25:45 -0400
debathena-machtype (10.1) unstable; urgency=low
Modified: trunk/athena/bin/machtype/debian/rules
===================================================================
--- trunk/athena/bin/machtype/debian/rules 2013-04-09 23:49:05 UTC (rev 25911)
+++ trunk/athena/bin/machtype/debian/rules 2013-04-10 18:26:02 UTC (rev 25912)
@@ -28,6 +28,14 @@
# chronological order, e.g., Debian 6.0 released before Ubuntu 11.04,
# but after its DebianImportFreeze.)
+# Wheezy has had like 3 freezes, all before raring's DIF, so
+# who knows if this order is right.
+ifeq ($(DISTRO),Ubuntu)
+ ifeq ($(call compare_ubuntu_version,13.04),y)
+ SYS_COMPAT += $(call arch_sysnames,amd64_ubuntu1210,i386_ubuntu1210)
+ endif
+endif
+
ifeq ($(call compare_debian_version,7),y)
SYS_COMPAT += $(call arch_sysnames,amd64_deb70,i386_deb70)
endif
@@ -84,7 +92,9 @@
SYS_COMPAT += $(call arch_sysnames,amd64_deb40,i386_deb40 i386_rhel4)
endif
-SYS_COMPAT += i386_rhel3 i386_linux24
+ifneq ($(call compare_debian_version,7),y)
+ SYS_COMPAT += i386_rhel3 i386_linux24
+endif
OPENAFS_VERSION := $(shell dpkg-query --showformat='$${Version}' --show openafs-client)
MAX_SYSNAMES_PLUS_ONE := $(if $(shell dpkg --compare-versions $(OPENAFS_VERSION) '>=' '1.4.12+dfsg-3~' && echo y),33,17)
