[28301] in Source-Commits
debathena-athena-libraries commit: Build 32-bit M-A: foreign version
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Sat Jul 5 14:20:40 2014
Date: Sat, 5 Jul 2014 14:20:33 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201407051820.s65IKXEQ010766@drugstore.mit.edu>
To: source-commits@MIT.EDU
https://github.com/mit-athena/debathena-athena-libraries/commit/c390924d261d5e1467a57ca112653b39699b92f5
commit c390924d261d5e1467a57ca112653b39699b92f5
Author: Jonathan Reed <jdreed@mit.edu>
Date: Thu Jul 3 10:03:13 2014 -0400
Build 32-bit M-A: foreign version
- Because ia32-libs is now gone, we need to build our
own i386 version, marked 'foreign', and pull in whatever
i386 things we need
- Make the main package now arch: any
- Clean up stray whitespace in control file
debian/changelog | 11 +++++++++++
debian/control | 24 ++++++++++++++++++++----
2 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9e1c3a0..5ce8e09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+debathena-athena-libraries (1.5) unstable; urgency=low
+
+ * Build a 32-bit Multi-Arch: foreign version
+ (debathena-athena-libraries-ia32), because we still have too much
+ 32-bit software (Trac: #931)
+ * debathena-athena-libraries becomes an arch: any package (for
+ multi-arch support) and add a disjunctive recommendation on the new
+ debathena-athena-libraries-ia32 package
+
+ -- Jonathan Reed <jdreed@mit.edu> Thu, 03 Jul 2014 11:04:13 -0400
+
debathena-athena-libraries (1.4) unstable; urgency=low
* Add git-buildpackage configuration
diff --git a/debian/control b/debian/control
index 8405def..a663628 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 7.0~)
Standards-Version: 3.9.3
Package: debathena-athena-libraries
-Architecture: all
+Architecture: any
Depends: ${misc:Depends}
Recommends: freeglut3,
guile-1.6-libs,
@@ -41,12 +41,28 @@ Recommends: freeglut3,
libutempter0,
libwrap0,
libgtksourceview1.0-0,
- ia32-libs
+ ia32-libs | debathena-athena-libraries-ia32
# Note: libgtksourceview1.0-0 was requested by alexp for
# Stata locker. It is gone in Oneiric+
# Note: Make some effort to figure out what exactly wants
-# libxss1 through libwrap0 and whether they're still needed
+# libxss1 through libwrap0 and whether they're still needed
Description: Athena libraries for Debathena
This metapackage recommends a set of libraries for compatibility with
older locker software. For simplicity, the package may recommend
- larger packages with both binaries and libraries.
\ No newline at end of file
+ larger packages with both binaries and libraries.
+
+Package: debathena-athena-libraries-ia32
+Architecture: i386
+Multi-Arch: foreign
+Depends: ${misc:Depends}
+Recommends: libgdk-pixbuf-2.0-0,
+ libgtk-2.0-0,
+ gtk2-engines-murrine,
+ libcanberra-gtk-module,
+ unity-gtk2-module,
+# Technically we also want overlay-scrollbar-gtk2, but it's broken
+# LP:1262022
+Description: 32-bit Athena libraries for Debathena
+ This metapackage recommends a set of libraries for compatibility with
+ older locker software. This particular package is the 32-bit version,
+ which can be used to satsify dependencies on amd64 and i386.
