Bug#699900: unblock: nsd3/3.2.12-2
Hi,
3.2.12-3 has the requested changes:
$ debdiff nsd3_3.2.12-2.dsc nsd3_3.2.12-3.dsc
diff -Nru nsd3-3.2.12/debian/changelog nsd3-3.2.12/debian/changelog
--- nsd3-3.2.12/debian/changelog 2013-02-06 14:16:06.000000000 +0100
+++ nsd3-3.2.12/debian/changelog 2013-02-19 13:23:22.000000000 +0100
@@ -1,3 +1,9 @@
+nsd3 (3.2.12-3) unstable; urgency=low
+
+ * Cleanup autoreconf -fi stuff in dh_auto_clean target
+
+ -- Ondřej Surý <ondrej@debian.org> Tue, 19 Feb 2013 13:11:59 +0100
+
nsd3 (3.2.12-2) unstable; urgency=low
* Add Response Rate Limiting patch (Courtesy of Matthijs Mekking of
NLnet Labs)
diff -Nru nsd3-3.2.12/debian/rules nsd3-3.2.12/debian/rules
--- nsd3-3.2.12/debian/rules 2013-02-06 14:16:06.000000000 +0100
+++ nsd3-3.2.12/debian/rules 2013-02-19 13:23:22.000000000 +0100
@@ -26,6 +26,8 @@
dh $@
override_dh_auto_configure:
+ -test \! -f debian/config.h.in && mv config.h.in debian/config.h.in
+ -test \! -f debian/configure && mv configure debian/configure
autoreconf -fi
dh_auto_configure -- \
--with-configdir=/etc/nsd3 \
@@ -40,6 +42,11 @@
--enable-mmap \
--enable-ratelimit
+override_dh_auto_clean:
+ dh_auto_clean
+ -test -f debian/config.h.in && mv debian/config.h.in config.h.in
+ -test -f debian/configure && mv debian/configure configure
+
override_dh_auto_install:
dh_auto_install -- DESTDIR=$(CURDIR)/debian/nsd3
rmdir $(CURDIR)/debian/nsd3/var/run/nsd3
I choose to save/restore the files, so I don't get bug reports like "I
run debclean and now the ./configure is gone...". It was almost the
same amount of work.
So please unblock nsd3/3.2.12-3 if this was the only objection you had.
Ondrej
On Fri, Feb 8, 2013 at 10:50 PM, Julien Cristau <jcristau@debian.org> wrote:
> On Fri, Feb 8, 2013 at 08:55:59 +0100, Ondřej Surý wrote:
>
>> On Thu, Feb 7, 2013 at 8:54 PM, Julien Cristau <jcristau@debian.org> wrote:
>> > On Thu, Feb 7, 2013 at 20:33:24 +0100, Ondřej Surý wrote:
>> >
>> >> On Thu, Feb 7, 2013 at 8:05 PM, Julien Cristau <jcristau@debian.org> wrote:
>> >> > debian/rules doesn't seem to have a 'clean' rule change to go with the
>> >> > 'autoreconf' addition?
>> >>
>> >> I am not sure I get what exactly do you have in mind? Do you want to
>> >> clean-up generated files (autom4ke, ...) or something else?
>> >>
>> > Well, clean is supposed to undo whatever the build process did. So,
>> > yes...
>>
>> The autoreconf -fi just modifies configure and config.h.in (just
>> checked, there's on Automake stuff), do you really think we need to
>> jump through circles to save the old versions and restore them on
>> clean? I could do that, but it seems to be just bureaucratic since
>> this doesn't break the build process and the package can be built
>> twice in a row.
>>
> The usual way is to remove files in clean that get regenerated by
> autoreconf. No need to save/restore the old versions.
>
> Cheers,
> Julien
--
Ondřej Surý <ondrej@sury.org>
Reply to: