Bug#819856: dnsmasq: diff for NMU version 2.76-1.2

[Christian Hofstaedtler]

* Simon Kelley  [160717 00:01]:
> Thanks for this. I need to upload 2.76-2, which has a fix for a
> different bug, #831372. I've patched this with the 2.76-1.1 and 2.76-1.2
> NMUs, so they're included. However by the time 2.76-1.2 gets to the end
> of the delay, 2.76-2 will be in place. That's not going to confuse
> things, is it? 2.76-2 > 2.76-1.2, so the NMU won't overwrite my later
> upload, which includes the NMU patch?

It shouldn't; just go ahead and I'll cancel my upload once I'm back
home.

Cheers,

-- 
 ,''`.  Christian Hofstaedtler 
: :' :  Debian Developer
`. `'   7D1A CFFA D9E0 806C 9C4C  D392 5C13 D6DB 9305 2E03
  `-

Bug#819856: dnsmasq: diff for NMU version 2.76-1.2

[Simon Kelley]

Hi,

Thanks for this. I need to upload 2.76-2, which has a fix for a
different bug, #831372. I've patched this with the 2.76-1.1 and 2.76-1.2
NMUs, so they're included. However by the time 2.76-1.2 gets to the end
of the delay, 2.76-2 will be in place. That's not going to confuse
things, is it? 2.76-2 > 2.76-1.2, so the NMU won't overwrite my later
upload, which includes the NMU patch?

Cheers,

Simon.




On 16/07/16 01:31, z...@debian.org wrote:
> Control: tags 819856 + patch
> Control: tags 819856 + pending
> 
> Dear maintainer,
> 
> I've prepared an NMU for dnsmasq (versioned as 2.76-1.2) and
> uploaded it to DELAYED/5. Please feel free to tell me if I
> should delay it longer.
> 
> Best,
> Chris
> 
> 
> diff -u dnsmasq-2.76/debian/changelog dnsmasq-2.76/debian/changelog
> --- dnsmasq-2.76/debian/changelog
> +++ dnsmasq-2.76/debian/changelog
> @@ -1,3 +1,11 @@
> +dnsmasq (2.76-1.2) unstable; urgency=medium
> +
> +  * Non-maintainer upload.
> +  * dnsmasq: Install marker file to determine package installed state,
> +for the benefit of the init script. (Closes: #819856)
> +
> + -- Christian Hofstaedtler   Sat, 16 Jul 2016 00:17:57 +
> +
>  dnsmasq (2.76-1.1) unstable; urgency=medium
>  
>* Non-maintainer upload.
> diff -u dnsmasq-2.76/debian/init dnsmasq-2.76/debian/init
> --- dnsmasq-2.76/debian/init
> +++ dnsmasq-2.76/debian/init
> @@ -33,7 +33,7 @@
>  # The following test ensures the dnsmasq service is not started, when the
>  # package 'dnsmasq' is removed but not purged, even if the dnsmasq-base 
>  # package is still in place.
> -test -d /usr/share/doc/dnsmasq || exit 0
> +test -e /usr/share/dnsmasq/installed-marker || exit 0
>   
>  test -x $DAEMON || exit 0
>  
> diff -u dnsmasq-2.76/debian/rules dnsmasq-2.76/debian/rules
> --- dnsmasq-2.76/debian/rules
> +++ dnsmasq-2.76/debian/rules
> @@ -105,6 +105,7 @@
>   -d debian/daemon/etc/dnsmasq.d \
>   -d debian/daemon/etc/resolvconf/update.d \
>   -d debian/daemon/usr/lib/resolvconf/dpkg-event.d \
> + -d debian/daemon/usr/share/dnsmasq \
>   -d debian/daemon/etc/default \
>   -d debian/daemon/lib/systemd/system \
>  -d debian/daemon/etc/insserv.conf.d
> @@ -113,6 +114,7 @@
>   install -m 755 debian/init debian/daemon/etc/init.d/dnsmasq
>   install -m 755 debian/resolvconf 
> debian/daemon/etc/resolvconf/update.d/dnsmasq
>   install -m 755 debian/resolvconf-package 
> debian/daemon/usr/lib/resolvconf/dpkg-event.d/dnsmasq
> + install -m 644 debian/installed-marker debian/daemon/usr/share/dnsmasq
>   install -m 644 debian/default debian/daemon/etc/default/dnsmasq
>   install -m 644 dnsmasq.conf.example debian/daemon/etc/dnsmasq.conf
>   install -m 644 debian/readme.dnsmasq.d 
> debian/daemon/etc/dnsmasq.d/README
> only in patch2:
> unchanged:
> --- dnsmasq-2.76.orig/debian/installed-marker
> +++ dnsmasq-2.76/debian/installed-marker
> @@ -0,0 +1,2 @@
> +# This file indicates dnsmasq (and not just dnsmasq-base) is installed.
> +# It is an implementation detail of the dnsmasq init script.
> 

Bug#819856: dnsmasq: diff for NMU version 2.76-1.2

[zeha]

Control: tags 819856 + patch
Control: tags 819856 + pending

Dear maintainer,

I've prepared an NMU for dnsmasq (versioned as 2.76-1.2) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Best,
Chris


diff -u dnsmasq-2.76/debian/changelog dnsmasq-2.76/debian/changelog
--- dnsmasq-2.76/debian/changelog
+++ dnsmasq-2.76/debian/changelog
@@ -1,3 +1,11 @@
+dnsmasq (2.76-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * dnsmasq: Install marker file to determine package installed state,
+for the benefit of the init script. (Closes: #819856)
+
+ -- Christian Hofstaedtler   Sat, 16 Jul 2016 00:17:57 +
+
 dnsmasq (2.76-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -u dnsmasq-2.76/debian/init dnsmasq-2.76/debian/init
--- dnsmasq-2.76/debian/init
+++ dnsmasq-2.76/debian/init
@@ -33,7 +33,7 @@
 # The following test ensures the dnsmasq service is not started, when the
 # package 'dnsmasq' is removed but not purged, even if the dnsmasq-base 
 # package is still in place.
-test -d /usr/share/doc/dnsmasq || exit 0
+test -e /usr/share/dnsmasq/installed-marker || exit 0
  
 test -x $DAEMON || exit 0
 
diff -u dnsmasq-2.76/debian/rules dnsmasq-2.76/debian/rules
--- dnsmasq-2.76/debian/rules
+++ dnsmasq-2.76/debian/rules
@@ -105,6 +105,7 @@
-d debian/daemon/etc/dnsmasq.d \
-d debian/daemon/etc/resolvconf/update.d \
-d debian/daemon/usr/lib/resolvconf/dpkg-event.d \
+   -d debian/daemon/usr/share/dnsmasq \
-d debian/daemon/etc/default \
-d debian/daemon/lib/systemd/system \
 -d debian/daemon/etc/insserv.conf.d
@@ -113,6 +114,7 @@
install -m 755 debian/init debian/daemon/etc/init.d/dnsmasq
install -m 755 debian/resolvconf 
debian/daemon/etc/resolvconf/update.d/dnsmasq
install -m 755 debian/resolvconf-package 
debian/daemon/usr/lib/resolvconf/dpkg-event.d/dnsmasq
+   install -m 644 debian/installed-marker debian/daemon/usr/share/dnsmasq
install -m 644 debian/default debian/daemon/etc/default/dnsmasq
install -m 644 dnsmasq.conf.example debian/daemon/etc/dnsmasq.conf
install -m 644 debian/readme.dnsmasq.d 
debian/daemon/etc/dnsmasq.d/README
only in patch2:
unchanged:
--- dnsmasq-2.76.orig/debian/installed-marker
+++ dnsmasq-2.76/debian/installed-marker
@@ -0,0 +1,2 @@
+# This file indicates dnsmasq (and not just dnsmasq-base) is installed.
+# It is an implementation detail of the dnsmasq init script.