On Thu, 14 Jun 2018 08:48:10 +1000
Peter Hutterer <[email protected]> wrote:

> On Wed, Jun 13, 2018 at 04:32:22PM +0300, Pekka Paalanen wrote:
> > From: Pekka Paalanen <[email protected]>
> > 
> > Gitlab expects a CONTRIBUTING.md in the root directory, so move our
> > guide there.
> > 
> > Conversion to proper markup is a follow-up patch.
> > 
> > Signed-off-by: Pekka Paalanen <[email protected]>
> > ---
> >  doc/Contributing => CONTRIBUTING.md | 0
> >  Makefile.am                         | 2 +-
> >  doc/Makefile.am                     | 2 --
> >  3 files changed, 1 insertion(+), 3 deletions(-)
> >  rename doc/Contributing => CONTRIBUTING.md (100%)
> > 
> > diff --git a/doc/Contributing b/CONTRIBUTING.md
> > similarity index 100%
> > rename from doc/Contributing
> > rename to CONTRIBUTING.md
> > diff --git a/Makefile.am b/Makefile.am
> > index 741db5e..697c517 100644
> > --- a/Makefile.am
> > +++ b/Makefile.am
> > @@ -121,7 +121,7 @@ BUILT_SOURCES =                                 \
> >  
> >  CLEANFILES = $(BUILT_SOURCES) doc/doxygen/doxygen_sqlite3.db
> >  DISTCLEANFILES = src/wayland-version.h
> > -EXTRA_DIST =
> > +EXTRA_DIST = CONTRIBUTING.md  
> 
> just a general comment - is that something we need to have in the tarball?
> contributing from a tarball is something we should discourage.

Hi,

that's a good point. On the other hand, the instructions demand using
git, wouldn't that be enough?

Once we get meson, it's going to be in the tar-ball anyway AFAIU.

I've also experienced how leaving files out of the tar-ball will make
downstream backport patching more inconvenient, because one needs to
drop the hunks that touch files that do not exist in the tar-ball.


Thanks,
pq

> 
> Cheers,
>    Peter
> 
> >  
> >  
> >  
> > diff --git a/doc/Makefile.am b/doc/Makefile.am
> > index 14637af..1efd3e2 100644
> > --- a/doc/Makefile.am
> > +++ b/doc/Makefile.am
> > @@ -1,3 +1 @@
> >  SUBDIRS = doxygen publican man
> > -
> > -EXTRA_DIST = Contributing
> > -- 
> > 2.16.4
> > 
> > _______________________________________________
> > wayland-devel mailing list
> > [email protected]
> > https://lists.freedesktop.org/mailman/listinfo/wayland-devel
> >   

Attachment: pgpUKBkE6m_zc.pgp
Description: OpenPGP digital signature

_______________________________________________
wayland-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/wayland-devel

Reply via email to