On Fri, Jun 16, 2017 at 7:55 PM, Jeremy Bicha <[email protected]> wrote: > I'm attaching a git patch to fix your debian/watch file. It currently > reports the latest version as "6" which is not correct.
The watch file you added in 1.5.14-2 is wrong because it uses the git tarball instead of a tarball that has ./configure already ran. I couldn't use that tarball to easily build the package. The git history after 1.5.14-3 is also a bit messed up. Here's how I suggest fixing it: Temporarily allow force pushing ---------------------------------------- ssh git.debian.org cd /git/pkg-ime/ibus.git Edit the config file to set denyNonFastforwards = false Now back on your local branch … Reset branches -------------------- git checkout master git reset --hard debian/1.5.14-3 git am 0001-Fix-debian-watch.patch (this is the patch I am attaching to this email) git push -f git checkout upstream git reset --hard upstream/1.5.14 git push -f git checkout pristine-tar git reset --hard d029a77 git tag -d upstream/1.5.15 git tag -d upstream/1.5.16 git push -f git checkout master Disable force pushing ---------------------------- Edit the config file on git.debian.org back to denyNonFastforwards = true Other ------- Make sure your build directory and tarball directory don't have any old copies of the 1.5.15 and 1.5.16 tarballs. When you are ready for a new version (I think anything newer than 1.5.14 is blocked on your cldr package), you can run uscan and gbp import-orig like normal. Let me know if you need any help. Thanks, Jeremy Bicha
From 4bddb4a161ddea353e820a555047e33b25e43722 Mon Sep 17 00:00:00 2001 From: Jeremy Bicha <[email protected]> Date: Thu, 30 Nov 2017 22:16:01 -0500 Subject: [PATCH] Fix debian/watch --- debian/watch | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/debian/watch b/debian/watch index 0ea7d01..fb64e42 100644 --- a/debian/watch +++ b/debian/watch @@ -1,5 +1,3 @@ -version=3 -opts=filenamemangle=s#.*/archive/([\d.]+\.tar\.[gx]z)#ibus-$1# \ +version=4 https://github.com/ibus/ibus/releases \ -/ibus/ibus/archive/[\d.]+\.tar\.[gx]z debian uupdate -#<a href="/ibus/ibus/archive/1.5.14.tar.gz" rel="nofollow"> + .*/ibus-([0-9][0-9\.]*)@ARCHIVE_EXT@ -- 2.14.1
