[SCM] xwax/master: Ease building with gbp.

[Jonas Smedegaard]

Quoting alessio at users.alioth.debian.org (2013-01-07 11:05:09)
>     Ease building with gbp.
[snip]
> diff --git a/.gitignore b/.gitignore
> index f72b160..b408e6c 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -1,8 +1 @@
> -xwax
> -test-library
> -test-timecoder
> -test-track
> -*.o
> -*.d
> -.config
> -.version
> +/.pc
> diff --git a/debian/gbp.conf b/debian/gbp.conf
> new file mode 100644
> index 0000000..cec628c
> --- /dev/null
> +++ b/debian/gbp.conf
> @@ -0,0 +1,2 @@
> +[DEFAULT]
> +pristine-tar = True

I agree with above, but...

It will cause merge problems if upstream changes their .gitignore at 
some point.

I believe the best approach is to skip importing git "noise" into our 
upstream branch altogether.  I believe dpkg has done similarly for ages 
with CVS and SVN.

I therefore propose that we generally add this to multimedia packages in 
debian/gpb.conf:

  [git-import-orig]
  filter = .gitignore


What do you think?


 - Jonas

-- 
 * Jonas Smedegaard - idealist & Internet-arkitekt
 * Tlf.: +45 40843136  Website: http://dr.jones.dk/

 [x] quote me freely  [ ] ask before reusing  [ ] keep private
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-multimedia-maintainers/attachments/20130107/76d865a6/attachment.pgp>