[28351] in Source-Commits
debathena-thirdparty commit: Add smlnj, python-qt4, python-qt4-dev
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Mon Jul 28 16:32:21 2014
Date: Mon, 28 Jul 2014 16:32:13 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201407282032.s6SKWD6A026308@drugstore.mit.edu>
To: source-commits@MIT.EDU
https://github.com/mit-athena/debathena-thirdparty/commit/8619d84981bed899d7cc8533cc9b08954958c7af
commit 8619d84981bed899d7cc8533cc9b08954958c7af
Author: Jonathan Reed <jdreed@mit.edu>
Date: Mon Jul 28 15:11:19 2014 -0400
Add smlnj, python-qt4, python-qt4-dev
- Remove 4 lines of stray whitespace from end of common file
- Per alexp: (Trac: #1457)
- Add smlnj (on Trusty only; not present in Precise)
- Add python-qt4 and python-qt4-dev
debian/changelog | 7 +++++++
lists/common | 6 ++----
lists/trusty | 1 +
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 503a1e7..6624f39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debathena-thirdparty (1.2.5) UNRELEASED; urgency=low
+
+ * Add smlnj for Trusty (Trac: #1457)
+ * Add python-qt4 and python-qt4-dev (Trac: #1457)
+
+ -- Jonathan Reed <jdreed@mit.edu> Mon, 28 Jul 2014 15:06:59 -0400
+
debathena-thirdparty (1.2.4) unstable; urgency=low
* Drop maxima-emacs on Precise, because of dependency resolution issues
diff --git a/lists/common b/lists/common
index 790791b..bd6efd9 100644
--- a/lists/common
+++ b/lists/common
@@ -336,7 +336,5 @@ dosemu
rlwrap
ksh
dos2unix
-
-
-
-
+python-qt4
+python-qt4-dev
diff --git a/lists/trusty b/lists/trusty
index ab6cbda..b377dd3 100644
--- a/lists/trusty
+++ b/lists/trusty
@@ -1,2 +1,3 @@
-guile-1.8-dev
guile-2.0-dev
+smlnj
