[26323] in Source-Commits
Re: /svn/athena r25061 - in trunk/debathena/debathena/config-package-dev:
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Mon May 21 02:52:42 2012
Date: Mon, 21 May 2012 02:52:40 -0400 (EDT)
From: Geoffrey Thomas <geofft@MIT.EDU>
To: Anders Kaseorg <andersk@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <4FB9DCA8.4050709@mit.edu>
Message-ID: <alpine.DEB.2.00.1205210246060.19477@dr-wily.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
On Mon, 21 May 2012, Anders Kaseorg wrote:
> On 05/17/2012 12:43 AM, Geoffrey Thomas wrote:
>> Shouldn't this be testing for DH_COMPAT at least 6, not 5?
>
> Yeah. Fixed in
> http://andersk.mit.edu/gitweb/config-package-dev.git/commitdiff/9350e97
Thanks; rebased in-progress debhelper stuff on
git://ldpreload.com/config-package-dev.git (you probably don't care yet).
> Do we have anything else to fix for config-package-dev 4.14?
I haven't yet gone through the non-divert.mk stuff as carefully (i.e.,
haven't rewritten those in perl yet); I vaguely expect to do so in the
next, say, two weeks. If you're doing a release particularly soon, though,
you may want this portion of a commit in my repo to fix two minor comment
bugs that I noticed after I'd copied the CDBS comments into the Debhelper
version:
geofft@leveret:~/src/debathena/config-package-dev$ git show fff6744a30944be1e686a3d58c5ebc7d7d4d2a33 divert.mk
commit fff6744a30944be1e686a3d58c5ebc7d7d4d2a33
Author: Geoffrey Thomas <geofft@mit.edu>
Date: Mon May 21 02:49:21 2012 -0400
Fix some comments.
diff --git a/divert.mk b/divert.mk
index 577021d..d352554 100644
--- a/divert.mk
+++ b/divert.mk
@@ -53,7 +53,7 @@ endif
# foo.divert.divert-orig
divert_files_replace_name = $(shell echo $(1) | perl -pe
's/(.*)\Q$(DEB_DIVERT_EXTENSION)\E/$$1$(2)/')
-# Transform a full path into the path it should be diverted to if it's
+# Encode a full path into the path it should be diverted to if it's
# removed
remove_files_name = /usr/share/$(cdbs_curpkg)/$(shell $(DEB_DIVERT_ENCODER) $(1))
@@ -117,8 +117,8 @@ $(patsubst %,debian-divert/%,$(DEB_DIVERT_PACKAGES))
:: debian-divert/%:
# and Conflicts: lists. This prevents two packages diverting the same
# file from being installed simultaneously (it cannot work, and this
# produces a much less ugly error). Requires in debian/control:
-# Provides: $(diverted-files)
-# Conflicts: $(diverted-files)
+# Provides: ${diverted-files}
+# Conflicts: ${diverted-files}
set -e; \
{ \
echo -n "diverted-files="; \
--
Geoffrey Thomas
geofft@mit.edu
