Hi,
when updateing the agda code I added a 2.2.6-5 entry to the changelog,
pushed my changes, but pushing the tags did not work because there
already was a 2.2.6-5 tag.
It seems that marco ran "git push --tags", but not "git push --all". I
fixed it manually, but don’t forget to run
$ git push --all && git push --tags
after an upload.
Greetings,
Joachim
Am Freitag, den 16.04.2010, 10:00 +0000 schrieb Joachim Breitner:
> The following commit has been merged in the master branch:
> commit a6e58f2704d973596f8aef16c171eb4832a02fc0
> Merge: 7d664f03d6a46a79b7f327e043821bf0e3bda52f fd6a3c27e8daa577fb3d61c1052527b007825ee5
> Author: Joachim Breitner <mail@joachim-breitner.de>
> Date: Fri Apr 16 11:55:16 2010 +0200
>
> Merge commit 'fd6a3c27e8daa577fb3d61c1052527b007825ee5'
>
> For some reason, there was a 2.2.6-5 tag, but not on the master branch.
> Or something. Stupid git.
>
> Conflicts:
> debian/changelog
>
> diff --combined debian/changelog
> index 1e46a59,da51a96..b33a602
> --- a/debian/changelog
> +++ b/debian/changelog
> @@@ -1,10 -1,9 +1,16 @@@
> - agda (2.2.6-5) unstable; urgency=low
> ++agda (2.2.6-6) unstable; urgency=low
> +
> + * Fix FTBFS by fixing zlib doc package name. (Closes: #577892)
> + * Convert to 3.0 (quilt)
> +
> + -- Joachim Breitner <nomeata@debian.org> Fri, 16 Apr 2010 11:43:24 +0200
> +
> + agda (2.2.6-5) unstable; urgency=low
> +
> + * debian/control: Rename -doc package.
> +
> + -- Marco Túlio Gontijo e Silva <marcot@debian.org> Tue, 16 Mar 2010 10:15:20 -0300
> +
> agda (2.2.6-4) unstable; urgency=low
>
> * debian/control: Remove the profiling package. It is unfortunate that this
> diff --combined debian/control
> index 9b84d77,0ca8c98..4e232f6
> --- a/debian/control
> +++ b/debian/control
> @@@ -40,8 -40,8 +40,8 @@@ Build-Depends-Indep: ghc6-doc
> libghc6-terminfo-doc,
> libghc6-xhtml-doc (>= 3000.2),
> libghc6-xhtml-doc (<< 3000.3),
> - haskell-zlib-doc (>= 0.4.0.1),
> - haskell-zlib-doc (<< 1)
> + libghc6-zlib-doc (>= 0.4.0.1),
> + libghc6-zlib-doc (<< 1)
> Standards-Version: 3.8.4
> Vcs-Browser: http://git.debian.org/?p=pkg-haskell/agda.git;a=summary
> Vcs-Git: git://git.debian.org/git/pkg-haskell/agda.git
> @@@ -70,12 -70,15 +70,15 @@@ Description: a dependently typed functi
> .
> This package contains the normal library files.
>
> - Package: haskell-agda-doc
> + Package: libghc6-agda-doc
> Architecture: all
> Section: doc
> Depends: ${misc:Depends}, ${haskell:Depends}
> Recommends: ${haskell:Recommends}
> Suggests: ${haskell:Suggests}
> + Replaces: haskell-agda-doc
> + Conflicts: haskell-agda-doc
> + Provides: haskell-agda-doc
> Description: a dependently typed functional programming language - documentation
> Agda is a dependently typed functional programming language: It has inductive
> families, which are like Haskell's GADTs, but they can be indexed by values and
>
--
Joachim "nomeata" Breitner
Debian Developer
nomeata@debian.org | ICQ# 74513189 | GPG-Keyid: 4743206C
JID: nomeata@joachim-breitner.de | http://people.debian.org/~nomeata
Attachment:
signature.asc
Description: This is a digitally signed message part