[SCM] lives packaging branch, master, updated. debian/1.1.8-1-32-g9b1ab25

[Reinhard Tartler]

On Di, Jan 12, 2010 at 09:44:33 (CET), hrickards-guest at users.alioth.debian.org wrote:

> The following commit has been merged in the master branch:
> commit 24e786d71d85ba32c650f76945c8f629ea460644
> Author: Harry Rickards <harry at linux.com>
> Date:   Tue Jan 12 08:29:36 2010 +0000
>
>     Removed frei0r-plugins-dev for powerpc
>
> diff --git a/debian/changelog b/debian/changelog
> index 9559561..19a4298 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -11,6 +11,7 @@ lives (1.1.8-2) UNRELEASED; urgency=low
>    * Added VCS-Git and VCS-Browser tags
>    * Added upstream patch that fixes image loading. Will be released
>      upstream in 1.1.9
> +  * Removed frei0r-plugins-dev for powerpc
>    
>    [ Alessio Treglia ]
>    * debian/rules: Don't include quilt.make rules file, it's unnecessary.
> diff --git a/debian/control b/debian/control
> index 16358f3..e0f9888 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -20,7 +20,7 @@ Build-Depends: debhelper (>= 7.0.8~),
>   libtool,
>   gettext,
>   libtheora-dev,
> - frei0r-plugins-dev[!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !arm !powerpc],
> + frei0r-plugins-dev[!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !arm],
>   libogg-dev,
>   libdv4-dev[!hurd-i386],
>   libraw1394-dev[!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],

The commit description does not match with the content. You didn't
remove, but add the frei0r-plugins-dev build dependency on powerpc :-)

Moreover, we generally avoid commits that touch both debian/changelog
and other files. Instead, you might find the utility 'git-dch' very
helpful to generate entries for debian/changelog based on git commits.


-- 
Gruesse/greetings,
Reinhard Tartler, KeyID 945348A4