Akosiaris has submitted this change and it was merged. Change subject: bump wmf package to 0.7.1-6-gf618f4d ......................................................................
bump wmf package to 0.7.1-6-gf618f4d We need some changes made ahead of upstream 0.7.1, pick them by pointing git buildpackage to the specific upstream treeish we are interested in. Change-Id: I34228a44bb0d923e7ed840f887c8d75860bcf892 --- M debian/changelog A debian/gbp.conf 2 files changed, 27 insertions(+), 0 deletions(-) Approvals: Akosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/debian/changelog b/debian/changelog index e3efe76..907aebc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,25 @@ +jenkins-debian-glue (0.7.1-6-gf618f4d-0) unstable; urgency=low + + Cherry pick 6 changes ahead of v0.7.1 for Wikimedia. Done by adding a + debian/gbp.conf which points gbp to a specific treeish: f618f4d35a + + This bump Wikimedia build to upstream version + f618f4d35a88efd1d3529217c49df5892899aecd: + + Antoine Musso (1): + piuparts_wrapper: only expand scriptsdir when it is set + + Carl Fürstenberg (1): + Allow debian-glue to read gbp.conf + + Michael Prokop (4): + generate-reprepro-codename: refer to /etc/jenkins/debian_glue + Lock access to conf/incoming file + build-and-provide-package: get rid of dependency on dcmd + Rework new gbp.conf handling + + -- Antoine Musso <has...@free.fr> Thu, 14 Nov 2013 15:30:26 +0000 + jenkins-debian-glue (0.7.1) unstable; urgency=low * [80057b0] Drop jenkins-debian-glue-repoenv package + add dependency on diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..b5e12bc --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,5 @@ +[DEFAULT] + +# Wikimedia hack to pick changes ahead of a tag +upstream-tree=branch +upstream-branch=f618f4d35a88efd1d3529217c49df5892899aecd -- To view, visit https://gerrit.wikimedia.org/r/95424 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I34228a44bb0d923e7ed840f887c8d75860bcf892 Gerrit-PatchSet: 2 Gerrit-Project: operations/debs/jenkins-debian-glue Gerrit-Branch: master Gerrit-Owner: Hashar <has...@free.fr> Gerrit-Reviewer: Akosiaris <akosia...@wikimedia.org> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
