Skip to content

Commit

Permalink
Fix licensing and update contributor instructions
Browse files Browse the repository at this point in the history
  • Loading branch information
dnschneid committed Jul 24, 2014
1 parent 7e346dd commit ce5b548
Show file tree
Hide file tree
Showing 105 changed files with 168 additions and 118 deletions.
1 change: 1 addition & 0 deletions AUTHORS
@@ -0,0 +1 @@
Google, Inc
15 changes: 15 additions & 0 deletions CONTRIBUTORS
@@ -0,0 +1,15 @@
Alex Bennée
Aron Griffis
Blaine Bublitz
David Schneider
Igor Bukanov
Jim Tittsler
John Tantalo
Michael Orr
Nevada Romsdahl
Nicolas Boichat
Stephen Barber
Tobbe Lundberg
Yuri Pole
dimonf
divx118
2 changes: 1 addition & 1 deletion LICENSE
@@ -1,4 +1,4 @@
// Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
// Copyright (c) 2014 The crouton Authors. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
Expand Down
10 changes: 8 additions & 2 deletions Makefile
@@ -1,10 +1,11 @@
# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2014 The crouton Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

TARGET = crouton
EXTTARGET = crouton.zip
SRCTARGETS = $(patsubst src/%.c,crouton%,$(wildcard src/*.c))
CONTRIBUTORS = CONTRIBUTORS
WRAPPER = build/wrapper.sh
SCRIPTS := \
$(wildcard chroot-bin/*) \
Expand Down Expand Up @@ -52,9 +53,14 @@ $(SRCTARGETS): src/$(patsubst crouton%,src/%.c,$@) Makefile

extension: $(EXTTARGET)

$(CONTRIBUTORS):
git shortlog -s | cut -c8- | grep -v -e '^root$$' -e '^ttk153$$' > $(CONTRIBUTORS)

contributors: $(CONTRIBUTORS)

all: $(TARGET) $(SRCTARGETS) $(EXTTARGET)

clean:
rm -f $(TARGET) $(EXTTARGET) $(SRCTARGETS)

.PHONY: all clean extension
.PHONY: all clean contributors $(CONTRIBUTORS) extension
50 changes: 29 additions & 21 deletions README.md
Expand Up @@ -210,8 +210,31 @@ there. When filing a new bug, include the output of `croutonversion` run from
inside the chroot (if possible).


Can I help?
-----------
I want to be a Contributor!
---------------------------
That's great! But before your code can be merged, you'll need to have signed
the [Individual Contributor License Agreement](https://developers.google.com/open-source/cla/individual#sign-electronically).
Don't worry, it only takes a minute and you'll definitely get to keep your
firstborn, probably. If you've already signed it for contributing to Chromium
or Chromium OS, you're already done.

If you don't know what to with your time as an official Contributor, here's some
suggestions:

* Really like a certain desktop environment? Fork crouton, add the target, and
create a pull request.
* Feel like hacking around with Chromium OS integration? Fork crouton, improve
integration, and create a pull request.
* Is your distro underrepresented? Want to contribute to the elusive and
mythical beast known as "croagh"? Fork crouton, add the distro, and create a
pull request.
* Discovered a bug lurking within the scripts, or a papercut that bothers you
just enough to make you want to actually do something about it? You guessed
it: fork crouton, fix everything, and create a pull request.


Are there other, non-Contributory ways I can help?
--------------------------------------------------
Yes!


Expand All @@ -230,29 +253,14 @@ There's a way For Everyone to help!
and add the relevant info to the [wiki](https://github.com/dnschneid/crouton/wiki).
Or just add things to/improve things in the wiki in general, but do try to
keep it relevant and organized.
* Really like a certain desktop environment? Open or comment on a bug with
steps to get things working well. Or better yet, create a pull request with
a new target.
* Feel like hacking around with Chromium OS integration? Fork crouton, improve
integration, and create a pull request.
* Is your distro underrepresented? Want to contribute to the elusive and
mythical beast known as "croagh"? Fork crouton, add the distro, and create a
pull request.
* Really like a certain desktop environment, but not up for coding? Open or
comment on a bug with steps to get things working well.
* Hang out in the \#crouton IRC channel on freenode.net!


Sweet! Have some code!
----------------------
Whoa, thanks! But before your code can be merged, you'll need to have signed
the [Individual Contributor License Agreement](https://developers.google.com/open-source/cla/individual#sign-electronically).
Don't worry, it only takes a minute and you'll definitely get to keep your
firstborn, probably. If you've already signed it for contributing to Chromium
or Chromium OS, you're already done.


License
-------
crouton (including this eloquently-written README) is copyright © 2014 The
Chromium OS Authors. All rights reserved. Use of the source code included here
is governed by a BSD-style license that can be found in the LICENSE file in the
crouton Authors. All rights reserved. Use of the source code included here is
governed by a BSD-style license that can be found in the LICENSE file in the
source tree.
2 changes: 1 addition & 1 deletion build/genversion.sh
@@ -1,5 +1,5 @@
#!/bin/sh -e
# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2014 The crouton Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion build/wrapper.sh
@@ -1,5 +1,5 @@
#!/bin/sh -e
# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2014 The crouton Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file of the source repository, which has been replicated
# below for convenience of distribution:
Expand Down
2 changes: 1 addition & 1 deletion chroot-bin/brightness
@@ -1,5 +1,5 @@
#!/bin/sh -e
# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2014 The crouton Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion chroot-bin/crouton-unity-autostart
@@ -1,5 +1,5 @@
#!/bin/sh -e
# Copyright (c) 2014 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2014 The crouton Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
Expand Down
2 changes: 1 addition & 1 deletion chroot-bin/croutonclip
@@ -1,5 +1,5 @@
#!/bin/sh -e
# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2014 The crouton Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
Expand Down
2 changes: 1 addition & 1 deletion chroot-bin/croutoncycle
@@ -1,5 +1,5 @@
#!/bin/sh -e
# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2014 The crouton Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion chroot-bin/croutonpowerd
@@ -1,5 +1,5 @@
#!/bin/sh -e
# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2014 The crouton Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion chroot-bin/croutonurlhandler
@@ -1,5 +1,5 @@
#!/bin/sh -e
# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2014 The crouton Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion chroot-bin/croutonversion
@@ -1,5 +1,5 @@
#!/bin/sh -e
# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2014 The crouton Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion chroot-bin/croutonwheel
@@ -1,5 +1,5 @@
#!/bin/sh -e
# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2014 The crouton Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion chroot-bin/croutonxinitrc-wrapper
@@ -1,5 +1,5 @@
#!/bin/sh -e
# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2014 The crouton Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion chroot-bin/gnome-session-wrapper
@@ -1,5 +1,5 @@
#!/bin/sh -e
# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2014 The crouton Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
Expand Down
2 changes: 1 addition & 1 deletion chroot-bin/host-dbus
@@ -1,5 +1,5 @@
#!/bin/sh -e
# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2014 The crouton Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion chroot-bin/host-x11
@@ -1,5 +1,5 @@
#!/bin/sh -e
# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2014 The crouton Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion chroot-bin/setres
@@ -1,5 +1,5 @@
#!/bin/sh -e
# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2014 The crouton Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion chroot-bin/startgnome
@@ -1,5 +1,5 @@
#!/bin/sh -e
# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2014 The crouton Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion chroot-bin/startunity
@@ -1,5 +1,5 @@
#!/bin/sh -e
# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2014 The crouton Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion chroot-bin/xinit
@@ -1,5 +1,5 @@
#!/bin/sh -e
# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2014 The crouton Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

Expand Down
3 changes: 3 additions & 0 deletions chroot-etc/pulseaudio-default.pa
@@ -1,4 +1,7 @@
#!/usr/bin/pulseaudio -nF
# Copyright (c) 2014 The crouton Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

# Include default configuration first
.include /etc/pulse/default.pa
Expand Down
4 changes: 4 additions & 0 deletions chroot-etc/unity-autostart.desktop
@@ -1,3 +1,7 @@
# Copyright (c) 2014 The crouton Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

[Desktop Entry]
Type=Application
Name=crouton autostart script for Unity
Expand Down
2 changes: 1 addition & 1 deletion chroot-etc/unity-profiled
@@ -1,5 +1,5 @@
#!/bin/sh -e
# Copyright (c) 2014 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2014 The crouton Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
Expand Down
2 changes: 1 addition & 1 deletion chroot-etc/xbindkeysrc.scm
@@ -1,4 +1,4 @@
;; Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
;; Copyright (c) 2014 The crouton Authors. All rights reserved.
;; Use of this source code is governed by a BSD-style license that can be
;; found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion chroot-etc/xserverrc-local.example
@@ -1,5 +1,5 @@
#!/bin/sh
# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2014 The crouton Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion chroot-etc/xserverrc-x11
@@ -1,5 +1,5 @@
#!/bin/sh -e
# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2014 The crouton Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion chroot-etc/xserverrc-xephyr
@@ -1,5 +1,5 @@
#!/bin/sh -e
# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2014 The crouton Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion host-bin/crash_reporter_wrapper
@@ -1,5 +1,5 @@
#!/bin/sh -e
# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2014 The crouton Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion host-bin/edit-chroot
@@ -1,5 +1,5 @@
#!/bin/sh -e
# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2014 The crouton Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion host-bin/enter-chroot
@@ -1,5 +1,5 @@
#!/bin/sh -e
# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2014 The crouton Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion host-bin/mount-chroot
@@ -1,5 +1,5 @@
#!/bin/sh -e
# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2014 The crouton Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion host-bin/startcli
@@ -1,5 +1,5 @@
#!/bin/sh -e
# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2014 The crouton Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion host-bin/starte17
@@ -1,5 +1,5 @@
#!/bin/sh -e
# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2014 The crouton Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion host-bin/startgnome
@@ -1,5 +1,5 @@
#!/bin/sh -e
# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2014 The crouton Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion host-bin/startkde
@@ -1,5 +1,5 @@
#!/bin/sh -e
# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2014 The crouton Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion host-bin/startlxde
@@ -1,5 +1,5 @@
#!/bin/sh -e
# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2014 The crouton Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion host-bin/startunity
@@ -1,5 +1,5 @@
#!/bin/sh -e
# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2014 The crouton Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion host-bin/startxbmc
@@ -1,5 +1,5 @@
#!/bin/sh -e
# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2014 The crouton Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion host-bin/startxfce4
@@ -1,5 +1,5 @@
#!/bin/sh -e
# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2014 The crouton Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

Expand Down
2 changes: 1 addition & 1 deletion host-bin/unmount-chroot
@@ -1,5 +1,5 @@
#!/bin/sh -e
# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
# Copyright (c) 2014 The crouton Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

Expand Down
3 changes: 3 additions & 0 deletions host-ext/crouton/background.html
@@ -1,5 +1,8 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<!-- Copyright (c) 2014 The crouton Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
Expand Down

0 comments on commit ce5b548

Please sign in to comment.