[23089] in Source-Commits
/svn/athena r22752 - trunk/debathena/meta/athena-libraries/debian
daemon@ATHENA.MIT.EDU (ghudson@MIT.EDU)
Thu Feb 14 14:33:55 2008
Date: Thu, 14 Feb 2008 14:33:24 -0500 (EST)
From: ghudson@MIT.EDU
Message-Id: <200802141933.OAA03460@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: ghudson
Date: 2008-02-14 14:33:23 -0500 (Thu, 14 Feb 2008)
New Revision: 22752
Modified:
trunk/debathena/meta/athena-libraries/debian/changelog
trunk/debathena/meta/athena-libraries/debian/rules
Log:
Fix a debthena-athena-libraries build failure on dapper-amd64.
* debathena/meta/athena-libraries/debian/rules: Don't run aptitude
with no arguments.
Modified: trunk/debathena/meta/athena-libraries/debian/changelog
===================================================================
--- trunk/debathena/meta/athena-libraries/debian/changelog 2008-02-13 22:41:21 UTC (rev 22751)
+++ trunk/debathena/meta/athena-libraries/debian/changelog 2008-02-14 19:33:23 UTC (rev 22752)
@@ -1,3 +1,9 @@
+debathena-athena-libraries (1.0debathena2) unstable; urgency=low
+
+ * Avoid calling aptitude with no arguments.
+
+ -- Greg Hudson <ghudson@equal-rites.mit.edu> Thu, 14 Feb 2008 14:29:58 -0500
+
debathena-athena-libraries (1.0debathena1) unstable; urgency=low
* Only recommend libgl1 instead of its three conflicting flavors.
Modified: trunk/debathena/meta/athena-libraries/debian/rules
===================================================================
--- trunk/debathena/meta/athena-libraries/debian/rules 2008-02-13 22:41:21 UTC (rev 22751)
+++ trunk/debathena/meta/athena-libraries/debian/rules 2008-02-14 19:33:23 UTC (rev 22752)
@@ -32,8 +32,8 @@
))" | \
sort -u | \
perl -pe 'chomp; s/(\W)/\\$$1/g; s/^(.*)$$/~n^$$1\$$!~Rconflicts:(~Dreplaces:(~n^$$1\$$~VCANDIDATE)~Dconflicts:(~n^$$1\$$~VCANDIDATE))/; s/$$/\0/' | \
- xargs -0 -t $(APTITUDE) -F '%p' search | \
- (cd $@/archives; xargs -t $(APTITUDE) download)
+ xargs -0 -r -t $(APTITUDE) -F '%p' search | \
+ (cd $@/archives; xargs -r -t $(APTITUDE) download)
$(APTITUDE_STATE):
mkdir -p $@
