Bug#759414: wheezy-pu: package kvpm/0.8.6-2+deb7u1

[Guillem Jover <guillem@debian.org>]

Hi!

[ Thanks for the Cc. ]

On Tue, 2014-08-26 at 20:38:06 -0700, Benjamin J. Scott wrote:
> Package: release.debian.org
> Severity: normal
> Tags: wheezy
> User: release.debian.org@packages.debian.org
> Usertags: pu

> Bug #753175 for package kvpm causes a FTBFS in the
> stable version of kvpm. The problem is a typo in a
> debian/patches/ patch file. I have built an update
> with a Wheezy chroot. The following is a "debdiff"
> of the change:

> diff -Nru kvpm-0.8.6/debian/changelog kvpm-0.8.6/debian/changelog
> --- kvpm-0.8.6/debian/changelog 2014-08-26 19:35:29.000000000 -0700
> +++ kvpm-0.8.6/debian/changelog 2013-03-28 04:03:17.000000000 -0700
> @@ -1,11 +1,3 @@
> -kvpm (0.8.6-2+deb7u2) wheezy; urgency=low
> -
> -  [ Benjamin J. Scott ]
> -  * Changed file debian/patches/bug-667232.patch. Fixed typo in patch file
> -    that caused FTBFS in last archive rebuild (Closes: #753175).
> -
> - -- Benjamin J. Scott <benscott@nwlink.com>  Tue, 26 Aug 2014 17:25:21 -0700
> -
>  kvpm (0.8.6-2+deb7u1) testing-proposed-updates; urgency=high
>  
>    [ Benjamin J. Scott ]
> diff -Nru kvpm-0.8.6/debian/patches/bug-667232.patch kvpm-0.8.6/debian/patches/bug-667232.patch
> --- kvpm-0.8.6/debian/patches/bug-667232.patch  2014-08-26 16:42:34.000000000 -0700
> +++ kvpm-0.8.6/debian/patches/bug-667232.patch  2012-09-16 20:41:30.000000000 -0700
> @@ -1,7 +1,6 @@
>  Fixed FTBFS with gcc version 4.7 by including the system header
>  unistd.h in main.cpp and misc.cpp. It was implicitly included
> -with gcc 4.6 and earlier.
> ---- a/kvpm/main.cpp
> +with gcc 4.6 and earlier.--- a/kvpm/main.cpp
>  +++ b/kvpm/main.cpp
>  @@ -12,6 +12,8 @@
>    * See the file "COPYING" for the exact licensing terms. 

The patch is reversed, you need to swap the order of the arguments to
debdiff. Once that is fixed and the release-team approves it, I'll
proceed with the sponsored upload.

Thanks,
Guillem