[Pkg-gnupg-maint] [Pkg-gnupg-commit] r84 - in /gnupg/branches/experimental/debian: gnupg-udeb.install gpgv-udeb.install gpgv.files gpgv.install gpgv.manpages rules

[Daniel Leidert]

> Author: thijs
> Date: Tue Jul 29 10:11:44 2008
> New Revision: 84
> 
> URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=84
> Log:
> dh_movefiles is deprecated over dh_install,

It is not "deprecated".

> use that and also combine
> all into one dh_install call for consistency

You created a file conflict. dh_install does not remove the files it
installs from debian/gnupg, so you have

> Added: gnupg/branches/experimental/debian/gpgv.install
> URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/branches/experimental/debian/gpgv.install?rev=84&op=file
> ==============================================================================
> --- gnupg/branches/experimental/debian/gpgv.install (added)
> +++ gnupg/branches/experimental/debian/gpgv.install Tue Jul 29 10:11:44 2008
> @@ -1,0 +1,1 @@
> +debian/gnupg/usr/bin/gpgv usr/bin/
> 
> Added: gnupg/branches/experimental/debian/gpgv.manpages
> URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/branches/experimental/debian/gpgv.manpages?rev=84&op=file
> ==============================================================================
> --- gnupg/branches/experimental/debian/gpgv.manpages (added)
> +++ gnupg/branches/experimental/debian/gpgv.manpages Tue Jul 29 10:11:44 2008
> @@ -1,0 +1,1 @@
> +debian/gnupg/usr/share/man/man1/gpgv.1

both files in the gnupg and the gpgv packages. Instead to add an `rm'
call in debian/rules I decided to use dh_movefiles for the teask to move
these two files.

Regards, Daniel