[systemd-commits] 2 commits - src/bootchart

Auke-Jan Kok auke at kemper.freedesktop.org
Tue Feb 12 15:28:39 PST 2013


 src/bootchart/bootchart.c |   33 ++++++++++++++++++++-------------
 src/bootchart/bootchart.h |   34 +++++++++++++++++++++-------------
 src/bootchart/log.c       |   34 +++++++++++++++++++++-------------
 src/bootchart/svg.c       |   34 +++++++++++++++++++++-------------
 4 files changed, 83 insertions(+), 52 deletions(-)

New commits:
commit 8d6167101696a28b7ac61b48fd2c1920564c4e90
Merge: cd3bcca 726c6b6
Author: Auke Kok <auke-jan.h.kok at intel.com>
Date:   Tue Feb 12 15:28:00 2013 -0800

    Merge branch 'master' of ssh://git.freedesktop.org/git/systemd/systemd into work


commit cd3bccaaf7b3c0e000cfd1bac638a52cb4f510c3
Author: Auke Kok <auke-jan.h.kok at intel.com>
Date:   Tue Feb 12 15:14:15 2013 -0800

    systemd-bootchart: relicense to LGPLv2.1+
    
    When we merged systemd-bootchart we omitted relicensing this
    to LGPL. Now that code is being used for other purposes we
    need to make sure the code is shareable within systemd
    without further problems.
    
    The original committers and contributors of bootchart before it
    was merged all have agreed with the relicensing.

diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c
index f1b0e58..6b9252d 100644
--- a/src/bootchart/bootchart.c
+++ b/src/bootchart/bootchart.c
@@ -1,17 +1,24 @@
-/*
- * bootchart.c
- *
- * Copyright (C) 2009-2012 Intel Coproration
- *
- * Authors:
- *   Auke Kok <auke-jan.h.kok at intel.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; version 2
- * of the License.
- */
+/***
+  bootchart.c - This file is part of systemd-bootchart
 
+  Copyright (C) 2009-2013 Intel Coproration
+
+  Authors:
+    Auke Kok <auke-jan.h.kok at intel.com>
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ ***/
 
 #include <sys/time.h>
 #include <sys/types.h>
diff --git a/src/bootchart/bootchart.h b/src/bootchart/bootchart.h
index 9127f92..7793cfc 100644
--- a/src/bootchart/bootchart.h
+++ b/src/bootchart/bootchart.h
@@ -1,16 +1,24 @@
-/*
- * bootchart.h
- *
- * Copyright (C) 2009-2012 Intel Coproration
- *
- * Authors:
- *   Auke Kok <auke-jan.h.kok at intel.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; version 2
- * of the License.
- */
+/***
+  bootchart.h - This file is part of systemd-bootchart
+
+  Copyright (C) 2009-2013 Intel Coproration
+
+  Authors:
+    Auke Kok <auke-jan.h.kok at intel.com>
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ ***/
 
 #include <dirent.h>
 
diff --git a/src/bootchart/log.c b/src/bootchart/log.c
index 48002fa..c7973a5 100644
--- a/src/bootchart/log.c
+++ b/src/bootchart/log.c
@@ -1,16 +1,24 @@
-/*
- * log.c
- *
- * Copyright (C) 2009-2012 Intel Coproration
- *
- * Authors:
- *   Auke Kok <auke-jan.h.kok at intel.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; version 2
- * of the License.
- */
+/***
+  log.c - This file is part of systemd-bootchart
+
+  Copyright (C) 2009-2013 Intel Coproration
+
+  Authors:
+    Auke Kok <auke-jan.h.kok at intel.com>
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ ***/
 
 #define _GNU_SOURCE 1
 #include <unistd.h>
diff --git a/src/bootchart/svg.c b/src/bootchart/svg.c
index b9636e2..8da32ef 100644
--- a/src/bootchart/svg.c
+++ b/src/bootchart/svg.c
@@ -1,16 +1,24 @@
-/*
- * svg.c
- *
- * Copyright (C) 2009-2012 Intel Coproration
- *
- * Authors:
- *   Auke Kok <auke-jan.h.kok at intel.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; version 2
- * of the License.
- */
+/***
+  bootchart.c - This file is part of systemd-bootchart
+
+  Copyright (C) 2009-2013 Intel Coproration
+
+  Authors:
+    Auke Kok <auke-jan.h.kok at intel.com>
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ ***/
 
 #include <stdio.h>
 #include <stdarg.h>



More information about the systemd-commits mailing list