Bug#927722: [pkg-netfilter-team] Bug#927722: Correct fix for this bug

2019-04-29 Thread Neutron Soutmun
On Thu, Apr 25, 2019 at 12:49:59PM +0200, Thomas Goirand wrote:
> Hi,
>
> Please fine attached to this message the *CORRECT* debdiff to fix it.
> I've uploaded it to DELAYED/7 (after dcuting the wrong package...). Let
> me know if you think it's still wrong and I should still dcut it...

LGTM

and the patch also included in [1] for the next upload of the ipset 7.1
package in the experimental distribution

Best regards,
Neutron Soutmun

---
[1] 
https://salsa.debian.org/pkg-netfilter-team/pkg-ipset/commit/6e140d9bf9bcc5fe860475d3ce18469deb3e3798


signature.asc
Description: PGP signature


Bug#927722: Correct fix for this bug

2019-04-25 Thread Arturo Borrero Gonzalez
On 4/25/19 12:49 PM, Thomas Goirand wrote:
> Hi,
> 
> Please fine attached to this message the *CORRECT* debdiff to fix it.
> I've uploaded it to DELAYED/7 (after dcuting the wrong package...). Let
> me know if you think it's still wrong and I should still dcut it...
> 

LGTM



Bug#927722: Correct fix for this bug

2019-04-25 Thread Thomas Goirand
Hi,

Please fine attached to this message the *CORRECT* debdiff to fix it.
I've uploaded it to DELAYED/7 (after dcuting the wrong package...). Let
me know if you think it's still wrong and I should still dcut it...

Cheers,

Thomas Goirand (zigo)
diff -Nru ipset-6.38/debian/changelog ipset-6.38/debian/changelog
--- ipset-6.38/debian/changelog 2018-09-01 19:28:18.0 +0200
+++ ipset-6.38/debian/changelog 2019-04-25 11:37:45.0 +0200
@@ -1,3 +1,11 @@
+ipset (6.38-1.1) unstable; urgency=medium
+
+  * Non maintainer upload.
+  * use dpkg-maintscript-helper rm_conffile to clean up old bash-completion 
+file in /etc (Closes: #927722).
+
+ -- Cyril de Bourgues   Thu, 25 Apr 2019 
11:37:45 +0200
+
 ipset (6.38-1) unstable; urgency=medium
 
   * [b80dcfb] New upstream version 6.38 (Closes: #898851)
diff -Nru ipset-6.38/debian/ipset.postinst ipset-6.38/debian/ipset.postinst
--- ipset-6.38/debian/ipset.postinst2018-09-01 19:28:18.0 +0200
+++ ipset-6.38/debian/ipset.postinst2019-04-25 11:37:45.0 +0200
@@ -3,9 +3,7 @@
 set -e
 
 # Cleanup obsoleted bash completion configuration file
-if [ -f /etc/bash_completion.d/ipset ]; then
-  rm -f /etc/bash_completion.d/ipset
-fi
+dpkg-maintscript-helper rm_conffile /etc/bash_completion.d/ipset 6.25.1-1~ 
ipset -- "$@"
 
 #DEBHELPER#
 
diff -Nru ipset-6.38/debian/ipset.postrm ipset-6.38/debian/ipset.postrm
--- ipset-6.38/debian/ipset.postrm  1970-01-01 01:00:00.0 +0100
+++ ipset-6.38/debian/ipset.postrm  2019-04-25 11:37:45.0 +0200
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+dpkg-maintscript-helper rm_conffile /etc/bash_completion.d/ipset 6.25.1-1~ 
ipset -- "$@"
+
+#DEBHELPER#
+
+exit 0
diff -Nru ipset-6.38/debian/ipset.preinst ipset-6.38/debian/ipset.preinst
--- ipset-6.38/debian/ipset.preinst 1970-01-01 01:00:00.0 +0100
+++ ipset-6.38/debian/ipset.preinst 2019-04-25 11:37:45.0 +0200
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+dpkg-maintscript-helper rm_conffile /etc/bash_completion.d/ipset 6.25.1-1~ 
ipset -- "$@"
+
+#DEBHELPER#
+
+exit 0