Ema has submitted this change and it was merged. Change subject: Package new upstream release: 4.1.2-1 ......................................................................
Package new upstream release: 4.1.2-1 Bug: T122880 Change-Id: Ieecb8683fc81487a79769b00caf441345bcae863 --- A debian/README.wmf M debian/changelog D debian/patches/0005-vcc-real-plus-real.patch M debian/patches/series 4 files changed, 23 insertions(+), 22 deletions(-) Approvals: Ema: Verified; Looks good to me, approved diff --git a/debian/README.wmf b/debian/README.wmf new file mode 100644 index 0000000..d4e15ff --- /dev/null +++ b/debian/README.wmf @@ -0,0 +1,15 @@ +The WMF varnish4 packaging project on gerrit has 3 branches: + +- master +- upstream +- debian-wmf + +https://gerrit.wikimedia.org/r/#/admin/projects/operations/debs/varnish4,branches + +master and upstream follow the respective branches on +https://anonscm.debian.org/cgit/pkg-varnish/pkg-varnish.git/ + +master is where debian packaging happens, upstream is the upstream source code. + +Finally, debian-wmf is our branch with local WMF modifications (such as this +file). diff --git a/debian/changelog b/debian/changelog index c660598..2927fee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +varnish (4.1.2-1wm1) jessie-wikimedia; urgency=medium + + * Local package (WMF). + * New upstream release. + * Drop debian/patches/0005-vcc-real-plus-real.patch, added upstream. + + -- Emanuele Rocca <[email protected]> Fri, 25 Mar 2016 11:13:57 +0100 + varnish (4.1.2-1) unstable; urgency=medium * Imported upstream release 4.1.2-1 diff --git a/debian/patches/0005-vcc-real-plus-real.patch b/debian/patches/0005-vcc-real-plus-real.patch deleted file mode 100644 index 4226f81..0000000 --- a/debian/patches/0005-vcc-real-plus-real.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/lib/libvcc/vcc_expr.c b/lib/libvcc/vcc_expr.c -index 5989f07..af3b3e7 100644 ---- a/lib/libvcc/vcc_expr.c -+++ b/lib/libvcc/vcc_expr.c -@@ -942,6 +942,7 @@ vcc_expr_mul(struct vcc *tl, struct expr **e, enum var_type fmt) - case INT: f2 = INT; break; - case DURATION: f2 = REAL; break; - case BYTES: f2 = REAL; break; -+ case REAL: f2 = REAL; break; - default: - if (tl->t->tok != '*' && tl->t->tok != '/') - return; -@@ -1049,6 +1050,8 @@ vcc_expr_add(struct vcc *tl, struct expr **e, enum var_type fmt) - /* OK */ - } else if ((*e)->fmt == INT && e2->fmt == INT) { - /* OK */ -+ } else if ((*e)->fmt == REAL && e2->fmt == REAL) { -+ /* OK */ - } else if ((*e)->fmt == DURATION && e2->fmt == DURATION) { - /* OK */ - } else if (tk->tok == '+' && diff --git a/debian/patches/series b/debian/patches/series index 597c0c3..58c34d7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,4 +2,3 @@ 0002-varnishd-persistent-fallocate.patch 0003-varnishd-nukelru.patch 0004-varnishd-persistent-mmap-exit.patch -0005-vcc-real-plus-real.patch -- To view, visit https://gerrit.wikimedia.org/r/279592 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ieecb8683fc81487a79769b00caf441345bcae863 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/varnish4 Gerrit-Branch: debian-wmf Gerrit-Owner: Ema <[email protected]> Gerrit-Reviewer: Ema <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
