[23582] in Source-Commits
/svn/athena r23223 - trunk/athena/bin/machtype/debian
daemon@ATHENA.MIT.EDU (andersk@MIT.EDU)
Fri Oct 31 17:09:25 2008
Date: Fri, 31 Oct 2008 17:08:53 -0400 (EDT)
From: andersk@MIT.EDU
Message-Id: <200810312108.RAA11115@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: andersk
Date: 2008-10-31 17:08:52 -0400 (Fri, 31 Oct 2008)
New Revision: 23223
Modified:
trunk/athena/bin/machtype/debian/changelog
trunk/athena/bin/machtype/debian/rules
Log:
In machtype:
* Bump `machtype -A` to 10.0.
* Add i386_deb50 and amd64_deb50 sysnames, starting with Lenny and
Intrepid.
Modified: trunk/athena/bin/machtype/debian/changelog
===================================================================
--- trunk/athena/bin/machtype/debian/changelog 2008-10-31 21:04:29 UTC (rev 23222)
+++ trunk/athena/bin/machtype/debian/changelog 2008-10-31 21:08:52 UTC (rev 23223)
@@ -1,3 +1,11 @@
+debathena-machtype (10.0.0-0debathena2) unstable; urgency=low
+
+ * Bump `machtype -A` to 10.0.
+ * Add i386_deb50 and amd64_deb50 sysnames, starting with Lenny and
+ Intrepid.
+
+ -- Anders Kaseorg <andersk@mit.edu> Fri, 31 Oct 2008 17:07:50 -0400
+
debathena-machtype (10.0.0-0debathena1) unstable; urgency=low
* Merged quilt patches into mainline Athena tree
Modified: trunk/athena/bin/machtype/debian/rules
===================================================================
--- trunk/athena/bin/machtype/debian/rules 2008-10-31 21:04:29 UTC (rev 23222)
+++ trunk/athena/bin/machtype/debian/rules 2008-10-31 21:08:52 UTC (rev 23223)
@@ -5,8 +5,8 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
-ATHENA_MAJOR_VERSION = 9
-ATHENA_MINOR_VERSION = 4
+ATHENA_MAJOR_VERSION = 10
+ATHENA_MINOR_VERSION = 0
DEBIAN_VERSION = $(shell dpkg-query --showformat='$${Version}' --show base-files)
@@ -16,6 +16,18 @@
$(error Debian version $(DEBIAN_VERSION) is too old)
endif
+ifeq ($(shell dpkg --compare-versions $(DEBIAN_VERSION) '>=' '4.0.4' && echo y),y)
+ ifeq ($(DEB_BUILD_ARCH),amd64)
+ SYS_COMPAT += amd64_deb50 i386_deb50
+ else
+ ifeq ($(DEB_BUILD_ARCH),i386)
+ SYS_COMPAT += i386_deb50
+ else
+ $(error Unrecognized architecture $(DEB_BUILD_ARCH))
+ endif
+ endif
+endif
+
ifeq ($(shell dpkg --compare-versions $(DEBIAN_VERSION) '>=' '4' && echo y),y)
ifeq ($(DEB_BUILD_ARCH),amd64)
SYS_COMPAT += amd64_deb40 i386_deb40 i386_rhel4
