Re: ipset/xtables-addons

[Neutron Soutmun <neo.neutron@gmail.com>]

I think this email should be sent to debian-mentors too.

On Sat, Feb 04, 2012 at 05:23:22PM +1100, Dmitry Smirnov wrote:
> Dear Neutron,
> 
> Sorry for delay.

No problem.

> I'm preparing xtables-addons and ipset for coordinated upload.

Well.

> Now when I had a look at your package I feel convinced that everybody
> will benefit from ipset separation. :)

:)
 
> I've made some corrections which I hope you'll find beneficial -  please
> find the attached patches.

Sure.
 
> Most of the changes are self-explanatory but two of them I believe are
> quite important:

0001-debian-copyright-correct-DEP-5-format-URL.patch:
* I'm unsure to use "http://dep.debian.net/deps/dep5"; as lintian still
  warning with message:

$ lintian --pedantic -i ipset_6.11-1_amd64.changes
===== >8 =====
P: ipset source: unversioned-copyright-format-uri http://dep.debian.net/deps/dep5
...
...
===== >8 =====

  but I follow some mailing-lists threads, and they said that "http://dep.debian.net/deps/dep5"; could be used instead.

  BTW, applied. :)

0002-preparing-for-coordinated-upload-with-xtables-addons.patch and
0003-adding-forgotten-debian-changelog.patch:

* Applied.

> 
> 0004 which is adding versioned dependency on libipset for stronger
> relationships between them
> 
>  and
> 
> 0005 which is introducing libmnl-dev to build-deps of libipset-dev
> (This could be reported as RC-critical bug)

Applied.
 
> Please feel free to commit those changes if you're OK with them or I can
> do it for you if you wish.

Already pushed with a little bit more update to debian/changelog,
please pull from the repository again.

or get it from
dget -x http://mentors.debian.net/debian/pool/main/i/ipset/ipset_6.11-1.dsc

Best regards,
Neutron Soutmun

> From 1d7a993ca16ed7bfbcbd0801b49ca408739a3918 Mon Sep 17 00:00:00 2001
> From: Dmitry Smirnov <onlyjob@member.fsf.org>
> Date: Sat, 4 Feb 2012 15:57:40 +1100
> Subject: [PATCH 1/5] debian/copyright: correct DEP-5 format URL
> 
> ---
>  debian/copyright |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/debian/copyright b/debian/copyright
> index c4fcfaf..d9dfe7b 100644
> --- a/debian/copyright
> +++ b/debian/copyright
> @@ -1,4 +1,4 @@
> -Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=202
> +Format: http://dep.debian.net/deps/dep5
>  Upstream-Name: ipset
>  Upstrem-Contact: Jozsef Kadlecsik (kadlec@blackhole.kfki.hu)
>  Source: http://ipset.netfilter.org/install.html
> -- 
> 1.7.8.3
> 

> From c9193d13ca2812fec558e5a7e4e7f576b98cca08 Mon Sep 17 00:00:00 2001
> From: Dmitry Smirnov <onlyjob@member.fsf.org>
> Date: Sat, 4 Feb 2012 16:08:00 +1100
> Subject: [PATCH 2/5] preparing for coordinated upload with xtables-addons
>  1.41
> 
> ---
>  debian/control |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/debian/control b/debian/control
> index 426b179..dd78cb2 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -17,7 +17,7 @@ Package: ipset
>  Architecture: any
>  Depends: ${misc:Depends}, ${shlibs:Depends}
>  Provides: ipset-${source:Upstream-Version}
> -Conflicts: xtables-addons-common
> +Breaks: xtables-addons-common (<< 1.41~)
>  Description: administration tool for kernel IP sets
>   IP sets are a framework inside the Linux 2.4.x and 2.6.x kernel which can be
>   administered by the ipset(8) utility. Depending on the type, currently an
> -- 
> 1.7.8.3
> 

> From 7bef4c6b52471e75fe070001f1ebe30bea1a7454 Mon Sep 17 00:00:00 2001
> From: Dmitry Smirnov <onlyjob@member.fsf.org>
> Date: Sat, 4 Feb 2012 16:35:09 +1100
> Subject: [PATCH 3/5] adding forgotten debian/changelog
> 
> ---
>  debian/changelog |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 files changed, 58 insertions(+), 0 deletions(-)
> 
> diff --git a/debian/changelog b/debian/changelog
> index d48f58a..a6c1c3d 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,3 +1,61 @@
> +ipset (6.11-1) unstable; urgency=low
> +
> +  (Closes: #656343)
> +
> +  * Imported Upstream version 6.11
> +  * Switch to 3.0 (quilt) Debian source format
> +  * Update compat level and control files
> +    * debian/compat:
> +      - Bump compat level to 8.
> +    * debian/control:
> +      - Update me as the maintainer.
> +      - Bump Standards-Version to 3.9.2, no changes needed.
> +      - Add/update build-deps:
> +        * Update debhelper (>= 8.1.3~) and add dpkg-dev (>= 1.16.1~)
> +          to support multiarch builds and get hardening build flags on
> +          dpkg-buildflags is being invoked.
> +        * Add dh-autoreconf.
> +        * libmnl-dev  which is required by ipset utility.
> +        * Add pkg-config which is required by configure script to check
> +          whether the libmnl has already been installed.
> +      - Add Homepage.
> +      - Add Vcs-{Browser,Git} point to Alioth.
> +      - The ipset package should conflicts the xtables-addons-common which
> +        also provides the ipset utility binary.
> +      - Add more packages:
> +        * libipset-dev, libipset2 which provide the runtime/development
> +          libraries and header files. (MultiArch supported)
> +      - Update the descriptions.
> +    * debian/control.modules:
> +      - Drop as the ipset already included in the mainline kernel, no needs
> +        to build as the modules.
> +    * debian/README.Debian:
> +      - Drop outdated Debian readme file.
> +  * Update rules and drop rules.modules
> +    * debian/rules:
> +      - Using new debhelper build rules set.
> +      - Get DEB_HOST_MULTIARCH which is required by libipset for MultiArch
> +        support.
> +      - Set hardening build flags by using dpkg-buildflags to exports the
> +        compilation flags and override the dh_auto_configure.
> +      - Set --libdir to comply with MultiArch by using DEB_HOST_MULTIARCH.
> +    * debian/rules.modules:
> +      - Drop as unneeded.
> +  * Add installation files for each package
> +    * debian/ipset.{install,docs,manpages}:
> +      - Install binary, documents and manpages.
> +    * debian/libipset{2,-dev}:
> +      - Install runtime/development libraries and header files.
> +  * Update copyright file to DEP-5 format
> +  * Add patch to build ipset against shared libs
> +    * debian/patches/99-ipset-shared-libs.patch, debian/patches/series:
> +      - Add patch.
> +  * Drop unnecessary lintian override file
> +  * Add watch file
> +  * Drop unused override_dh_auto_clean from rules
> +
> + -- Neutron Soutmun <neo.neutron@gmail.com>  Fri, 20 Jan 2012 12:39:02 +0700
> +
>  ipset (2.5.0-1) unstable; urgency=low
>  
>    * New upstream release; closes: #503683.
> -- 
> 1.7.8.3
> 

> From e402bc04085afb671c71cd1fc4852d8cef913eb5 Mon Sep 17 00:00:00 2001
> From: Dmitry Smirnov <onlyjob@member.fsf.org>
> Date: Sat, 4 Feb 2012 16:37:22 +1100
> Subject: [PATCH 4/5] tightening depends on libipset
> 
> ---
>  debian/changelog |    3 +++
>  debian/rules     |    3 +++
>  2 files changed, 6 insertions(+), 0 deletions(-)
> 
> diff --git a/debian/changelog b/debian/changelog
> index a6c1c3d..63d223d 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -54,6 +54,9 @@ ipset (6.11-1) unstable; urgency=low
>    * Add watch file
>    * Drop unused override_dh_auto_clean from rules
>  
> +  [Dmitry Smirnov]
> +  * tightening depends on libipset
> +
>   -- Neutron Soutmun <neo.neutron@gmail.com>  Fri, 20 Jan 2012 12:39:02 +0700
>  
>  ipset (2.5.0-1) unstable; urgency=low
> diff --git a/debian/rules b/debian/rules
> index f4fc720..25a8c9d 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -17,3 +17,6 @@ override_dh_auto_install:
>  	mkdir -p $(PKGCONFIG_INSTDIR)
>  	cp lib/libipset.pc $(PKGCONFIG_INSTDIR)
>  	dh_auto_install
> +
> +override_dh_makeshlibs:
> +	dh_makeshlibs -V
> -- 
> 1.7.8.3
> 

> From bd2271a5537dea260a18fae9f02aa1a04592ae13 Mon Sep 17 00:00:00 2001
> From: Dmitry Smirnov <onlyjob@member.fsf.org>
> Date: Sat, 4 Feb 2012 16:43:41 +1100
> Subject: [PATCH 5/5] adding libmnl-dev to libipset-dev build-deps
> 
> ---
>  debian/changelog |    3 ++-
>  debian/control   |    2 +-
>  2 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/debian/changelog b/debian/changelog
> index 63d223d..0f8335f 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -54,8 +54,9 @@ ipset (6.11-1) unstable; urgency=low
>    * Add watch file
>    * Drop unused override_dh_auto_clean from rules
>  
> -  [Dmitry Smirnov]
> +  [Dmitry Smirnov <onlyjob@member.fsf.org>]
>    * tightening depends on libipset
> +  * libmnl-dev added to libipset-dev build-deps
>  
>   -- Neutron Soutmun <neo.neutron@gmail.com>  Fri, 20 Jan 2012 12:39:02 +0700
>  
> diff --git a/debian/control b/debian/control
> index dd78cb2..90c502c 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -39,7 +39,7 @@ Description: administration tool for kernel IP sets
>  Package: libipset-dev
>  Section: libdevel
>  Architecture: any
> -Depends: libipset2 (= ${binary:Version}), ${misc:Depends}
> +Depends: libipset2 (= ${binary:Version}), ${misc:Depends}, libmnl-dev
>  Description: Development files for IP sets
>   IP sets are a framework inside the Linux 2.4.x and 2.6.x kernel which can be
>   administered by the ipset(8) utility. Depending on the type, currently an
> -- 
> 1.7.8.3
>