[25926] in Source-Commits
/svn/athena r25310 - trunk/debathena/meta/thirdparty-utilities/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Thu Jul 28 10:41:28 2011
Date: Thu, 28 Jul 2011 10:41:21 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201107281441.p6SEfLJA018700@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-07-28 10:41:21 -0400 (Thu, 28 Jul 2011)
New Revision: 25310
Modified:
trunk/debathena/meta/thirdparty-utilities/debian/changelog
trunk/debathena/meta/thirdparty-utilities/debian/control.in
trunk/debathena/meta/thirdparty-utilities/debian/rules
Log:
In thirdparty-utilities:
* Add dos2unix if it exists
* Add rlwrap
Modified: trunk/debathena/meta/thirdparty-utilities/debian/changelog
===================================================================
--- trunk/debathena/meta/thirdparty-utilities/debian/changelog 2011-07-28 13:48:38 UTC (rev 25309)
+++ trunk/debathena/meta/thirdparty-utilities/debian/changelog 2011-07-28 14:41:21 UTC (rev 25310)
@@ -1,8 +1,10 @@
debathena-thirdparty-utilities (1.0) unstable; urgency=low
* First non-equivs version
+ * Add dos2unix if it exists
+ * Add rlwrap
- -- Jonathan Reed <jdreed@mit.edu> Wed, 27 Jul 2011 15:33:51 -0400
+ -- Jonathan Reed <jdreed@mit.edu> Thu, 28 Jul 2011 10:41:15 -0400
debathena-thirdparty-utilities (0.4) unstable; urgency=low
Modified: trunk/debathena/meta/thirdparty-utilities/debian/control.in
===================================================================
--- trunk/debathena/meta/thirdparty-utilities/debian/control.in 2011-07-28 13:48:38 UTC (rev 25309)
+++ trunk/debathena/meta/thirdparty-utilities/debian/control.in 2011-07-28 14:41:21 UTC (rev 25310)
@@ -28,6 +28,8 @@
scratchbox2,
mtools,
dosemu,
+ rlwrap,
+ ${debathena-maybe-dos2unix},
${misc:Depends}
Description: Debathena metapackage for third-party utilities software
This includes a set of subpackages of commonly-used third-party software
Modified: trunk/debathena/meta/thirdparty-utilities/debian/rules
===================================================================
--- trunk/debathena/meta/thirdparty-utilities/debian/rules 2011-07-28 13:48:38 UTC (rev 25309)
+++ trunk/debathena/meta/thirdparty-utilities/debian/rules 2011-07-28 14:41:21 UTC (rev 25310)
@@ -1,3 +1,10 @@
#!/usr/bin/make -f
+HAVE_DOS2UNIX = $(shell apt-cache show dos2unix 2>/dev/null | grep -q '^Version:' && echo y)
+
+ifeq ($(HAVE_DOS2UNIX),y)
+ binary-predeb/debathena-thirdparty-utilities::
+ echo "debathena-maybe-dos2unix=dos2unix" >> debian/debathena-thirdparty-utilities.substvars
+endif
+
include /usr/share/cdbs/1/rules/debhelper.mk
