Ema has submitted this change and it was merged. Change subject: Packaging changes for Varnish 4 ......................................................................
Packaging changes for Varnish 4 - Build-depend on libvarnishapi-dev instead of varnish itself. Starting with varnish4, vmods can be built out-of-tree - Do not fetch varnish source code (override_dh_auto_configure) - Depend on varnish 4.1.1 Bug: T124281 Change-Id: Id77db586fc60c0f2061f8d0e510ef85ee92349ee --- M debian/changelog M debian/control M debian/rules 3 files changed, 16 insertions(+), 12 deletions(-) Approvals: Ema: Verified; Looks good to me, approved BBlack: Looks good to me, but someone else must approve diff --git a/debian/changelog b/debian/changelog index 2413103..1ddc93a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +libvmod-netmapper (1.3-1) unstable; urgency=medium + + * New upstream release + * Build-depend on libvarnishapi-dev instead of varnish itself. Starting with + varnish4, vmods can be built out-of-tree + * Do not fetch varnish source code (override_dh_auto_configure) + * Depend on varnish 4.1.1 + * Add myself to Uploaders + + -- Emanuele Rocca <e...@wikimedia.org> Tue, 02 Feb 2016 11:12:40 +0100 + libvmod-netmapper (1.2-1) unstable; urgency=low * Bump upstream diff --git a/debian/control b/debian/control index e9d160b..c8677de 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,9 @@ Section: web Priority: extra Maintainer: Brandon Black <bbl...@wikimedia.org> -Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, varnish (>= 3), libjansson-dev, liburcu-dev -Standards-Version: 3.9.3 +Uploaders: Emanuele Rocca <e...@wikimedia.org> +Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, libvarnishapi-dev (>= 4.1.1), libjansson-dev, liburcu-dev +Standards-Version: 3.9.6 Homepage: https://git.wikimedia.org/summary/operations/software/varnish/libvmod-netmapper #Vcs-Git: https://gerrit.wikimedia.org/r/operations/software/varnish/libvmod-netmapper #Vcs-Browser: https://git.wikimedia.org/summary/operations/software/varnish/libvmod-netmapper @@ -11,7 +12,7 @@ Package: libvmod-netmapper Architecture: any Pre-Depends: ${misc:Pre-Depends} -Depends: ${shlibs:Depends}, ${misc:Depends}, varnish (>= 3) +Depends: varnish (>= 4.1.1), ${shlibs:Depends}, ${misc:Depends} Description: Varnish VMOD for mapping IP networks to strings Loads a JSON database mapping networks to strings, matches IP addresses against this database. diff --git a/debian/rules b/debian/rules index 32fef7f..86ab84c 100755 --- a/debian/rules +++ b/debian/rules @@ -15,15 +15,7 @@ %: dh $@ --with autoreconf -# vmods require a varnish source tree (matching the binary version we're using!) -# in order to compile, so we fetch one just before ./configure. This is a bit -# hacky, but seems to work ok so far. - -override_dh_auto_configure: - apt-get source varnish=`dpkg-query -W varnish | cut -f2` - dh_auto_configure -- VARNISHSRC=./varnish-3* VARNISHD=/usr/sbin/varnishd VARNISHTEST=/usr/bin/varnishtest - override_dh_strip: dh_strip --dbg-package=libvmod-netmapper-dbg -.PHONY: override_dh_auto_configure override_dh_strip +.PHONY: override_dh_strip -- To view, visit https://gerrit.wikimedia.org/r/267900 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id77db586fc60c0f2061f8d0e510ef85ee92349ee Gerrit-PatchSet: 1 Gerrit-Project: operations/software/varnish/libvmod-netmapper Gerrit-Branch: debian Gerrit-Owner: Ema <e...@wikimedia.org> Gerrit-Reviewer: BBlack <bbl...@wikimedia.org> Gerrit-Reviewer: Ema <e...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
